From e3ec7de23a80f934c39f34803885ff895069a49d Mon Sep 17 00:00:00 2001 From: Kode Date: Wed, 13 Jun 2018 19:35:28 +0100 Subject: [PATCH] Dependency updates and update version number --- composer.lock | 632 +- config/app.php | 2 +- vendor/composer/autoload_classmap.php | 325 +- vendor/composer/autoload_files.php | 9 +- vendor/composer/autoload_psr4.php | 5 +- vendor/composer/autoload_static.php | 351 +- vendor/composer/installed.json | 4575 +++++++-------- vendor/doctrine/inflector/composer.json | 6 +- .../Doctrine/Common/Inflector/Inflector.php | 119 +- vendor/doctrine/instantiator/.gitignore | 5 - vendor/doctrine/instantiator/.scrutinizer.yml | 46 - .../doctrine/instantiator/.travis.install.sh | 14 - vendor/doctrine/instantiator/.travis.yml | 22 - vendor/doctrine/instantiator/README.md | 2 +- vendor/doctrine/instantiator/composer.json | 8 +- vendor/doctrine/instantiator/phpmd.xml.dist | 27 - vendor/doctrine/instantiator/phpunit.xml.dist | 22 - .../Exception/InvalidArgumentException.php | 14 +- .../Exception/UnexpectedValueException.php | 31 +- .../Doctrine/Instantiator/Instantiator.php | 103 +- .../InstantiatorPerformanceEvent.php | 96 - .../InvalidArgumentExceptionTest.php | 83 - .../UnexpectedValueExceptionTest.php | 69 - .../InstantiatorTest/InstantiatorTest.php | 219 - .../AbstractClassAsset.php | 29 - .../ArrayObjectAsset.php | 41 - .../InstantiatorTestAsset/ExceptionAsset.php | 41 - .../FinalExceptionAsset.php | 41 - .../InstantiatorTestAsset/PharAsset.php | 41 - .../PharExceptionAsset.php | 44 - .../SerializableArrayObjectAsset.php | 62 - .../SimpleSerializableAsset.php | 61 - .../SimpleTraitAsset.php | 29 - .../UnCloneableAsset.php | 50 - .../UnserializeExceptionArrayObjectAsset.php | 39 - .../WakeUpNoticesAsset.php | 38 - .../InstantiatorTestAsset/XMLReaderAsset.php | 41 - .../Validation/DNSCheckValidation.php | 2 +- .../Validation/SpoofCheckValidation.php | 2 +- vendor/egulias/email-validator/README.md | 10 +- vendor/egulias/email-validator/composer.json | 2 +- vendor/egulias/email-validator/composer.lock | 1813 ------ vendor/erusev/parsedown/LICENSE.txt | 4 +- vendor/erusev/parsedown/Parsedown.php | 179 +- vendor/erusev/parsedown/README.md | 31 +- vendor/erusev/parsedown/composer.json | 11 +- vendor/filp/whoops/LICENSE.md | 2 +- vendor/filp/whoops/composer.json | 6 +- .../src/Whoops/Handler/PrettyPageHandler.php | 1 + .../src/Whoops/Handler/XmlResponseHandler.php | 4 +- .../src/Whoops/Resources/css/whoops.base.css | 33 + .../Resources/views/frame_list.html.php | 2 +- .../Whoops/Resources/views/layout.html.php | 1 + .../Resources/views/panel_left.html.php | 7 +- vendor/guzzlehttp/guzzle/CHANGELOG.md | 25 +- vendor/guzzlehttp/guzzle/LICENSE | 2 +- vendor/guzzlehttp/guzzle/README.md | 4 +- vendor/guzzlehttp/guzzle/composer.json | 4 +- vendor/guzzlehttp/guzzle/src/Client.php | 28 +- .../guzzlehttp/guzzle/src/ClientInterface.php | 2 +- .../guzzle/src/Cookie/CookieJar.php | 6 +- .../guzzle/src/Cookie/SessionCookieJar.php | 2 +- .../guzzle/src/Cookie/SetCookie.php | 13 +- .../guzzle/src/Exception/GuzzleException.php | 9 + .../guzzle/src/Handler/CurlFactory.php | 12 +- .../guzzle/src/Handler/CurlMultiHandler.php | 4 +- .../guzzle/src/Handler/StreamHandler.php | 7 +- vendor/guzzlehttp/guzzle/src/HandlerStack.php | 2 +- .../guzzle/src/MessageFormatter.php | 2 - vendor/guzzlehttp/guzzle/src/Middleware.php | 11 +- vendor/guzzlehttp/guzzle/src/UriTemplate.php | 4 - vendor/guzzlehttp/guzzle/src/functions.php | 6 +- vendor/laravel/framework/composer.json | 8 +- .../Console/stubs/make/views/layouts/app.stub | 2 +- .../Illuminate/Console/GeneratorCommand.php | 2 +- .../Console/Scheduling/CallbackEvent.php | 8 +- .../Broadcasting/ShouldBroadcast.php | 4 +- .../Illuminate/Database/Eloquent/Builder.php | 4 + .../Database/Eloquent/Relations/Pivot.php | 2 +- .../src/Illuminate/Database/Query/Builder.php | 14 +- .../Query/Grammars/PostgresGrammar.php | 14 + .../Database/Query/Grammars/SQLiteGrammar.php | 12 + .../src/Illuminate/Encryption/Encrypter.php | 5 +- .../Filesystem/FilesystemManager.php | 2 +- .../src/Illuminate/Foundation/Application.php | 2 +- .../src/Illuminate/Foundation/helpers.php | 6 +- .../src/Illuminate/Mail/composer.json | 2 +- .../src/Illuminate/Support/Carbon.php | 11 - .../Testing/Fakes/NotificationFake.php | 4 +- .../Support/Testing/Fakes/QueueFake.php | 4 +- .../src/Illuminate/Support/composer.json | 6 +- vendor/laravel/tinker/composer.json | 2 +- vendor/laravel/tinker/config/tinker.php | 18 + .../tinker/src/ClassAliasAutoloader.php | 8 + .../tinker/src/Console/TinkerCommand.php | 4 + .../tinker/src/TinkerServiceProvider.php | 20 + vendor/laravelcollective/html/composer.json | 5 +- .../html/src/Eloquent/FormAccessible.php | 2 +- .../html/src/FormBuilder.php | 84 +- .../html/src/HtmlBuilder.php | 22 +- vendor/league/flysystem/docs/.gitignore | 3 - vendor/league/flysystem/docs/CNAME | 1 - vendor/league/flysystem/docs/_data/images.yml | 8 - vendor/league/flysystem/docs/_data/menu.yml | 32 - .../league/flysystem/docs/_data/project.yml | 4 - .../flysystem/docs/_layouts/default.html | 100 - .../flysystem/docs/adapter/aws-s3-v2.md | 55 - .../flysystem/docs/adapter/aws-s3-v3.md | 61 - vendor/league/flysystem/docs/adapter/azure.md | 31 - vendor/league/flysystem/docs/adapter/copy.md | 24 - .../docs/adapter/digitalocean-spaces.md | 10 - .../league/flysystem/docs/adapter/dropbox.md | 29 - vendor/league/flysystem/docs/adapter/ftp.md | 31 - .../league/flysystem/docs/adapter/gridfs.md | 26 - vendor/league/flysystem/docs/adapter/local.md | 62 - .../league/flysystem/docs/adapter/memory.md | 24 - .../flysystem/docs/adapter/null-test.md | 20 - vendor/league/flysystem/docs/adapter/phpcr.md | 48 - .../flysystem/docs/adapter/rackspace.md | 32 - .../flysystem/docs/adapter/replicate.md | 24 - vendor/league/flysystem/docs/adapter/sftp.md | 30 - .../league/flysystem/docs/adapter/webdav.md | 21 - .../flysystem/docs/adapter/zip-archive.md | 30 - vendor/league/flysystem/docs/api.md | 231 - vendor/league/flysystem/docs/caching.md | 126 - vendor/league/flysystem/docs/core-concepts.md | 71 - .../flysystem/docs/creating-an-adapter.md | 59 - vendor/league/flysystem/docs/index.md | 49 - vendor/league/flysystem/docs/installation.md | 32 - vendor/league/flysystem/docs/integrations.md | 26 - .../docs/logo/become_a_patron_button.png | Bin 3086 -> 0 bytes .../docs/logo/become_a_patron_button@2x.png | Bin 6579 -> 0 bytes .../docs/logo/become_a_patron_button@3x.png | Bin 10221 -> 0 bytes vendor/league/flysystem/docs/logo/laravel.svg | 18 - vendor/league/flysystem/docs/mount-manager.md | 80 - vendor/league/flysystem/docs/performance.md | 26 - vendor/league/flysystem/docs/plugins.md | 46 - vendor/league/flysystem/docs/recipes.md | 99 - vendor/league/flysystem/docs/sponsors.md | 24 - .../league/flysystem/docs/upgrade-to-1.0.0.md | 66 - vendor/league/flysystem/src/Adapter/Local.php | 22 +- vendor/league/flysystem/src/Directory.php | 3 + vendor/league/flysystem/src/File.php | 3 + vendor/league/flysystem/src/Filesystem.php | 2 + .../flysystem/src/FilesystemInterface.php | 14 +- vendor/league/flysystem/src/Handler.php | 3 + vendor/league/flysystem/src/MountManager.php | 2 +- .../flysystem/src/Plugin/ForcedCopy.php | 2 + .../flysystem/src/Plugin/ForcedRename.php | 2 + .../flysystem/src/Plugin/GetWithMetadata.php | 2 + vendor/league/flysystem/src/ReadInterface.php | 2 +- vendor/league/flysystem/src/Util.php | 2 +- vendor/league/flysystem/src/Util/MimeType.php | 15 + .../league/flysystem/wait_for_ftp_service.php | 20 - vendor/mockery/mockery/.gitignore | 1 + vendor/mockery/mockery/.travis.yml | 19 + vendor/mockery/mockery/CHANGELOG.md | 28 +- vendor/mockery/mockery/LICENSE | 2 +- vendor/mockery/mockery/Makefile | 48 + vendor/mockery/mockery/README.md | 6 +- vendor/mockery/mockery/composer.json | 15 +- .../mockery/mockery/docker/php56/Dockerfile | 14 + vendor/mockery/mockery/docs/conf.py | 6 +- .../mockery/docs/cookbook/class_constants.rst | 43 +- .../mockery/docs/cookbook/mockery_on.rst | 2 +- .../cookbook/not_calling_the_constructor.rst | 2 +- .../docs/getting_started/upgrading.rst | 55 +- .../mockery/docs/mockery/configuration.rst | 51 +- .../mockery/docs/reference/expectations.rst | 2 +- .../docs/reference/final_methods_classes.rst | 8 +- .../mockery/docs/reference/partial_mocks.rst | 7 - .../pass_by_reference_behaviours.rst | 2 +- .../mockery/mockery/docs/reference/spies.rst | 2 +- vendor/mockery/mockery/library/Mockery.php | 146 +- .../Phpunit/MockeryPHPUnitIntegration.php | 2 +- .../Mockery/Adapter/Phpunit/TestListener.php | 7 + .../library/Mockery/CompositeExpectation.php | 20 +- .../mockery/library/Mockery/Configuration.php | 64 +- .../mockery/library/Mockery/Container.php | 12 +- .../mockery/library/Mockery/Expectation.php | 53 +- .../library/Mockery/ExpectationDirector.php | 2 +- .../library/Mockery/ExpectationInterface.php | 13 +- .../Mockery/ExpectsHigherOrderMessage.php | 2 +- .../library/Mockery/Generator/Method.php | 2 + .../Mockery/Generator/MockConfiguration.php | 14 +- .../Generator/MockConfigurationBuilder.php | 9 +- .../StringManipulation/Pass/ConstantsPass.php | 33 + .../Pass/MagicMethodTypeHintsPass.php | 10 +- .../Pass/MethodDefinitionPass.php | 18 +- .../Generator/StringManipulationGenerator.php | 10 +- .../Generator/TargetClassInterface.php | 4 +- .../library/Mockery/HigherOrderMessage.php | 9 +- .../mockery/library/Mockery/Instantiator.php | 1 - .../Mockery/Matcher/AndAnyOtherArgs.php | 45 + .../mockery/library/Mockery/Matcher/AnyOf.php | 7 +- .../library/Mockery/Matcher/MustBe.php | 4 +- .../Mockery/Matcher/PHPUnitConstraint.php | 4 +- .../mockery/mockery/library/Mockery/Mock.php | 63 +- .../mockery/library/Mockery/MockInterface.php | 14 +- vendor/mockery/mockery/library/helpers.php | 15 + vendor/mockery/mockery/phpunit.xml.dist | 2 + .../Phpunit/MockeryPHPUnitIntegrationTest.php | 19 +- .../Adapter/Phpunit/TestListenerTest.php | 9 + .../mockery/tests/Mockery/AdhocTest.php | 10 +- .../mockery/tests/Mockery/ContainerTest.php | 135 +- .../tests/Mockery/DemeterChainTest.php | 34 + .../Mockery/DummyClasses/DemeterChain.php | 54 + .../mockery/tests/Mockery/ExpectationTest.php | 51 +- .../Fixtures/ClassWithAllLowerCaseMethod.php | 30 + .../Mockery/Fixtures/ClassWithConstants.php | 29 + .../MockConfigurationBuilderTest.php | 4 +- .../Generator/MockConfigurationTest.php | 22 +- .../Pass/CallTypeHintPassTest.php | 4 +- .../Pass/ConstantsPassTest.php | 52 + .../mockery/tests/Mockery/MockTest.php | 2 +- .../MockingAllLowerCasedMethodsTest.php | 43 + .../Mockery/MockingClassConstantsTest.php | 43 + ...ockingMethodsWithIterableTypeHintsTest.php | 2 +- ...ckingMethodsWithNullableParametersTest.php | 4 +- .../Mockery/MockingNullableMethodsTest.php | 8 +- .../MockingOldStyleConstructorTest.php | 42 + .../MockingParameterAndReturnTypesTest.php | 8 +- .../Mockery/MockingProtectedMethodsTest.php | 10 +- .../tests/Mockery/MockingVoidMethodsTest.php | 2 +- .../mockery/tests/Mockery/NamedMockTest.php | 20 +- .../Mockery/Php72LanguageFeaturesTest.php | 12 +- .../mockery/mockery/tests/Mockery/SpyTest.php | 38 + .../mockery/tests/Mockery/Stubs/Animal.php | 29 + .../mockery/tests/Mockery/Stubs/Habitat.php | 26 + vendor/myclabs/deep-copy/.scrutinizer.yml | 4 + vendor/myclabs/deep-copy/.travis.yml | 18 +- vendor/myclabs/deep-copy/README.md | 10 +- vendor/myclabs/deep-copy/composer.json | 7 +- .../deep-copy/src/DeepCopy/deep_copy.php | 26 +- vendor/nesbot/carbon/.php_cs.dist | 25 +- vendor/nesbot/carbon/build.php | 87 + vendor/nesbot/carbon/composer.json | 23 +- vendor/nesbot/carbon/readme.md | 12 +- vendor/nesbot/carbon/src/Carbon/Carbon.php | 2396 ++++++-- .../carbon/src/Carbon/CarbonInterval.php | 733 ++- .../nesbot/carbon/src/Carbon/CarbonPeriod.php | 1429 +++++ vendor/nesbot/carbon/src/Carbon/Lang/af.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/ar.php | 6 +- .../carbon/src/Carbon/Lang/ar_Shakl.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/az.php | 4 +- vendor/nesbot/carbon/src/Carbon/Lang/bg.php | 28 +- .../nesbot/carbon/src/Carbon/Lang/bs_BA.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/ca.php | 33 +- vendor/nesbot/carbon/src/Carbon/Lang/cs.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/cy.php | 29 + vendor/nesbot/carbon/src/Carbon/Lang/da.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/de.php | 50 +- .../nesbot/carbon/src/Carbon/Lang/dv_MV.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/el.php | 34 +- vendor/nesbot/carbon/src/Carbon/Lang/en.php | 37 +- vendor/nesbot/carbon/src/Carbon/Lang/eo.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/es.php | 33 +- vendor/nesbot/carbon/src/Carbon/Lang/et.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/fi.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/fo.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/fr.php | 29 +- vendor/nesbot/carbon/src/Carbon/Lang/gl.php | 14 +- vendor/nesbot/carbon/src/Carbon/Lang/gu.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/hi.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/hy.php | 18 +- vendor/nesbot/carbon/src/Carbon/Lang/is.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/it.php | 35 +- vendor/nesbot/carbon/src/Carbon/Lang/ja.php | 36 +- vendor/nesbot/carbon/src/Carbon/Lang/kk.php | 29 + vendor/nesbot/carbon/src/Carbon/Lang/ko.php | 4 +- vendor/nesbot/carbon/src/Carbon/Lang/mk.php | 14 +- vendor/nesbot/carbon/src/Carbon/Lang/mn.php | 62 + vendor/nesbot/carbon/src/Carbon/Lang/ne.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/nl.php | 25 +- vendor/nesbot/carbon/src/Carbon/Lang/no.php | 33 +- vendor/nesbot/carbon/src/Carbon/Lang/oc.php | 40 + vendor/nesbot/carbon/src/Carbon/Lang/pl.php | 37 +- vendor/nesbot/carbon/src/Carbon/Lang/ps.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/pt.php | 28 +- .../nesbot/carbon/src/Carbon/Lang/pt_BR.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/sh.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/sk.php | 9 +- vendor/nesbot/carbon/src/Carbon/Lang/sl.php | 5 + vendor/nesbot/carbon/src/Carbon/Lang/sq.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/sr.php | 6 + .../nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php | 43 + .../carbon/src/Carbon/Lang/sr_Cyrl_ME.php | 5 + .../carbon/src/Carbon/Lang/sr_Latn_ME.php | 5 + .../nesbot/carbon/src/Carbon/Lang/sr_ME.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/sv.php | 28 +- vendor/nesbot/carbon/src/Carbon/Lang/sw.php | 31 + vendor/nesbot/carbon/src/Carbon/Lang/th.php | 36 +- vendor/nesbot/carbon/src/Carbon/Lang/uk.php | 2 +- vendor/nesbot/carbon/src/Carbon/Lang/uz.php | 30 +- .../nesbot/carbon/src/Carbon/Lang/zh_TW.php | 30 +- .../nesbot/carbon/src/Carbon/Translator.php | 143 + vendor/nesbot/carbon/src/JsonSerializable.php | 16 + vendor/nikic/php-parser/.travis.yml | 14 +- vendor/nikic/php-parser/CHANGELOG.md | 157 +- vendor/nikic/php-parser/README.md | 236 +- vendor/nikic/php-parser/UPGRADE-3.0.md | 6 +- vendor/nikic/php-parser/UPGRADE-4.0.md | 77 + vendor/nikic/php-parser/bin/php-parse | 28 +- vendor/nikic/php-parser/composer.json | 6 +- .../php-parser/doc/0_Introduction.markdown | 12 +- .../doc/2_Usage_of_basic_components.markdown | 147 +- ...3_Other_node_tree_representations.markdown | 330 -- .../php-parser/doc/4_Code_generation.markdown | 84 - vendor/nikic/php-parser/doc/README.md | 46 + .../doc/component/AST_builders.markdown | 117 + .../Constant_expression_evaluation.markdown | 115 + .../doc/component/Error_handling.markdown | 2 +- .../php-parser/doc/component/FAQ.markdown | 68 + .../component/JSON_representation.markdown | 131 + .../php-parser/doc/component/Lexer.markdown | 37 +- .../doc/component/Name_resolution.markdown | 87 + .../doc/component/Performance.markdown | 65 + .../doc/component/Pretty_printing.markdown | 96 + .../doc/component/Walking_the_AST.markdown | 335 ++ vendor/nikic/php-parser/grammar/README.md | 2 +- .../nikic/php-parser/grammar/parser.template | 27 +- vendor/nikic/php-parser/grammar/php5.y | 151 +- vendor/nikic/php-parser/grammar/php7.y | 160 +- .../php-parser/grammar/rebuildParsers.php | 4 +- .../php-parser/lib/PhpParser/Autoloader.php | 40 - .../php-parser/lib/PhpParser/Builder.php | 6 +- .../lib/PhpParser/Builder/Class_.php | 57 +- .../lib/PhpParser/Builder/Declaration.php | 15 +- .../lib/PhpParser/Builder/FunctionLike.php | 17 +- .../lib/PhpParser/Builder/Function_.php | 15 +- .../lib/PhpParser/Builder/Interface_.php | 49 +- .../lib/PhpParser/Builder/Method.php | 27 +- .../lib/PhpParser/Builder/Namespace_.php | 11 +- .../lib/PhpParser/Builder/Param.php | 18 +- .../lib/PhpParser/Builder/Property.php | 33 +- .../lib/PhpParser/Builder/Trait_.php | 23 +- .../php-parser/lib/PhpParser/Builder/Use_.php | 33 +- .../lib/PhpParser/BuilderAbstract.php | 175 - .../lib/PhpParser/BuilderFactory.php | 199 +- .../lib/PhpParser/BuilderHelpers.php | 277 + .../php-parser/lib/PhpParser/Comment.php | 53 +- .../php-parser/lib/PhpParser/Comment/Doc.php | 4 +- .../ConstExprEvaluationException.php | 6 + .../lib/PhpParser/ConstExprEvaluator.php | 226 + .../nikic/php-parser/lib/PhpParser/Error.php | 58 +- .../php-parser/lib/PhpParser/ErrorHandler.php | 4 +- .../lib/PhpParser/ErrorHandler/Collecting.php | 8 +- .../lib/PhpParser/ErrorHandler/Throwing.php | 4 +- .../lib/PhpParser/Internal/DiffElem.php | 27 + .../lib/PhpParser/Internal/Differ.php | 164 + .../Internal/PrintableNewAnonClassNode.php | 56 + .../lib/PhpParser/Internal/TokenStream.php | 256 + .../php-parser/lib/PhpParser/JsonDecoder.php | 101 + .../nikic/php-parser/lib/PhpParser/Lexer.php | 93 +- .../lib/PhpParser/Lexer/Emulative.php | 170 +- .../php-parser/lib/PhpParser/NameContext.php | 285 + .../nikic/php-parser/lib/PhpParser/Node.php | 95 +- .../php-parser/lib/PhpParser/Node/Arg.php | 12 +- .../php-parser/lib/PhpParser/Node/Const_.php | 25 +- .../php-parser/lib/PhpParser/Node/Expr.php | 4 +- .../lib/PhpParser/Node/Expr/ArrayDimFetch.php | 12 +- .../lib/PhpParser/Node/Expr/ArrayItem.php | 12 +- .../lib/PhpParser/Node/Expr/Array_.php | 12 +- .../lib/PhpParser/Node/Expr/Assign.php | 12 +- .../lib/PhpParser/Node/Expr/AssignOp.php | 8 +- .../Node/Expr/AssignOp/BitwiseAnd.php | 7 +- .../Node/Expr/AssignOp/BitwiseOr.php | 7 +- .../Node/Expr/AssignOp/BitwiseXor.php | 7 +- .../PhpParser/Node/Expr/AssignOp/Concat.php | 7 +- .../lib/PhpParser/Node/Expr/AssignOp/Div.php | 7 +- .../PhpParser/Node/Expr/AssignOp/Minus.php | 7 +- .../lib/PhpParser/Node/Expr/AssignOp/Mod.php | 7 +- .../lib/PhpParser/Node/Expr/AssignOp/Mul.php | 7 +- .../lib/PhpParser/Node/Expr/AssignOp/Plus.php | 7 +- .../lib/PhpParser/Node/Expr/AssignOp/Pow.php | 7 +- .../Node/Expr/AssignOp/ShiftLeft.php | 7 +- .../Node/Expr/AssignOp/ShiftRight.php | 7 +- .../lib/PhpParser/Node/Expr/AssignRef.php | 12 +- .../lib/PhpParser/Node/Expr/BinaryOp.php | 20 +- .../Node/Expr/BinaryOp/BitwiseAnd.php | 11 +- .../Node/Expr/BinaryOp/BitwiseOr.php | 11 +- .../Node/Expr/BinaryOp/BitwiseXor.php | 11 +- .../Node/Expr/BinaryOp/BooleanAnd.php | 11 +- .../Node/Expr/BinaryOp/BooleanOr.php | 11 +- .../PhpParser/Node/Expr/BinaryOp/Coalesce.php | 9 +- .../PhpParser/Node/Expr/BinaryOp/Concat.php | 11 +- .../lib/PhpParser/Node/Expr/BinaryOp/Div.php | 11 +- .../PhpParser/Node/Expr/BinaryOp/Equal.php | 11 +- .../PhpParser/Node/Expr/BinaryOp/Greater.php | 11 +- .../Node/Expr/BinaryOp/GreaterOrEqual.php | 11 +- .../Node/Expr/BinaryOp/Identical.php | 11 +- .../Node/Expr/BinaryOp/LogicalAnd.php | 11 +- .../Node/Expr/BinaryOp/LogicalOr.php | 11 +- .../Node/Expr/BinaryOp/LogicalXor.php | 11 +- .../PhpParser/Node/Expr/BinaryOp/Minus.php | 11 +- .../lib/PhpParser/Node/Expr/BinaryOp/Mod.php | 11 +- .../lib/PhpParser/Node/Expr/BinaryOp/Mul.php | 11 +- .../PhpParser/Node/Expr/BinaryOp/NotEqual.php | 11 +- .../Node/Expr/BinaryOp/NotIdentical.php | 11 +- .../lib/PhpParser/Node/Expr/BinaryOp/Plus.php | 11 +- .../lib/PhpParser/Node/Expr/BinaryOp/Pow.php | 11 +- .../Node/Expr/BinaryOp/ShiftLeft.php | 11 +- .../Node/Expr/BinaryOp/ShiftRight.php | 11 +- .../PhpParser/Node/Expr/BinaryOp/Smaller.php | 11 +- .../Node/Expr/BinaryOp/SmallerOrEqual.php | 11 +- .../Node/Expr/BinaryOp/Spaceship.php | 9 +- .../lib/PhpParser/Node/Expr/BitwiseNot.php | 12 +- .../lib/PhpParser/Node/Expr/BooleanNot.php | 12 +- .../lib/PhpParser/Node/Expr/Cast.php | 8 +- .../lib/PhpParser/Node/Expr/Cast/Array_.php | 7 +- .../lib/PhpParser/Node/Expr/Cast/Bool_.php | 5 +- .../lib/PhpParser/Node/Expr/Cast/Double.php | 5 +- .../lib/PhpParser/Node/Expr/Cast/Int_.php | 5 +- .../lib/PhpParser/Node/Expr/Cast/Object_.php | 5 +- .../lib/PhpParser/Node/Expr/Cast/String_.php | 5 +- .../lib/PhpParser/Node/Expr/Cast/Unset_.php | 7 +- .../PhpParser/Node/Expr/ClassConstFetch.php | 23 +- .../lib/PhpParser/Node/Expr/Clone_.php | 12 +- .../lib/PhpParser/Node/Expr/Closure.php | 36 +- .../lib/PhpParser/Node/Expr/ClosureUse.php | 20 +- .../lib/PhpParser/Node/Expr/ConstFetch.php | 12 +- .../lib/PhpParser/Node/Expr/Empty_.php | 12 +- .../lib/PhpParser/Node/Expr/Error.php | 12 +- .../lib/PhpParser/Node/Expr/ErrorSuppress.php | 12 +- .../lib/PhpParser/Node/Expr/Eval_.php | 12 +- .../lib/PhpParser/Node/Expr/Exit_.php | 12 +- .../lib/PhpParser/Node/Expr/FuncCall.php | 16 +- .../lib/PhpParser/Node/Expr/Include_.php | 12 +- .../lib/PhpParser/Node/Expr/Instanceof_.php | 12 +- .../lib/PhpParser/Node/Expr/Isset_.php | 12 +- .../lib/PhpParser/Node/Expr/List_.php | 18 +- .../lib/PhpParser/Node/Expr/MethodCall.php | 25 +- .../lib/PhpParser/Node/Expr/New_.php | 12 +- .../lib/PhpParser/Node/Expr/PostDec.php | 12 +- .../lib/PhpParser/Node/Expr/PostInc.php | 12 +- .../lib/PhpParser/Node/Expr/PreDec.php | 12 +- .../lib/PhpParser/Node/Expr/PreInc.php | 12 +- .../lib/PhpParser/Node/Expr/Print_.php | 12 +- .../lib/PhpParser/Node/Expr/PropertyFetch.php | 23 +- .../lib/PhpParser/Node/Expr/ShellExec.php | 12 +- .../lib/PhpParser/Node/Expr/StaticCall.php | 25 +- .../Node/Expr/StaticPropertyFetch.php | 23 +- .../lib/PhpParser/Node/Expr/Ternary.php | 12 +- .../lib/PhpParser/Node/Expr/UnaryMinus.php | 12 +- .../lib/PhpParser/Node/Expr/UnaryPlus.php | 12 +- .../lib/PhpParser/Node/Expr/Variable.php | 12 +- .../lib/PhpParser/Node/Expr/YieldFrom.php | 12 +- .../lib/PhpParser/Node/Expr/Yield_.php | 12 +- .../lib/PhpParser/Node/FunctionLike.php | 12 +- .../lib/PhpParser/Node/Identifier.php | 75 + .../php-parser/lib/PhpParser/Node/Name.php | 98 +- .../PhpParser/Node/Name/FullyQualified.php | 20 +- .../lib/PhpParser/Node/Name/Relative.php | 20 +- .../lib/PhpParser/Node/NullableType.php | 20 +- .../php-parser/lib/PhpParser/Node/Param.php | 27 +- .../php-parser/lib/PhpParser/Node/Scalar.php | 4 +- .../lib/PhpParser/Node/Scalar/DNumber.php | 14 +- .../lib/PhpParser/Node/Scalar/Encapsed.php | 16 +- .../Node/Scalar/EncapsedStringPart.php | 12 +- .../lib/PhpParser/Node/Scalar/LNumber.php | 14 +- .../lib/PhpParser/Node/Scalar/MagicConst.php | 10 +- .../Node/Scalar/MagicConst/Class_.php | 10 +- .../PhpParser/Node/Scalar/MagicConst/Dir.php | 10 +- .../PhpParser/Node/Scalar/MagicConst/File.php | 10 +- .../Node/Scalar/MagicConst/Function_.php | 10 +- .../PhpParser/Node/Scalar/MagicConst/Line.php | 10 +- .../Node/Scalar/MagicConst/Method.php | 10 +- .../Node/Scalar/MagicConst/Namespace_.php | 10 +- .../Node/Scalar/MagicConst/Trait_.php | 10 +- .../lib/PhpParser/Node/Scalar/String_.php | 35 +- .../php-parser/lib/PhpParser/Node/Stmt.php | 4 +- .../lib/PhpParser/Node/Stmt/Break_.php | 12 +- .../lib/PhpParser/Node/Stmt/Case_.php | 16 +- .../lib/PhpParser/Node/Stmt/Catch_.php | 27 +- .../lib/PhpParser/Node/Stmt/ClassConst.php | 35 +- .../lib/PhpParser/Node/Stmt/ClassLike.php | 20 +- .../lib/PhpParser/Node/Stmt/ClassMethod.php | 123 +- .../lib/PhpParser/Node/Stmt/Class_.php | 58 +- .../lib/PhpParser/Node/Stmt/Const_.php | 12 +- .../lib/PhpParser/Node/Stmt/Continue_.php | 12 +- .../PhpParser/Node/Stmt/DeclareDeclare.php | 22 +- .../lib/PhpParser/Node/Stmt/Declare_.php | 16 +- .../lib/PhpParser/Node/Stmt/Do_.php | 22 +- .../lib/PhpParser/Node/Stmt/Echo_.php | 12 +- .../lib/PhpParser/Node/Stmt/ElseIf_.php | 20 +- .../lib/PhpParser/Node/Stmt/Else_.php | 18 +- .../lib/PhpParser/Node/Stmt/Expression.php | 33 + .../lib/PhpParser/Node/Stmt/Finally_.php | 18 +- .../lib/PhpParser/Node/Stmt/For_.php | 22 +- .../lib/PhpParser/Node/Stmt/Foreach_.php | 20 +- .../lib/PhpParser/Node/Stmt/Function_.php | 41 +- .../lib/PhpParser/Node/Stmt/Global_.php | 12 +- .../lib/PhpParser/Node/Stmt/Goto_.php | 21 +- .../lib/PhpParser/Node/Stmt/GroupUse.php | 12 +- .../lib/PhpParser/Node/Stmt/HaltCompiler.php | 12 +- .../lib/PhpParser/Node/Stmt/If_.php | 20 +- .../lib/PhpParser/Node/Stmt/InlineHTML.php | 12 +- .../lib/PhpParser/Node/Stmt/Interface_.php | 20 +- .../lib/PhpParser/Node/Stmt/Label.php | 21 +- .../lib/PhpParser/Node/Stmt/Namespace_.php | 20 +- .../lib/PhpParser/Node/Stmt/Nop.php | 10 +- .../lib/PhpParser/Node/Stmt/Property.php | 44 +- .../PhpParser/Node/Stmt/PropertyProperty.php | 22 +- .../lib/PhpParser/Node/Stmt/Return_.php | 12 +- .../lib/PhpParser/Node/Stmt/StaticVar.php | 23 +- .../lib/PhpParser/Node/Stmt/Static_.php | 12 +- .../lib/PhpParser/Node/Stmt/Switch_.php | 12 +- .../lib/PhpParser/Node/Stmt/Throw_.php | 12 +- .../lib/PhpParser/Node/Stmt/TraitUse.php | 13 +- .../Node/Stmt/TraitUseAdaptation.php | 6 +- .../Node/Stmt/TraitUseAdaptation/Alias.php | 28 +- .../Stmt/TraitUseAdaptation/Precedence.php | 22 +- .../lib/PhpParser/Node/Stmt/Trait_.php | 18 +- .../lib/PhpParser/Node/Stmt/TryCatch.php | 18 +- .../lib/PhpParser/Node/Stmt/Unset_.php | 12 +- .../lib/PhpParser/Node/Stmt/UseUse.php | 42 +- .../lib/PhpParser/Node/Stmt/Use_.php | 12 +- .../lib/PhpParser/Node/Stmt/While_.php | 20 +- .../lib/PhpParser/Node/VarLikeIdentifier.php | 17 + .../php-parser/lib/PhpParser/NodeAbstract.php | 120 +- .../php-parser/lib/PhpParser/NodeDumper.php | 27 +- .../php-parser/lib/PhpParser/NodeFinder.php | 81 + .../lib/PhpParser/NodeTraverser.php | 151 +- .../lib/PhpParser/NodeTraverserInterface.php | 9 +- .../php-parser/lib/PhpParser/NodeVisitor.php | 8 +- .../PhpParser/NodeVisitor/CloningVisitor.php | 20 + .../PhpParser/NodeVisitor/FindingVisitor.php | 48 + .../NodeVisitor/FirstFindingVisitor.php | 50 + .../PhpParser/NodeVisitor/NameResolver.php | 190 +- .../lib/PhpParser/NodeVisitorAbstract.php | 23 +- .../nikic/php-parser/lib/PhpParser/Parser.php | 11 +- .../lib/PhpParser/Parser/Multiple.php | 7 +- .../php-parser/lib/PhpParser/Parser/Php5.php | 5078 ++++++++--------- .../php-parser/lib/PhpParser/Parser/Php7.php | 4637 +++++++-------- .../lib/PhpParser/ParserAbstract.php | 342 +- .../lib/PhpParser/ParserFactory.php | 7 +- .../lib/PhpParser/PrettyPrinter/Standard.php | 292 +- .../lib/PhpParser/PrettyPrinterAbstract.php | 1243 +++- .../php-parser/lib/PhpParser/Serializer.php | 18 - .../lib/PhpParser/Serializer/XML.php | 89 - .../php-parser/lib/PhpParser/Unserializer.php | 18 - .../lib/PhpParser/Unserializer/XML.php | 155 - vendor/nikic/php-parser/lib/bootstrap.php | 6 - vendor/nikic/php-parser/phpunit.xml.dist | 1 + .../test/PhpParser/AutoloaderTest.php | 15 - .../test/PhpParser/Builder/ClassTest.php | 59 +- .../test/PhpParser/Builder/FunctionTest.php | 55 +- .../test/PhpParser/Builder/InterfaceTest.php | 44 +- .../test/PhpParser/Builder/MethodTest.php | 58 +- .../test/PhpParser/Builder/NamespaceTest.php | 15 +- .../test/PhpParser/Builder/ParamTest.php | 116 +- .../test/PhpParser/Builder/PropertyTest.php | 79 +- .../test/PhpParser/Builder/TraitTest.php | 11 +- .../test/PhpParser/Builder/UseTest.php | 25 +- .../test/PhpParser/BuilderFactoryTest.php | 212 +- .../test/PhpParser/CodeParsingTest.php | 78 +- .../test/PhpParser/CodeTestAbstract.php | 63 +- .../test/PhpParser/CodeTestParser.php | 68 + .../php-parser/test/PhpParser/CommentTest.php | 39 +- .../test/PhpParser/ConstExprEvaluatorTest.php | 133 + .../PhpParser/ErrorHandler/CollectingTest.php | 8 +- .../PhpParser/ErrorHandler/ThrowingTest.php | 8 +- .../php-parser/test/PhpParser/ErrorTest.php | 50 +- .../test/PhpParser/Internal/DifferTest.php | 67 + .../test/PhpParser/JsonDecoderTest.php | 45 + .../test/PhpParser/Lexer/EmulativeTest.php | 114 +- .../php-parser/test/PhpParser/LexerTest.php | 267 +- .../test/PhpParser/NameContextTest.php | 66 + .../test/PhpParser/Node/IdentifierTest.php | 31 + .../test/PhpParser/Node/NameTest.php | 71 +- .../PhpParser/Node/Scalar/MagicConstTest.php | 29 +- .../test/PhpParser/Node/Scalar/StringTest.php | 50 +- .../PhpParser/Node/Stmt/ClassConstTest.php | 23 +- .../PhpParser/Node/Stmt/ClassMethodTest.php | 105 +- .../test/PhpParser/Node/Stmt/ClassTest.php | 47 +- .../PhpParser/Node/Stmt/InterfaceTest.php | 23 +- .../test/PhpParser/Node/Stmt/PropertyTest.php | 24 +- .../test/PhpParser/NodeAbstractTest.php | 121 +- .../test/PhpParser/NodeDumperTest.php | 50 +- .../test/PhpParser/NodeFinderTest.php | 60 + .../test/PhpParser/NodeTraverserTest.php | 141 +- .../NodeVisitor/FindingVisitorTest.php | 54 + .../NodeVisitor/FirstFindingVisitorTest.php | 39 + .../NodeVisitor/NameResolverTest.php | 129 +- .../test/PhpParser/Parser/MultipleTest.php | 22 +- .../test/PhpParser/Parser/Php5Test.php | 5 +- .../test/PhpParser/Parser/Php7Test.php | 5 +- .../test/PhpParser/ParserFactoryTest.php | 17 +- .../php-parser/test/PhpParser/ParserTest.php | 147 +- .../test/PhpParser/PrettyPrinterTest.php | 132 +- .../test/PhpParser/Serializer/XMLTest.php | 172 - .../test/PhpParser/Unserializer/XMLTest.php | 150 - vendor/nikic/php-parser/test/bootstrap.php | 11 + .../code/formatPreservation/anonClasses.test | 16 + .../test/code/formatPreservation/basic.test | 190 + .../formatPreservation/blockConversion.test | 29 + .../code/formatPreservation/comments.test | 52 + .../test/code/formatPreservation/fixup.test | 67 + .../code/formatPreservation/inlineHtml.test | 54 + .../insertionOfNullable.test | 176 + .../formatPreservation/listInsertion.test | 312 + .../listInsertionIndentation.test | 17 + .../code/formatPreservation/listRemoval.test | 41 + .../formatPreservation/modifierChange.test | 33 + .../formatPreservation/removalViaNull.test | 194 + .../code/formatPreservation/traitAlias.test | 19 + .../test/code/parser/blockComments.test | 9 +- .../php-parser/test/code/parser/comments.test | 12 +- .../code/parser/errorHandling/eofError.test | 20 +- .../parser/errorHandling/lexerErrors.test | 114 +- .../code/parser/errorHandling/recovery.test | 817 ++- .../test/code/parser/expr/arrayDef.test | 207 +- .../code/parser/expr/arrayDestructuring.test | 204 +- .../test/code/parser/expr/assign.test | 438 +- .../test/code/parser/expr/assignNewByRef.test | 36 +- .../test/code/parser/expr/cast.test | 88 +- .../test/code/parser/expr/clone.test | 8 +- .../test/code/parser/expr/closure.test | 248 +- .../test/code/parser/expr/comparison.test | 194 +- .../test/code/parser/expr/constant_expr.test | 140 +- .../test/code/parser/expr/errorSuppress.test | 8 +- .../test/code/parser/expr/exit.test | 44 +- .../code/parser/expr/fetchAndCall/args.test | 140 +- .../parser/expr/fetchAndCall/constFetch.test | 38 +- .../expr/fetchAndCall/constantDeref.test | 366 +- .../parser/expr/fetchAndCall/funcCall.test | 218 +- .../parser/expr/fetchAndCall/newDeref.test | 88 +- .../expr/fetchAndCall/objectAccess.test | 207 +- .../expr/fetchAndCall/simpleArrayAccess.test | 78 +- .../parser/expr/fetchAndCall/staticCall.test | 219 +- .../fetchAndCall/staticPropertyFetch.test | 118 +- .../test/code/parser/expr/includeAndEval.test | 48 +- .../test/code/parser/expr/issetAndEmpty.test | 108 +- .../test/code/parser/expr/listReferences.test | 88 + .../test/code/parser/expr/listWithKeys.test | 100 +- .../test/code/parser/expr/logic.test | 227 +- .../test/code/parser/expr/math.test | 391 +- .../php-parser/test/code/parser/expr/new.test | 223 +- .../code/parser/expr/newWithoutClass.test | 10 +- .../test/code/parser/expr/print.test | 8 +- .../test/code/parser/expr/shellExec.test | 56 +- .../code/parser/expr/ternaryAndCoalesce.test | 197 +- .../test/code/parser/expr/trailingCommas.test | 140 + .../expr/uvs/globalNonSimpleVarError.test | 10 +- .../code/parser/expr/uvs/indirectCall.test | 636 ++- .../test/code/parser/expr/uvs/isset.test | 102 +- .../test/code/parser/expr/uvs/misc.test | 180 +- .../test/code/parser/expr/uvs/new.test | 168 +- .../code/parser/expr/uvs/staticProperty.test | 142 +- .../test/code/parser/expr/variable.test | 74 +- .../test/code/parser/exprStmtMode.test | 57 + .../code/parser/scalar/constantString.test | 80 +- .../test/code/parser/scalar/docString.test | 93 +- .../code/parser/scalar/docStringNewlines.test | 68 +- .../parser/scalar/encapsedNegVarOffset.test | 90 +- .../code/parser/scalar/encapsedString.test | 482 +- .../test/code/parser/scalar/float.test | 94 +- .../test/code/parser/scalar/int.test | 54 +- .../test/code/parser/scalar/invalidOctal.test | 12 +- .../test/code/parser/scalar/magicConst.test | 32 +- .../code/parser/scalar/unicodeEscape.test | 20 +- .../test/code/parser/semiReserved.test | 283 +- .../code/parser/stmt/blocklessStatement.test | 58 +- .../test/code/parser/stmt/class/abstract.test | 12 +- .../code/parser/stmt/class/anonymous.test | 210 +- .../code/parser/stmt/class/conditional.test | 4 +- .../stmt/class/constModifierErrors.test | 32 +- .../parser/stmt/class/constModifiers.test | 20 +- .../test/code/parser/stmt/class/final.test | 4 +- .../parser/stmt/class/implicitPublic.test | 32 +- .../code/parser/stmt/class/interface.test | 8 +- .../test/code/parser/stmt/class/modifier.test | 70 +- .../test/code/parser/stmt/class/name.test | 52 +- .../code/parser/stmt/class/php4Style.test | 16 +- .../test/code/parser/stmt/class/simple.test | 52 +- .../code/parser/stmt/class/staticMethod.test | 48 +- .../test/code/parser/stmt/class/trait.test | 56 +- .../test/code/parser/stmt/const.test | 16 +- .../test/code/parser/stmt/controlFlow.test | 8 +- .../test/code/parser/stmt/declare.test | 20 +- .../function/builtinTypeDeclarations.test | 56 +- .../test/code/parser/stmt/function/byRef.test | 18 +- .../parser/stmt/function/conditional.test | 6 +- .../parser/stmt/function/defaultValues.test | 46 +- .../parser/stmt/function/nullableTypes.test | 16 +- .../parser/stmt/function/returnTypes.test | 26 +- .../parser/stmt/function/specialVars.test | 14 +- .../stmt/function/typeDeclarations.test | 30 +- .../code/parser/stmt/function/variadic.test | 50 +- .../stmt/function/variadicDefaultValue.test | 8 +- .../code/parser/stmt/generator/basic.test | 253 +- .../stmt/generator/yieldPrecedence.test | 338 +- .../stmt/generator/yieldUnaryPrecedence.test | 56 +- .../test/code/parser/stmt/haltCompiler.test | 18 +- .../stmt/haltCompilerInvalidSyntax.test | 2 +- .../code/parser/stmt/haltCompilerOffset.test | 30 +- .../stmt/haltCompilerOutermostScope.test | 2 +- .../test/code/parser/stmt/hashbang.test | 2 +- .../test/code/parser/stmt/inlineHTML.test | 18 +- .../test/code/parser/stmt/loop/do.test | 4 +- .../test/code/parser/stmt/multiCatch.test | 26 +- .../code/parser/stmt/namespace/alias.test | 30 +- .../code/parser/stmt/namespace/braced.test | 20 +- .../code/parser/stmt/namespace/groupUse.test | 24 +- .../parser/stmt/namespace/groupUseErrors.test | 36 +- .../stmt/namespace/groupUsePositions.test | 2 +- .../stmt/namespace/groupUseTrailingComma.test | 4 +- .../parser/stmt/namespace/invalidName.test | 10 +- .../test/code/parser/stmt/namespace/name.test | 46 +- .../code/parser/stmt/namespace/notBraced.test | 20 +- .../parser/stmt/namespace/outsideStmt.test | 4 +- .../stmt/namespace/outsideStmtInvalid.test | 18 +- .../test/code/parser/stmt/switch.test | 8 + .../test/code/parser/stmt/tryCatch.test | 68 +- .../code/parser/stmt/tryWithoutCatch.test | 14 +- .../code/prettyPrinter/expr/literals.test | 12 +- .../code/prettyPrinter/nestedInlineHTML.test | 16 + .../test/code/prettyPrinter/stmt/switch.test | 2 + vendor/nikic/php-parser/test/updateTests.php | 32 + vendor/nikic/php-parser/test_old/run.php | 53 +- vendor/paragonie/random_compat/composer.json | 1 + .../random_compat/lib/byte_safe_strings.php | 2 +- .../random_compat/lib/cast_to_int.php | 2 +- .../random_compat/lib/error_polyfill.php | 2 +- vendor/paragonie/random_compat/lib/random.php | 29 +- .../lib/random_bytes_com_dotnet.php | 2 +- .../lib/random_bytes_dev_urandom.php | 2 +- .../lib/random_bytes_libsodium.php | 2 +- .../lib/random_bytes_libsodium_legacy.php | 2 +- .../random_compat/lib/random_bytes_mcrypt.php | 2 +- .../random_compat/lib/random_int.php | 2 +- vendor/paragonie/random_compat/psalm.xml | 3 + vendor/phpspec/prophecy/CHANGES.md | 16 + vendor/phpspec/prophecy/composer.json | 4 +- .../Doubler/Generator/ClassCodeGenerator.php | 42 +- .../Doubler/Generator/Node/MethodNode.php | 55 +- .../Doubler/Generator/TypeHintReference.php | 46 + .../Doubler/MethodNotFoundException.php | 4 +- .../php-code-coverage/ChangeLog-5.3.md | 18 + .../php-code-coverage/src/Report/Clover.php | 12 +- .../php-code-coverage/src/Report/Crap4j.php | 12 +- .../src/Report/Html/Renderer/File.php | 37 +- .../php-code-coverage/src/Report/PHP.php | 16 +- .../phpunit/php-code-coverage/src/Version.php | 2 +- .../source_with_ignore.php.html | 71 +- .../phpunit-mock-objects/src/Generator.php | 9 +- .../tests/Generator/397.phpt | 3 + .../constant_as_parameter_default_value.phpt | 99 + .../phpunit/phpunit/.github/CONTRIBUTING.md | 6 +- vendor/phpunit/phpunit/.stickler.yml | 3 - vendor/phpunit/phpunit/ChangeLog-6.5.md | 14 + vendor/phpunit/phpunit/build.xml | 23 +- .../phpunit/src/Framework/TestCase.php | 3 +- vendor/phpunit/phpunit/src/Runner/Version.php | 2 +- vendor/phpunit/phpunit/src/Util/Log/JUnit.php | 7 +- .../Util/PHP/Template/TestCaseClass.tpl.dist | 2 +- .../phpunit/tests/Regression/GitHub/2830.phpt | 20 + .../Regression/GitHub/2830/Issue2830Test.php | 22 + .../psr/simple-cache/src/CacheInterface.php | 18 +- vendor/psy/psysh/.editorconfig | 3 + vendor/psy/psysh/.github/CONTRIBUTING.md | 9 + vendor/psy/psysh/.gitignore | 20 +- vendor/psy/psysh/.php_cs | 4 +- vendor/psy/psysh/.styleci.yml | 4 +- vendor/psy/psysh/.travis.yml | 21 +- vendor/psy/psysh/CONTRIBUTING.md | 18 - vendor/psy/psysh/LICENSE | 2 +- vendor/psy/psysh/Makefile | 95 + vendor/psy/psysh/README.md | 1 + vendor/psy/psysh/bin/build | 13 - vendor/psy/psysh/bin/build-manual | 312 - vendor/psy/psysh/bin/build-phar | 38 - vendor/psy/psysh/bin/build-stub | 22 + vendor/psy/psysh/bin/build-vendor | 10 - vendor/psy/psysh/bin/build-vendor-compat | 21 - vendor/psy/psysh/bin/package | 55 - vendor/psy/psysh/bin/psysh | 3 + vendor/psy/psysh/box.json.dist | 13 + vendor/psy/psysh/composer.json | 18 +- vendor/psy/psysh/phpunit.xml.dist | 2 +- .../psy/psysh/src/{Psy => }/CodeCleaner.php | 104 +- .../CodeCleaner/AbstractClassPass.php | 4 +- .../CodeCleaner/AssignThisVariablePass.php | 2 +- .../CallTimePassByReferencePass.php | 8 +- .../{Psy => }/CodeCleaner/CalledClassPass.php | 4 +- .../{Psy => }/CodeCleaner/CodeCleanerPass.php | 2 +- .../src/{Psy => }/CodeCleaner/ExitPass.php | 2 +- .../{Psy => }/CodeCleaner/FinalClassPass.php | 4 +- .../CodeCleaner/FunctionContextPass.php | 2 +- .../FunctionReturnInWriteContextPass.php | 12 +- .../CodeCleaner/ImplicitReturnPass.php | 42 +- .../{Psy => }/CodeCleaner/InstanceOfPass.php | 2 +- .../CodeCleaner/LeavePsyshAlonePass.php | 4 +- .../{Psy => }/CodeCleaner/LegacyEmptyPass.php | 13 +- vendor/psy/psysh/src/CodeCleaner/ListPass.php | 89 + .../{Psy => }/CodeCleaner/LoopContextPass.php | 12 +- .../CodeCleaner/MagicConstantsPass.php | 4 +- .../CodeCleaner/NamespaceAwarePass.php | 10 +- .../{Psy => }/CodeCleaner/NamespacePass.php | 23 +- .../{Psy => }/CodeCleaner/NoReturnValue.php | 15 +- .../CodeCleaner/PassableByReferencePass.php | 2 +- .../src/{Psy => }/CodeCleaner/RequirePass.php | 6 +- .../{Psy => }/CodeCleaner/StrictTypesPass.php | 19 +- .../CodeCleaner/UseStatementPass.php | 21 +- .../CodeCleaner/ValidClassNamePass.php | 37 +- .../CodeCleaner/ValidConstantPass.php | 12 +- .../src/CodeCleaner/ValidConstructorPass.php | 112 + .../CodeCleaner/ValidFunctionNamePass.php | 2 +- .../src/{Psy => }/Command/BufferCommand.php | 8 +- .../src/{Psy => }/Command/ClearCommand.php | 4 +- .../psysh/src/{Psy => }/Command/Command.php | 20 +- .../src/{Psy => }/Command/DocCommand.php | 27 +- .../src/{Psy => }/Command/DumpCommand.php | 37 +- .../src/{Psy => }/Command/EditCommand.php | 12 +- .../src/{Psy => }/Command/ExitCommand.php | 8 +- .../src/{Psy => }/Command/HelpCommand.php | 14 +- .../src/{Psy => }/Command/HistoryCommand.php | 35 +- .../src/{Psy => }/Command/ListCommand.php | 39 +- .../ListCommand/ClassConstantEnumerator.php | 20 +- .../Command/ListCommand/ClassEnumerator.php | 18 +- .../ListCommand/ConstantEnumerator.php | 14 +- .../Command/ListCommand/Enumerator.php | 6 +- .../ListCommand/FunctionEnumerator.php | 10 +- .../ListCommand/GlobalVariableEnumerator.php | 14 +- .../ListCommand/InterfaceEnumerator.php | 13 +- .../Command/ListCommand/MethodEnumerator.php | 16 +- .../ListCommand/PropertyEnumerator.php | 16 +- .../Command/ListCommand/TraitEnumerator.php | 18 +- .../ListCommand/VariableEnumerator.php | 27 +- .../src/{Psy => }/Command/ParseCommand.php | 46 +- .../{Psy => }/Command/PsyVersionCommand.php | 4 +- .../{Psy => }/Command/ReflectingCommand.php | 134 +- .../src/{Psy => }/Command/ShowCommand.php | 49 +- .../src/{Psy => }/Command/SudoCommand.php | 12 +- .../psy/psysh/src/Command/ThrowUpCommand.php | 172 + .../psy/psysh/src/Command/TimeitCommand.php | 196 + .../Command/TimeitCommand/TimeitVisitor.php | 139 + .../src/{Psy => }/Command/TraceCommand.php | 16 +- .../src/{Psy => }/Command/WhereamiCommand.php | 18 +- .../src/{Psy => }/Command/WtfCommand.php | 14 +- .../psy/psysh/src/{Psy => }/ConfigPaths.php | 12 +- .../psy/psysh/src/{Psy => }/Configuration.php | 209 +- .../src/{Psy => }/ConsoleColorFactory.php | 24 +- vendor/psy/psysh/src/{Psy => }/Context.php | 51 +- .../psy/psysh/src/{Psy => }/ContextAware.php | 2 +- .../{Psy => }/Exception/BreakException.php | 2 +- .../Exception/DeprecatedException.php | 2 +- .../{Psy => }/Exception/ErrorException.php | 2 +- .../src/{Psy => }/Exception/Exception.php | 2 +- .../Exception/FatalErrorException.php | 2 +- .../Exception/ParseErrorException.php | 2 +- .../{Psy => }/Exception/RuntimeException.php | 2 +- .../{Psy => }/Exception/ThrowUpException.php | 22 +- .../Exception/TypeErrorException.php | 4 +- vendor/psy/psysh/src/ExecutionClosure.php | 119 + vendor/psy/psysh/src/ExecutionLoop.php | 67 + .../src/ExecutionLoop/AbstractListener.php | 62 + .../psy/psysh/src/ExecutionLoop/Listener.php | 83 + .../ProcessForker.php} | 102 +- .../src/ExecutionLoop/RunkitReloader.php | 135 + vendor/psy/psysh/src/ExecutionLoopClosure.php | 99 + .../src/{Psy => }/Formatter/CodeFormatter.php | 15 +- .../{Psy => }/Formatter/DocblockFormatter.php | 14 +- .../src/{Psy => }/Formatter/Formatter.php | 2 +- .../Formatter/SignatureFormatter.php | 61 +- .../src/{Psy => }/Input/CodeArgument.php | 4 +- .../src/{Psy => }/Input/FilterOptions.php | 12 +- .../psysh/src/{Psy => }/Input/ShellInput.php | 44 +- .../psysh/src/{Psy => }/Input/SilentInput.php | 2 +- .../src/{Psy => }/Output/OutputPager.php | 2 +- .../src/{Psy => }/Output/PassthruPager.php | 2 +- .../src/{Psy => }/Output/ProcOutputPager.php | 6 +- .../src/{Psy => }/Output/ShellOutput.php | 16 +- .../psy/psysh/src/{Psy => }/ParserFactory.php | 4 +- vendor/psy/psysh/src/Psy/Autoloader.php | 45 - .../Psy/CodeCleaner/StaticConstructorPass.php | 88 - .../psysh/src/Psy/Command/ThrowUpCommand.php | 87 - vendor/psy/psysh/src/Psy/Compiler.php | 163 - .../psy/psysh/src/Psy/ExecutionLoop/Loop.php | 186 - .../src/{Psy => }/Readline/GNUReadline.php | 2 +- .../src/{Psy => }/Readline/HoaConsole.php | 4 +- .../psysh/src/{Psy => }/Readline/Libedit.php | 8 +- .../psysh/src/{Psy => }/Readline/Readline.php | 2 +- .../src/{Psy => }/Readline/Transient.php | 7 +- .../ReflectionClassConstant.php} | 143 +- .../src/Reflection/ReflectionConstant.php | 30 + .../src/Reflection/ReflectionConstant_.php | 182 + .../ReflectionLanguageConstruct.php | 86 +- .../ReflectionLanguageConstructParameter.php | 2 +- vendor/psy/psysh/src/{Psy => }/Shell.php | 479 +- vendor/psy/psysh/src/{Psy => }/Sudo.php | 2 +- .../psysh/src/{Psy => }/Sudo/SudoVisitor.php | 53 +- .../{Psy => }/TabCompletion/AutoCompleter.php | 16 +- .../Matcher/AbstractContextAwareMatcher.php | 4 +- .../AbstractDefaultParametersMatcher.php | 14 +- .../TabCompletion/Matcher/AbstractMatcher.php | 15 +- .../Matcher/ClassAttributesMatcher.php | 11 +- .../ClassMethodDefaultParametersMatcher.php | 8 +- .../Matcher/ClassMethodsMatcher.php | 18 +- .../Matcher/ClassNamesMatcher.php | 18 +- .../TabCompletion/Matcher/CommandsMatcher.php | 10 +- .../Matcher/ConstantsMatcher.php | 6 +- .../FunctionDefaultParametersMatcher.php | 6 +- .../Matcher/FunctionsMatcher.php | 6 +- .../TabCompletion/Matcher/KeywordsMatcher.php | 16 +- .../Matcher/MongoClientMatcher.php | 6 +- .../Matcher/MongoDatabaseMatcher.php | 6 +- .../Matcher/ObjectAttributesMatcher.php | 10 +- .../ObjectMethodDefaultParametersMatcher.php | 14 +- .../Matcher/ObjectMethodsMatcher.php | 10 +- .../Matcher/VariablesMatcher.php | 6 +- .../psy/psysh/src/{Psy => }/Util/Docblock.php | 22 +- vendor/psy/psysh/src/{Psy => }/Util/Json.php | 6 +- .../psy/psysh/src/{Psy => }/Util/Mirror.php | 19 +- vendor/psy/psysh/src/{Psy => }/Util/Str.php | 2 +- .../psysh/src/{Psy => }/VarDumper/Cloner.php | 4 +- .../psysh/src/{Psy => }/VarDumper/Dumper.php | 8 +- .../src/{Psy => }/VarDumper/Presenter.php | 14 +- .../{Psy => }/VarDumper/PresenterAware.php | 2 +- .../src/{Psy => }/VersionUpdater/Checker.php | 2 +- .../VersionUpdater/GitHubChecker.php | 10 +- .../VersionUpdater/IntervalChecker.php | 6 +- .../{Psy => }/VersionUpdater/NoopChecker.php | 2 +- vendor/psy/psysh/src/{Psy => }/functions.php | 93 +- vendor/psy/psysh/test/ClassWithSecrets.php | 37 + .../CodeCleaner/AbstractClassPassTest.php | 57 + .../AssignThisVariablePassTest.php | 35 +- .../CallTimePassByReferencePassTest.php | 59 + .../test/CodeCleaner/CalledClassPassTest.php | 90 + .../test/CodeCleaner/CodeCleanerTestCase.php | 41 + .../psysh/test/CodeCleaner/ExitPassTest.php | 59 + .../CodeCleaner/FinalClassPassTest.php | 37 +- .../Fixtures/ClassWithCallStatic.php | 2 +- .../CodeCleaner/Fixtures/ClassWithStatic.php | 2 +- .../CodeCleaner/FunctionContextPassTest.php | 35 +- .../FunctionReturnInWriteContextPassTest.php | 42 +- .../CodeCleaner/ImplicitReturnPassTest.php | 46 +- .../test/CodeCleaner/InstanceOfPassTest.php | 72 + .../CodeCleaner/LeavePsyshAlonePassTest.php | 40 +- .../CodeCleaner/LegacyEmptyPassTest.php | 54 +- .../psysh/test/CodeCleaner/ListPassTest.php | 104 + .../test/CodeCleaner/LoopContextPassTest.php | 108 + .../CodeCleaner/MagicConstantsPassTest.php | 12 +- .../test/CodeCleaner/NamespacePassTest.php | 59 + .../test/CodeCleaner/NoReturnValueTest.php | 32 + .../PassableByReferencePassTest.php | 104 + .../Test => }/CodeCleaner/RequirePassTest.php | 52 +- .../CodeCleaner/StrictTypesPassTest.php | 17 +- .../test/CodeCleaner/UseStatementPassTest.php | 102 + .../CodeCleaner/ValidClassNamePassTest.php | 224 +- .../CodeCleaner/ValidConstantPassTest.php | 36 +- .../CodeCleaner/ValidConstructorPassTest.php | 93 + .../CodeCleaner/ValidFunctionNamePassTest.php | 94 +- vendor/psy/psysh/test/CodeCleanerTest.php | 131 + .../psysh/test/Command/ExitCommandTest.php | 29 + .../psysh/test/Command/ThrowUpCommandTest.php | 89 + .../TimeitCommand/TimeitVisitorTest.php | 52 + .../test/{Psy/Test => }/ConfigurationTest.php | 114 +- .../Test => }/ConsoleColorFactoryTest.php | 8 +- vendor/psy/psysh/test/ContextTest.php | 325 ++ .../Exception/BreakExceptionTest.php | 18 +- .../Exception/ErrorExceptionTest.php | 63 +- .../Exception/FatalErrorExceptionTest.php | 19 +- .../Exception/ParseErrorExceptionTest.php | 9 +- .../Exception/RuntimeExceptionTest.php | 13 +- .../test/Exception/ThrowUpExceptionTest.php | 66 + .../test/Exception/TypeErrorExceptionTest.php | 52 + vendor/psy/psysh/test/FakeShell.php | 29 + .../test/Formatter/CodeFormatterTest.php | 129 + .../Formatter/DocblockFormatterTest.php | 4 +- .../test/Formatter/Fixtures/BoringTrait.php | 20 + .../test/Formatter/Fixtures/SomeClass.php | 30 + .../Formatter/SignatureFormatterTest.php | 57 +- .../{Psy/Test => }/Input/CodeArgumentTest.php | 22 +- .../psysh/test/Input/FilterOptionsTest.php | 105 + .../psy/psysh/test/Input/ShellInputTest.php | 254 + ...CleanerTestCase.php => ParserTestCase.php} | 26 +- .../psysh/test/Psy/Test/AutoloaderTest.php | 23 - .../CodeCleaner/AbstractClassPassTest.php | 64 - .../CallTimePassByReferencePassTest.php | 76 - .../Test/CodeCleaner/CalledClassPassTest.php | 104 - .../Psy/Test/CodeCleaner/ExitPassTest.php | 59 - .../Test/CodeCleaner/InstanceOfPassTest.php | 76 - .../Test/CodeCleaner/LoopContextPassTest.php | 137 - .../Test/CodeCleaner/NamespacePassTest.php | 56 - .../PassableByReferencePassTest.php | 115 - .../CodeCleaner/StaticConstructorPassTest.php | 94 - .../Test/CodeCleaner/UseStatementPassTest.php | 52 - .../psysh/test/Psy/Test/CodeCleanerTest.php | 132 - .../Psy/Test/Formatter/CodeFormatterTest.php | 65 - .../test/Psy/Test/Input/ShellInputTest.php | 204 - .../Reflection/ReflectionConstantTest.php | 60 - .../Test => }/Readline/GNUReadlineTest.php | 18 +- .../Test => }/Readline/HoaConsoleTest.php | 8 +- .../{Psy/Test => }/Readline/LibeditTest.php | 26 +- .../{Psy/Test => }/Readline/TransientTest.php | 18 +- .../ReflectionClassConstantTest.php | 81 + .../Reflection/ReflectionConstantBCTest.php | 26 + .../Reflection/ReflectionConstantTest.php | 114 + ...flectionLanguageConstructParameterTest.php | 64 + .../ReflectionLanguageConstructTest.php | 102 + .../psysh/test/{Psy/Test => }/ShellTest.php | 177 +- .../psy/psysh/test/Sudo/SudoVisitorTest.php | 142 + vendor/psy/psysh/test/SudoTest.php | 80 + .../TabCompletion/AutoCompleterTest.php | 98 +- .../Test => }/TabCompletion/StaticSample.php | 2 +- .../test/{Psy/Test => }/Util/DocblockTest.php | 54 +- .../test/{Psy/Test => }/Util/MirrorTest.php | 36 +- .../test/{Psy/Test => }/Util/StrTest.php | 8 +- .../VersionUpdater/GitHubCheckerTest.php | 52 +- .../test/VersionUpdater/NoopCheckerTest.php | 25 + vendor/psy/psysh/test/fixtures/config.php | 8 +- vendor/psy/psysh/test/fixtures/empty.php | 2 +- .../psysh/test/fixtures/project/.psysh.php | 6 +- vendor/psy/psysh/vendor-bin/box/composer.json | 7 + vendor/psy/psysh/vendor-bin/box/composer.lock | 2524 ++++++++ vendor/symfony/console/Command/Command.php | 5 +- .../Descriptor/DescriptorInterface.php | 2 +- .../console/Descriptor/JsonDescriptor.php | 2 +- .../console/Descriptor/MarkdownDescriptor.php | 2 +- .../console/Descriptor/XmlDescriptor.php | 2 +- .../console/EventListener/ErrorListener.php | 4 +- .../symfony/console/Helper/QuestionHelper.php | 2 +- vendor/symfony/console/Input/ArgvInput.php | 19 +- vendor/symfony/console/Input/ArrayInput.php | 2 +- .../symfony/console/Input/InputInterface.php | 4 + vendor/symfony/console/Input/InputOption.php | 2 +- .../symfony/console/Output/StreamOutput.php | 23 +- .../Tests/EventListener/ErrorListenerTest.php | 4 +- .../Tests/Helper/QuestionHelperTest.php | 23 + .../console/Tests/Input/ArgvInputTest.php | 44 + .../console/Tests/Input/ArrayInputTest.php | 3 + vendor/symfony/console/composer.json | 2 +- .../css-selector/CssSelectorConverter.php | 2 +- .../css-selector/Node/AbstractNode.php | 2 +- .../css-selector/Node/AttributeNode.php | 38 +- .../symfony/css-selector/Node/ClassNode.php | 20 +- .../Node/CombinedSelectorNode.php | 26 +- .../symfony/css-selector/Node/ElementNode.php | 6 +- .../css-selector/Node/FunctionNode.php | 16 +- vendor/symfony/css-selector/Node/HashNode.php | 20 +- .../css-selector/Node/NegationNode.php | 4 +- .../css-selector/Node/NodeInterface.php | 21 +- .../symfony/css-selector/Node/PseudoNode.php | 20 +- .../css-selector/Node/SelectorNode.php | 20 +- .../symfony/css-selector/Node/Specificity.php | 21 +- .../Parser/Handler/CommentHandler.php | 2 +- .../Parser/Handler/HandlerInterface.php | 2 +- .../Parser/Handler/HashHandler.php | 2 +- .../Parser/Handler/IdentifierHandler.php | 2 +- .../Parser/Handler/NumberHandler.php | 2 +- .../Parser/Handler/StringHandler.php | 2 +- .../Parser/Handler/WhitespaceHandler.php | 2 +- vendor/symfony/css-selector/Parser/Parser.php | 45 +- .../css-selector/Parser/ParserInterface.php | 4 +- vendor/symfony/css-selector/Parser/Reader.php | 44 +- .../Parser/Shortcut/ClassParser.php | 2 +- .../Parser/Shortcut/ElementParser.php | 2 +- .../Parser/Shortcut/EmptyStringParser.php | 2 +- .../Parser/Shortcut/HashParser.php | 2 +- vendor/symfony/css-selector/Parser/Token.php | 62 +- .../Parser/Tokenizer/TokenizerEscaping.php | 21 +- .../Parser/Tokenizer/TokenizerPatterns.php | 39 +- .../Tests/CssSelectorConverterTest.php | 2 +- .../css-selector/Tests/Parser/ParserTest.php | 1 + .../Tests/XPath/TranslatorTest.php | 16 +- .../Extension/AttributeMatchingExtension.php | 72 +- .../XPath/Extension/CombinationExtension.php | 4 +- .../XPath/Extension/FunctionExtension.php | 31 +- .../XPath/Extension/NodeExtension.php | 71 +- .../symfony/css-selector/XPath/Translator.php | 67 +- .../XPath/TranslatorInterface.php | 14 +- .../symfony/css-selector/XPath/XPathExpr.php | 47 +- vendor/symfony/css-selector/composer.json | 4 +- vendor/symfony/debug/Debug.php | 2 +- vendor/symfony/debug/DebugClassLoader.php | 2 +- vendor/symfony/debug/ErrorHandler.php | 28 +- .../debug/Exception/FatalThrowableError.php | 3 +- .../debug/Exception/FlattenException.php | 2 +- vendor/symfony/debug/ExceptionHandler.php | 26 +- .../symfony/debug/Tests/ErrorHandlerTest.php | 40 +- .../Tests/Exception/FlattenExceptionTest.php | 8 +- vendor/symfony/event-dispatcher/CHANGELOG.md | 13 + .../ContainerAwareEventDispatcher.php | 197 - .../Debug/TraceableEventDispatcher.php | 13 + .../TraceableEventDispatcherInterface.php | 9 +- .../RegisterListenersPass.php | 27 +- .../Tests/AbstractEventDispatcherTest.php | 2 +- .../ContainerAwareEventDispatcherTest.php | 210 - .../Debug/TraceableEventDispatcherTest.php | 25 + .../RegisterListenersPassTest.php | 117 +- vendor/symfony/event-dispatcher/composer.json | 14 +- vendor/symfony/finder/Finder.php | 24 +- vendor/symfony/finder/SplFileInfo.php | 7 +- vendor/symfony/finder/Tests/FinderTest.php | 41 +- vendor/symfony/http-foundation/Cookie.php | 8 +- vendor/symfony/http-foundation/File/File.php | 8 +- .../MimeType/FileBinaryMimeTypeGuesser.php | 16 +- .../MimeType/MimeTypeExtensionGuesser.php | 1 + .../File/MimeType/MimeTypeGuesser.php | 21 +- .../http-foundation/File/UploadedFile.php | 8 +- vendor/symfony/http-foundation/Request.php | 50 +- vendor/symfony/http-foundation/Response.php | 24 +- .../Handler/MemcachedSessionHandler.php | 4 +- .../Storage/Handler/PdoSessionHandler.php | 112 +- .../Session/Storage/NativeSessionStorage.php | 6 +- .../http-foundation/Tests/CookieTest.php | 8 +- .../Fixtures/response-functional/common.inc | 39 + .../cookie_max_age.expected | 11 + .../response-functional/cookie_max_age.php | 10 + .../cookie_raw_urlencode.expected | 10 + .../cookie_raw_urlencode.php | 12 + .../cookie_samesite_lax.expected | 9 + .../cookie_samesite_lax.php | 8 + .../cookie_samesite_strict.expected | 9 + .../cookie_samesite_strict.php | 8 + .../cookie_urlencode.expected | 10 + .../response-functional/cookie_urlencode.php | 12 + .../invalid_cookie_name.expected | 6 + .../invalid_cookie_name.php | 11 + .../http-foundation/Tests/RequestTest.php | 17 +- .../Tests/ResponseFunctionalTest.php | 58 + .../Tests/ResponseHeaderBagTest.php | 4 +- .../Handler/NativeSessionHandlerTest.php | 2 +- .../Storage/Handler/PdoSessionHandlerTest.php | 35 + .../Storage/NativeSessionStorageTest.php | 17 + .../ArgumentResolver/ServiceValueResolver.php | 12 +- .../ArgumentMetadataFactory.php | 28 +- .../DataCollector/DumpDataCollector.php | 4 +- .../http-kernel/Debug/FileLinkFormatter.php | 21 + ...RegisterControllerArgumentLocatorsPass.php | 5 + .../AbstractTestSessionListener.php | 8 +- .../EventListener/ExceptionListener.php | 14 +- .../EventListener/RouterListener.php | 19 +- .../HttpCache/ResponseCacheStrategy.php | 2 +- .../symfony/http-kernel/HttpCache/Store.php | 6 + vendor/symfony/http-kernel/Kernel.php | 28 +- .../symfony/http-kernel/KernelInterface.php | 2 +- .../symfony/http-kernel/Profiler/Profiler.php | 2 +- .../http-kernel/Resources/welcome.html.php | 2 +- .../symfony/http-kernel/Tests/ClientTest.php | 28 +- .../ServiceValueResolverTest.php | 19 + .../ArgumentMetadataFactoryTest.php | 4 +- .../DataCollector/DumpDataCollectorTest.php | 27 +- .../FragmentRendererPassTest.php | 70 +- .../MergeExtensionConfigurationPassTest.php | 57 +- .../EventListener/ExceptionListenerTest.php | 17 + .../EventListener/TestSessionListenerTest.php | 27 + .../UnprocessableEntityHttpExceptionTest.php | 15 - .../UnsupportedMediaTypeHttpExceptionTest.php | 12 +- .../HttpCache/ResponseCacheStrategyTest.php | 22 +- .../symfony/http-kernel/Tests/KernelTest.php | 4 +- .../Profiler/FileProfilerStorageTest.php | 12 +- .../Tests/Profiler/ProfilerTest.php | 2 +- vendor/symfony/http-kernel/composer.json | 5 +- vendor/symfony/polyfill-ctype/Ctype.php | 227 + vendor/symfony/polyfill-ctype/LICENSE | 19 + vendor/symfony/polyfill-ctype/README.md | 12 + vendor/symfony/polyfill-ctype/bootstrap.php | 26 + vendor/symfony/polyfill-ctype/composer.json | 31 + vendor/symfony/polyfill-mbstring/Mbstring.php | 42 +- .../symfony/polyfill-mbstring/composer.json | 2 +- vendor/symfony/polyfill-php70/Php70.php | 6 +- vendor/symfony/polyfill-php70/composer.json | 2 +- vendor/symfony/process/ExecutableFinder.php | 2 +- .../symfony/process/PhpExecutableFinder.php | 10 +- .../symfony/process/Pipes/AbstractPipes.php | 14 +- vendor/symfony/process/Pipes/UnixPipes.php | 5 +- .../routing/Loader/AnnotationClassLoader.php | 13 +- .../Configurator/CollectionConfigurator.php | 8 +- .../Loader/Configurator/RouteConfigurator.php | 5 +- .../Configurator/RoutingConfigurator.php | 12 +- .../Loader/Configurator/Traits/AddTrait.php | 3 +- .../symfony/routing/Loader/GlobFileLoader.php | 47 + .../symfony/routing/Loader/XmlFileLoader.php | 45 +- .../symfony/routing/Loader/YamlFileLoader.php | 45 +- .../Matcher/Dumper/DumperCollection.php | 2 +- .../Matcher/Dumper/PhpMatcherDumper.php | 122 +- vendor/symfony/routing/Matcher/UrlMatcher.php | 18 +- vendor/symfony/routing/RouteCollection.php | 2 +- .../routing/RouteCollectionBuilder.php | 4 +- vendor/symfony/routing/RouteCompiler.php | 2 +- vendor/symfony/routing/Router.php | 8 +- .../Tests/Fixtures/dumper/url_matcher0.php | 6 +- .../Tests/Fixtures/dumper/url_matcher1.php | 92 +- .../Tests/Fixtures/dumper/url_matcher2.php | 127 +- .../Tests/Fixtures/dumper/url_matcher3.php | 10 +- .../Tests/Fixtures/dumper/url_matcher4.php | 44 +- .../Tests/Fixtures/dumper/url_matcher5.php | 75 +- .../Tests/Fixtures/dumper/url_matcher6.php | 108 +- .../Tests/Fixtures/dumper/url_matcher7.php | 144 +- .../routing/Tests/Fixtures/glob/bar.xml | 8 + .../routing/Tests/Fixtures/glob/bar.yml | 4 + .../routing/Tests/Fixtures/glob/baz.xml | 8 + .../routing/Tests/Fixtures/glob/baz.yml | 4 + .../Tests/Fixtures/glob/import_multiple.xml | 8 + .../Tests/Fixtures/glob/import_multiple.yml | 2 + .../Tests/Fixtures/glob/import_single.xml | 8 + .../Tests/Fixtures/glob/import_single.yml | 2 + .../routing/Tests/Fixtures/glob/php_dsl.php | 7 + .../Tests/Fixtures/glob/php_dsl_bar.php | 12 + .../Tests/Fixtures/glob/php_dsl_baz.php | 12 + .../routing/Tests/Fixtures/php_dsl.php | 1 + .../Loader/AnnotationClassLoaderTest.php | 51 +- .../Loader/AnnotationDirectoryLoaderTest.php | 15 +- .../Tests/Loader/GlobFileLoaderTest.php | 45 + .../Tests/Loader/PhpFileLoaderTest.php | 13 + .../Tests/Loader/XmlFileLoaderTest.php | 21 + .../Tests/Loader/YamlFileLoaderTest.php | 21 + .../DumpedRedirectableUrlMatcherTest.php | 43 + .../Tests/Matcher/DumpedUrlMatcherTest.php | 48 + .../Matcher/Dumper/PhpMatcherDumperTest.php | 2 +- .../Matcher/RedirectableUrlMatcherTest.php | 35 +- .../routing/Tests/Matcher/UrlMatcherTest.php | 150 +- .../Tests/RouteCollectionBuilderTest.php | 2 +- .../routing/Tests/RouteCompilerTest.php | 56 +- vendor/symfony/routing/Tests/RouteTest.php | 2 +- vendor/symfony/routing/Tests/RouterTest.php | 7 +- vendor/symfony/routing/composer.json | 4 +- .../thanks/src/Command/ThanksCommand.php | 34 +- vendor/symfony/translation/CHANGELOG.md | 14 + .../translation/Command/XliffLintCommand.php | 53 +- .../TranslationDumperPass.php | 2 +- .../TranslationExtractorPass.php | 2 +- .../DependencyInjection/TranslatorPass.php | 18 +- .../symfony/translation/Dumper/FileDumper.php | 31 +- .../translation/Dumper/JsonFileDumper.php | 2 +- .../translation/Dumper/XliffFileDumper.php | 5 + .../translation/Dumper/YamlFileDumper.php | 2 +- .../Extractor/AbstractFileExtractor.php | 7 +- .../translation/Extractor/PhpExtractor.php | 6 +- .../translation/Loader/IcuDatFileLoader.php | 1 - .../translation/Loader/IcuResFileLoader.php | 1 - .../translation/Loader/MoFileLoader.php | 5 +- .../translation/Loader/XliffFileLoader.php | 98 +- .../translation/Loader/YamlFileLoader.php | 11 +- .../symfony/translation/MessageCatalogue.php | 2 +- .../translation/MessageCatalogueInterface.php | 4 +- .../translation/PluralizationRules.php | 1 + .../schemas/xliff-core-1.2-strict.xsd | 8 +- .../Tests/Command/XliffLintCommandTest.php | 163 + .../TranslationDumperPassTest.php | 46 +- .../TranslationExtractorPassTest.php | 69 +- .../TranslationPassTest.php | 46 - .../Tests/Dumper/FileDumperTest.php | 23 - .../Tests/Loader/XliffFileLoaderTest.php | 29 + .../Tests/Writer/TranslationWriterTest.php | 21 +- .../Tests/fixtures/resources-2.0-clean.xlf | 6 +- .../resources-2.0-multi-segment-unit.xlf | 17 + .../Tests/fixtures/resources-notes-meta.xlf | 4 +- vendor/symfony/translation/Translator.php | 29 +- .../translation/Writer/TranslationWriter.php | 21 +- vendor/symfony/translation/composer.json | 13 +- .../symfony/var-dumper/Caster/SplCaster.php | 5 +- vendor/symfony/var-dumper/Cloner/Data.php | 2 +- .../symfony/var-dumper/Dumper/CliDumper.php | 87 +- .../symfony/var-dumper/Dumper/HtmlDumper.php | 13 +- .../Tests/Caster/ExceptionCasterTest.php | 4 + .../var-dumper/Tests/Caster/SplCasterTest.php | 19 + .../Tests/Dumper/HtmlDumperTest.php | 4 + vendor/symfony/var-dumper/VarDumper.php | 2 +- 1261 files changed, 45582 insertions(+), 29687 deletions(-) delete mode 100644 vendor/doctrine/instantiator/.gitignore delete mode 100644 vendor/doctrine/instantiator/.scrutinizer.yml delete mode 100644 vendor/doctrine/instantiator/.travis.install.sh delete mode 100644 vendor/doctrine/instantiator/.travis.yml delete mode 100644 vendor/doctrine/instantiator/phpmd.xml.dist delete mode 100644 vendor/doctrine/instantiator/phpunit.xml.dist delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorPerformance/InstantiatorPerformanceEvent.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/InvalidArgumentExceptionTest.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/UnexpectedValueExceptionTest.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/AbstractClassAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ArrayObjectAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ExceptionAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/FinalExceptionAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharExceptionAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SerializableArrayObjectAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleSerializableAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleTraitAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnCloneableAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnserializeExceptionArrayObjectAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/WakeUpNoticesAsset.php delete mode 100644 vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/XMLReaderAsset.php delete mode 100644 vendor/egulias/email-validator/composer.lock create mode 100644 vendor/laravel/tinker/config/tinker.php delete mode 100644 vendor/league/flysystem/docs/.gitignore delete mode 100644 vendor/league/flysystem/docs/CNAME delete mode 100644 vendor/league/flysystem/docs/_data/images.yml delete mode 100644 vendor/league/flysystem/docs/_data/menu.yml delete mode 100644 vendor/league/flysystem/docs/_data/project.yml delete mode 100644 vendor/league/flysystem/docs/_layouts/default.html delete mode 100644 vendor/league/flysystem/docs/adapter/aws-s3-v2.md delete mode 100644 vendor/league/flysystem/docs/adapter/aws-s3-v3.md delete mode 100644 vendor/league/flysystem/docs/adapter/azure.md delete mode 100644 vendor/league/flysystem/docs/adapter/copy.md delete mode 100644 vendor/league/flysystem/docs/adapter/digitalocean-spaces.md delete mode 100644 vendor/league/flysystem/docs/adapter/dropbox.md delete mode 100644 vendor/league/flysystem/docs/adapter/ftp.md delete mode 100644 vendor/league/flysystem/docs/adapter/gridfs.md delete mode 100644 vendor/league/flysystem/docs/adapter/local.md delete mode 100644 vendor/league/flysystem/docs/adapter/memory.md delete mode 100644 vendor/league/flysystem/docs/adapter/null-test.md delete mode 100644 vendor/league/flysystem/docs/adapter/phpcr.md delete mode 100644 vendor/league/flysystem/docs/adapter/rackspace.md delete mode 100644 vendor/league/flysystem/docs/adapter/replicate.md delete mode 100644 vendor/league/flysystem/docs/adapter/sftp.md delete mode 100644 vendor/league/flysystem/docs/adapter/webdav.md delete mode 100644 vendor/league/flysystem/docs/adapter/zip-archive.md delete mode 100644 vendor/league/flysystem/docs/api.md delete mode 100644 vendor/league/flysystem/docs/caching.md delete mode 100644 vendor/league/flysystem/docs/core-concepts.md delete mode 100644 vendor/league/flysystem/docs/creating-an-adapter.md delete mode 100644 vendor/league/flysystem/docs/index.md delete mode 100644 vendor/league/flysystem/docs/installation.md delete mode 100644 vendor/league/flysystem/docs/integrations.md delete mode 100644 vendor/league/flysystem/docs/logo/become_a_patron_button.png delete mode 100644 vendor/league/flysystem/docs/logo/become_a_patron_button@2x.png delete mode 100644 vendor/league/flysystem/docs/logo/become_a_patron_button@3x.png delete mode 100644 vendor/league/flysystem/docs/logo/laravel.svg delete mode 100644 vendor/league/flysystem/docs/mount-manager.md delete mode 100644 vendor/league/flysystem/docs/performance.md delete mode 100644 vendor/league/flysystem/docs/plugins.md delete mode 100644 vendor/league/flysystem/docs/recipes.md delete mode 100644 vendor/league/flysystem/docs/sponsors.md delete mode 100644 vendor/league/flysystem/docs/upgrade-to-1.0.0.md delete mode 100644 vendor/league/flysystem/wait_for_ftp_service.php create mode 100644 vendor/mockery/mockery/Makefile create mode 100644 vendor/mockery/mockery/docker/php56/Dockerfile create mode 100644 vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ConstantsPass.php create mode 100644 vendor/mockery/mockery/library/Mockery/Matcher/AndAnyOtherArgs.php create mode 100644 vendor/mockery/mockery/tests/Mockery/DummyClasses/DemeterChain.php create mode 100644 vendor/mockery/mockery/tests/Mockery/Fixtures/ClassWithAllLowerCaseMethod.php create mode 100644 vendor/mockery/mockery/tests/Mockery/Fixtures/ClassWithConstants.php create mode 100644 vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/ConstantsPassTest.php create mode 100644 vendor/mockery/mockery/tests/Mockery/MockingAllLowerCasedMethodsTest.php create mode 100644 vendor/mockery/mockery/tests/Mockery/MockingClassConstantsTest.php create mode 100644 vendor/mockery/mockery/tests/Mockery/MockingOldStyleConstructorTest.php create mode 100644 vendor/mockery/mockery/tests/Mockery/Stubs/Animal.php create mode 100644 vendor/mockery/mockery/tests/Mockery/Stubs/Habitat.php create mode 100644 vendor/myclabs/deep-copy/.scrutinizer.yml create mode 100644 vendor/nesbot/carbon/build.php create mode 100644 vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/bs_BA.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/cy.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/dv_MV.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/gu.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/hi.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/is.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/kk.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/mn.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/ne.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/oc.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/ps.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/sh.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Lang/sw.php create mode 100644 vendor/nesbot/carbon/src/Carbon/Translator.php create mode 100644 vendor/nesbot/carbon/src/JsonSerializable.php create mode 100644 vendor/nikic/php-parser/UPGRADE-4.0.md delete mode 100644 vendor/nikic/php-parser/doc/3_Other_node_tree_representations.markdown delete mode 100644 vendor/nikic/php-parser/doc/4_Code_generation.markdown create mode 100644 vendor/nikic/php-parser/doc/README.md create mode 100644 vendor/nikic/php-parser/doc/component/AST_builders.markdown create mode 100644 vendor/nikic/php-parser/doc/component/Constant_expression_evaluation.markdown create mode 100644 vendor/nikic/php-parser/doc/component/FAQ.markdown create mode 100644 vendor/nikic/php-parser/doc/component/JSON_representation.markdown create mode 100644 vendor/nikic/php-parser/doc/component/Name_resolution.markdown create mode 100644 vendor/nikic/php-parser/doc/component/Performance.markdown create mode 100644 vendor/nikic/php-parser/doc/component/Pretty_printing.markdown create mode 100644 vendor/nikic/php-parser/doc/component/Walking_the_AST.markdown delete mode 100644 vendor/nikic/php-parser/lib/PhpParser/Autoloader.php delete mode 100644 vendor/nikic/php-parser/lib/PhpParser/BuilderAbstract.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/Internal/Differ.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/JsonDecoder.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/NameContext.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/Node/Identifier.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/NodeFinder.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php create mode 100644 vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php delete mode 100644 vendor/nikic/php-parser/lib/PhpParser/Serializer.php delete mode 100644 vendor/nikic/php-parser/lib/PhpParser/Serializer/XML.php delete mode 100644 vendor/nikic/php-parser/lib/PhpParser/Unserializer.php delete mode 100644 vendor/nikic/php-parser/lib/PhpParser/Unserializer/XML.php delete mode 100644 vendor/nikic/php-parser/lib/bootstrap.php delete mode 100644 vendor/nikic/php-parser/test/PhpParser/AutoloaderTest.php create mode 100644 vendor/nikic/php-parser/test/PhpParser/CodeTestParser.php create mode 100644 vendor/nikic/php-parser/test/PhpParser/ConstExprEvaluatorTest.php create mode 100644 vendor/nikic/php-parser/test/PhpParser/Internal/DifferTest.php create mode 100644 vendor/nikic/php-parser/test/PhpParser/JsonDecoderTest.php create mode 100644 vendor/nikic/php-parser/test/PhpParser/NameContextTest.php create mode 100644 vendor/nikic/php-parser/test/PhpParser/Node/IdentifierTest.php create mode 100644 vendor/nikic/php-parser/test/PhpParser/NodeFinderTest.php create mode 100644 vendor/nikic/php-parser/test/PhpParser/NodeVisitor/FindingVisitorTest.php create mode 100644 vendor/nikic/php-parser/test/PhpParser/NodeVisitor/FirstFindingVisitorTest.php delete mode 100644 vendor/nikic/php-parser/test/PhpParser/Serializer/XMLTest.php delete mode 100644 vendor/nikic/php-parser/test/PhpParser/Unserializer/XMLTest.php create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/anonClasses.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/basic.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/blockConversion.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/comments.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/fixup.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/inlineHtml.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/insertionOfNullable.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/listInsertion.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/listInsertionIndentation.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/listRemoval.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/modifierChange.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/removalViaNull.test create mode 100644 vendor/nikic/php-parser/test/code/formatPreservation/traitAlias.test create mode 100644 vendor/nikic/php-parser/test/code/parser/expr/listReferences.test create mode 100644 vendor/nikic/php-parser/test/code/parser/expr/trailingCommas.test create mode 100644 vendor/nikic/php-parser/test/code/parser/exprStmtMode.test create mode 100644 vendor/nikic/php-parser/test/code/prettyPrinter/nestedInlineHTML.test create mode 100644 vendor/nikic/php-parser/test/updateTests.php create mode 100644 vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/TypeHintReference.php create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/Generator/constant_as_parameter_default_value.phpt delete mode 100644 vendor/phpunit/phpunit/.stickler.yml create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/2830.phpt create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/2830/Issue2830Test.php create mode 100644 vendor/psy/psysh/.github/CONTRIBUTING.md delete mode 100644 vendor/psy/psysh/CONTRIBUTING.md create mode 100644 vendor/psy/psysh/Makefile delete mode 100755 vendor/psy/psysh/bin/build delete mode 100755 vendor/psy/psysh/bin/build-manual delete mode 100755 vendor/psy/psysh/bin/build-phar create mode 100755 vendor/psy/psysh/bin/build-stub delete mode 100755 vendor/psy/psysh/bin/build-vendor delete mode 100755 vendor/psy/psysh/bin/build-vendor-compat delete mode 100755 vendor/psy/psysh/bin/package create mode 100644 vendor/psy/psysh/box.json.dist rename vendor/psy/psysh/src/{Psy => }/CodeCleaner.php (71%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/AbstractClassPass.php (96%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/AssignThisVariablePass.php (96%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/CallTimePassByReferencePass.php (90%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/CalledClassPass.php (95%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/CodeCleanerPass.php (92%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/ExitPass.php (95%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/FinalClassPass.php (95%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/FunctionContextPass.php (97%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/FunctionReturnInWriteContextPass.php (86%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/ImplicitReturnPass.php (71%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/InstanceOfPass.php (97%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/LeavePsyshAlonePass.php (92%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/LegacyEmptyPass.php (86%) create mode 100644 vendor/psy/psysh/src/CodeCleaner/ListPass.php rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/LoopContextPass.php (91%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/MagicConstantsPass.php (89%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/NamespaceAwarePass.php (91%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/NamespacePass.php (70%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/NoReturnValue.php (56%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/PassableByReferencePass.php (99%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/RequirePass.php (93%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/StrictTypesPass.php (77%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/UseStatementPass.php (86%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/ValidClassNamePass.php (91%) rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/ValidConstantPass.php (89%) create mode 100644 vendor/psy/psysh/src/CodeCleaner/ValidConstructorPass.php rename vendor/psy/psysh/src/{Psy => }/CodeCleaner/ValidFunctionNamePass.php (99%) rename vendor/psy/psysh/src/{Psy => }/Command/BufferCommand.php (94%) rename vendor/psy/psysh/src/{Psy => }/Command/ClearCommand.php (93%) rename vendor/psy/psysh/src/{Psy => }/Command/Command.php (96%) rename vendor/psy/psysh/src/{Psy => }/Command/DocCommand.php (79%) rename vendor/psy/psysh/src/{Psy => }/Command/DumpCommand.php (63%) rename vendor/psy/psysh/src/{Psy => }/Command/EditCommand.php (96%) rename vendor/psy/psysh/src/{Psy => }/Command/ExitCommand.php (85%) rename vendor/psy/psysh/src/{Psy => }/Command/HelpCommand.php (92%) rename vendor/psy/psysh/src/{Psy => }/Command/HistoryCommand.php (90%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand.php (89%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/ClassConstantEnumerator.php (86%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/ClassEnumerator.php (89%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/ConstantEnumerator.php (92%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/Enumerator.php (95%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/FunctionEnumerator.php (95%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/GlobalVariableEnumerator.php (91%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/InterfaceEnumerator.php (92%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/MethodEnumerator.php (91%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/PropertyEnumerator.php (93%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/TraitEnumerator.php (86%) rename vendor/psy/psysh/src/{Psy => }/Command/ListCommand/VariableEnumerator.php (86%) rename vendor/psy/psysh/src/{Psy => }/Command/ParseCommand.php (84%) rename vendor/psy/psysh/src/{Psy => }/Command/PsyVersionCommand.php (92%) rename vendor/psy/psysh/src/{Psy => }/Command/ReflectingCommand.php (66%) rename vendor/psy/psysh/src/{Psy => }/Command/ShowCommand.php (86%) rename vendor/psy/psysh/src/{Psy => }/Command/SudoCommand.php (92%) create mode 100644 vendor/psy/psysh/src/Command/ThrowUpCommand.php create mode 100644 vendor/psy/psysh/src/Command/TimeitCommand.php create mode 100644 vendor/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php rename vendor/psy/psysh/src/{Psy => }/Command/TraceCommand.php (94%) rename vendor/psy/psysh/src/{Psy => }/Command/WhereamiCommand.php (90%) rename vendor/psy/psysh/src/{Psy => }/Command/WtfCommand.php (92%) rename vendor/psy/psysh/src/{Psy => }/ConfigPaths.php (95%) rename vendor/psy/psysh/src/{Psy => }/Configuration.php (89%) rename vendor/psy/psysh/src/{Psy => }/ConsoleColorFactory.php (66%) rename vendor/psy/psysh/src/{Psy => }/Context.php (85%) rename vendor/psy/psysh/src/{Psy => }/ContextAware.php (94%) rename vendor/psy/psysh/src/{Psy => }/Exception/BreakException.php (97%) rename vendor/psy/psysh/src/{Psy => }/Exception/DeprecatedException.php (91%) rename vendor/psy/psysh/src/{Psy => }/Exception/ErrorException.php (98%) rename vendor/psy/psysh/src/{Psy => }/Exception/Exception.php (93%) rename vendor/psy/psysh/src/{Psy => }/Exception/FatalErrorException.php (97%) rename vendor/psy/psysh/src/{Psy => }/Exception/ParseErrorException.php (96%) rename vendor/psy/psysh/src/{Psy => }/Exception/RuntimeException.php (96%) rename vendor/psy/psysh/src/{Psy => }/Exception/ThrowUpException.php (60%) rename vendor/psy/psysh/src/{Psy => }/Exception/TypeErrorException.php (92%) create mode 100644 vendor/psy/psysh/src/ExecutionClosure.php create mode 100644 vendor/psy/psysh/src/ExecutionLoop.php create mode 100644 vendor/psy/psysh/src/ExecutionLoop/AbstractListener.php create mode 100644 vendor/psy/psysh/src/ExecutionLoop/Listener.php rename vendor/psy/psysh/src/{Psy/ExecutionLoop/ForkingLoop.php => ExecutionLoop/ProcessForker.php} (61%) create mode 100644 vendor/psy/psysh/src/ExecutionLoop/RunkitReloader.php create mode 100644 vendor/psy/psysh/src/ExecutionLoopClosure.php rename vendor/psy/psysh/src/{Psy => }/Formatter/CodeFormatter.php (80%) rename vendor/psy/psysh/src/{Psy => }/Formatter/DocblockFormatter.php (93%) rename vendor/psy/psysh/src/{Psy => }/Formatter/Formatter.php (92%) rename vendor/psy/psysh/src/{Psy => }/Formatter/SignatureFormatter.php (82%) rename vendor/psy/psysh/src/{Psy => }/Input/CodeArgument.php (96%) rename vendor/psy/psysh/src/{Psy => }/Input/FilterOptions.php (93%) rename vendor/psy/psysh/src/{Psy => }/Input/ShellInput.php (91%) rename vendor/psy/psysh/src/{Psy => }/Input/SilentInput.php (96%) rename vendor/psy/psysh/src/{Psy => }/Output/OutputPager.php (94%) rename vendor/psy/psysh/src/{Psy => }/Output/PassthruPager.php (96%) rename vendor/psy/psysh/src/{Psy => }/Output/ProcOutputPager.php (93%) rename vendor/psy/psysh/src/{Psy => }/Output/ShellOutput.php (94%) rename vendor/psy/psysh/src/{Psy => }/ParserFactory.php (95%) delete mode 100644 vendor/psy/psysh/src/Psy/Autoloader.php delete mode 100644 vendor/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php delete mode 100644 vendor/psy/psysh/src/Psy/Command/ThrowUpCommand.php delete mode 100644 vendor/psy/psysh/src/Psy/Compiler.php delete mode 100644 vendor/psy/psysh/src/Psy/ExecutionLoop/Loop.php rename vendor/psy/psysh/src/{Psy => }/Readline/GNUReadline.php (99%) rename vendor/psy/psysh/src/{Psy => }/Readline/HoaConsole.php (96%) rename vendor/psy/psysh/src/{Psy => }/Readline/Libedit.php (92%) rename vendor/psy/psysh/src/{Psy => }/Readline/Readline.php (97%) rename vendor/psy/psysh/src/{Psy => }/Readline/Transient.php (95%) rename vendor/psy/psysh/src/{Psy/Reflection/ReflectionConstant.php => Reflection/ReflectionClassConstant.php} (52%) create mode 100644 vendor/psy/psysh/src/Reflection/ReflectionConstant.php create mode 100644 vendor/psy/psysh/src/Reflection/ReflectionConstant_.php rename vendor/psy/psysh/src/{Psy => }/Reflection/ReflectionLanguageConstruct.php (70%) rename vendor/psy/psysh/src/{Psy => }/Reflection/ReflectionLanguageConstructParameter.php (98%) rename vendor/psy/psysh/src/{Psy => }/Shell.php (68%) rename vendor/psy/psysh/src/{Psy => }/Sudo.php (99%) rename vendor/psy/psysh/src/{Psy => }/Sudo/SudoVisitor.php (64%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/AutoCompleter.php (87%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/AbstractContextAwareMatcher.php (94%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php (87%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/AbstractMatcher.php (93%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/ClassAttributesMatcher.php (88%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php (90%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/ClassMethodsMatcher.php (78%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/ClassNamesMatcher.php (75%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/CommandsMatcher.php (90%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/ConstantsMatcher.php (86%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php (89%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/FunctionsMatcher.php (87%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/KeywordsMatcher.php (82%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/MongoClientMatcher.php (92%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/MongoDatabaseMatcher.php (92%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/ObjectAttributesMatcher.php (90%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php (85%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/ObjectMethodsMatcher.php (91%) rename vendor/psy/psysh/src/{Psy => }/TabCompletion/Matcher/VariablesMatcher.php (85%) rename vendor/psy/psysh/src/{Psy => }/Util/Docblock.php (93%) rename vendor/psy/psysh/src/{Psy => }/Util/Json.php (76%) rename vendor/psy/psysh/src/{Psy => }/Util/Mirror.php (83%) rename vendor/psy/psysh/src/{Psy => }/Util/Str.php (98%) rename vendor/psy/psysh/src/{Psy => }/VarDumper/Cloner.php (84%) rename vendor/psy/psysh/src/{Psy => }/VarDumper/Dumper.php (94%) rename vendor/psy/psysh/src/{Psy => }/VarDumper/Presenter.php (93%) rename vendor/psy/psysh/src/{Psy => }/VarDumper/PresenterAware.php (93%) rename vendor/psy/psysh/src/{Psy => }/VersionUpdater/Checker.php (94%) rename vendor/psy/psysh/src/{Psy => }/VersionUpdater/GitHubChecker.php (93%) rename vendor/psy/psysh/src/{Psy => }/VersionUpdater/IntervalChecker.php (96%) rename vendor/psy/psysh/src/{Psy => }/VersionUpdater/NoopChecker.php (94%) rename vendor/psy/psysh/src/{Psy => }/functions.php (82%) create mode 100644 vendor/psy/psysh/test/ClassWithSecrets.php create mode 100644 vendor/psy/psysh/test/CodeCleaner/AbstractClassPassTest.php rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/AssignThisVariablePassTest.php (52%) create mode 100644 vendor/psy/psysh/test/CodeCleaner/CallTimePassByReferencePassTest.php create mode 100644 vendor/psy/psysh/test/CodeCleaner/CalledClassPassTest.php create mode 100644 vendor/psy/psysh/test/CodeCleaner/CodeCleanerTestCase.php create mode 100644 vendor/psy/psysh/test/CodeCleaner/ExitPassTest.php rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/FinalClassPassTest.php (53%) rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/Fixtures/ClassWithCallStatic.php (91%) rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/Fixtures/ClassWithStatic.php (91%) rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/FunctionContextPassTest.php (51%) rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/FunctionReturnInWriteContextPassTest.php (72%) rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/ImplicitReturnPassTest.php (64%) create mode 100644 vendor/psy/psysh/test/CodeCleaner/InstanceOfPassTest.php rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/LeavePsyshAlonePassTest.php (59%) rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/LegacyEmptyPassTest.php (52%) create mode 100644 vendor/psy/psysh/test/CodeCleaner/ListPassTest.php create mode 100644 vendor/psy/psysh/test/CodeCleaner/LoopContextPassTest.php rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/MagicConstantsPassTest.php (75%) create mode 100644 vendor/psy/psysh/test/CodeCleaner/NamespacePassTest.php create mode 100644 vendor/psy/psysh/test/CodeCleaner/NoReturnValueTest.php create mode 100644 vendor/psy/psysh/test/CodeCleaner/PassableByReferencePassTest.php rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/RequirePassTest.php (50%) rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/StrictTypesPassTest.php (74%) create mode 100644 vendor/psy/psysh/test/CodeCleaner/UseStatementPassTest.php rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/ValidClassNamePassTest.php (64%) rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/ValidConstantPassTest.php (58%) create mode 100644 vendor/psy/psysh/test/CodeCleaner/ValidConstructorPassTest.php rename vendor/psy/psysh/test/{Psy/Test => }/CodeCleaner/ValidFunctionNamePassTest.php (76%) create mode 100644 vendor/psy/psysh/test/CodeCleanerTest.php create mode 100644 vendor/psy/psysh/test/Command/ExitCommandTest.php create mode 100644 vendor/psy/psysh/test/Command/ThrowUpCommandTest.php create mode 100644 vendor/psy/psysh/test/Command/TimeitCommand/TimeitVisitorTest.php rename vendor/psy/psysh/test/{Psy/Test => }/ConfigurationTest.php (67%) rename vendor/psy/psysh/test/{Psy/Test => }/ConsoleColorFactoryTest.php (84%) create mode 100644 vendor/psy/psysh/test/ContextTest.php rename vendor/psy/psysh/test/{Psy/Test => }/Exception/BreakExceptionTest.php (56%) rename vendor/psy/psysh/test/{Psy/Test => }/Exception/ErrorExceptionTest.php (57%) rename vendor/psy/psysh/test/{Psy/Test => }/Exception/FatalErrorExceptionTest.php (64%) rename vendor/psy/psysh/test/{Psy/Test => }/Exception/ParseErrorExceptionTest.php (79%) rename vendor/psy/psysh/test/{Psy/Test => }/Exception/RuntimeExceptionTest.php (56%) create mode 100644 vendor/psy/psysh/test/Exception/ThrowUpExceptionTest.php create mode 100644 vendor/psy/psysh/test/Exception/TypeErrorExceptionTest.php create mode 100644 vendor/psy/psysh/test/FakeShell.php create mode 100644 vendor/psy/psysh/test/Formatter/CodeFormatterTest.php rename vendor/psy/psysh/test/{Psy/Test => }/Formatter/DocblockFormatterTest.php (96%) create mode 100644 vendor/psy/psysh/test/Formatter/Fixtures/BoringTrait.php create mode 100644 vendor/psy/psysh/test/Formatter/Fixtures/SomeClass.php rename vendor/psy/psysh/test/{Psy/Test => }/Formatter/SignatureFormatterTest.php (54%) rename vendor/psy/psysh/test/{Psy/Test => }/Input/CodeArgumentTest.php (67%) create mode 100644 vendor/psy/psysh/test/Input/FilterOptionsTest.php create mode 100644 vendor/psy/psysh/test/Input/ShellInputTest.php rename vendor/psy/psysh/test/{Psy/Test/CodeCleaner/CodeCleanerTestCase.php => ParserTestCase.php} (81%) delete mode 100644 vendor/psy/psysh/test/Psy/Test/AutoloaderTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/AbstractClassPassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/CallTimePassByReferencePassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/CalledClassPassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/ExitPassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/InstanceOfPassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/LoopContextPassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/NamespacePassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/PassableByReferencePassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/StaticConstructorPassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleaner/UseStatementPassTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/CodeCleanerTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/Formatter/CodeFormatterTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/Input/ShellInputTest.php delete mode 100644 vendor/psy/psysh/test/Psy/Test/Reflection/ReflectionConstantTest.php rename vendor/psy/psysh/test/{Psy/Test => }/Readline/GNUReadlineTest.php (75%) rename vendor/psy/psysh/test/{Psy/Test => }/Readline/HoaConsoleTest.php (73%) rename vendor/psy/psysh/test/{Psy/Test => }/Readline/LibeditTest.php (80%) rename vendor/psy/psysh/test/{Psy/Test => }/Readline/TransientTest.php (74%) create mode 100644 vendor/psy/psysh/test/Reflection/ReflectionClassConstantTest.php create mode 100644 vendor/psy/psysh/test/Reflection/ReflectionConstantBCTest.php create mode 100644 vendor/psy/psysh/test/Reflection/ReflectionConstantTest.php create mode 100644 vendor/psy/psysh/test/Reflection/ReflectionLanguageConstructParameterTest.php create mode 100644 vendor/psy/psysh/test/Reflection/ReflectionLanguageConstructTest.php rename vendor/psy/psysh/test/{Psy/Test => }/ShellTest.php (62%) create mode 100644 vendor/psy/psysh/test/Sudo/SudoVisitorTest.php create mode 100644 vendor/psy/psysh/test/SudoTest.php rename vendor/psy/psysh/test/{Psy/Test => }/TabCompletion/AutoCompleterTest.php (60%) rename vendor/psy/psysh/test/{Psy/Test => }/TabCompletion/StaticSample.php (93%) rename vendor/psy/psysh/test/{Psy/Test => }/Util/DocblockTest.php (65%) rename vendor/psy/psysh/test/{Psy/Test => }/Util/MirrorTest.php (58%) rename vendor/psy/psysh/test/{Psy/Test => }/Util/StrTest.php (62%) rename vendor/psy/psysh/test/{Psy/Test => }/VersionUpdater/GitHubCheckerTest.php (55%) create mode 100644 vendor/psy/psysh/test/VersionUpdater/NoopCheckerTest.php create mode 100644 vendor/psy/psysh/vendor-bin/box/composer.json create mode 100644 vendor/psy/psysh/vendor-bin/box/composer.lock delete mode 100644 vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php delete mode 100644 vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.expected create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.php create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.expected create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.php create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.expected create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.php create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.expected create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.php create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.expected create mode 100644 vendor/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php create mode 100644 vendor/symfony/http-foundation/Tests/ResponseFunctionalTest.php create mode 100644 vendor/symfony/polyfill-ctype/Ctype.php create mode 100644 vendor/symfony/polyfill-ctype/LICENSE create mode 100644 vendor/symfony/polyfill-ctype/README.md create mode 100644 vendor/symfony/polyfill-ctype/bootstrap.php create mode 100644 vendor/symfony/polyfill-ctype/composer.json create mode 100644 vendor/symfony/routing/Loader/GlobFileLoader.php create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/bar.xml create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/bar.yml create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/baz.xml create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/baz.yml create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/import_multiple.xml create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/import_multiple.yml create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/import_single.xml create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/import_single.yml create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/php_dsl.php create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/php_dsl_bar.php create mode 100644 vendor/symfony/routing/Tests/Fixtures/glob/php_dsl_baz.php create mode 100644 vendor/symfony/routing/Tests/Loader/GlobFileLoaderTest.php create mode 100644 vendor/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php create mode 100644 vendor/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php create mode 100644 vendor/symfony/translation/Tests/Command/XliffLintCommandTest.php create mode 100644 vendor/symfony/translation/Tests/fixtures/resources-2.0-multi-segment-unit.xlf diff --git a/composer.lock b/composer.lock index e9e80ad9..46bbb5e0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,6 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "6973e08d9c0d6b713429fd693ccce7e8", "content-hash": "ab6533331102493e1757f58bb2b94824", "packages": [ { @@ -38,24 +37,24 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24 07:27:01" + "time": "2014-10-24T07:27:01+00:00" }, { "name": "doctrine/inflector", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462" + "reference": "5527a48b7313d15261292c149e55e26eae771b0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462", - "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.1" }, "require-dev": { "phpunit/phpunit": "^6.2" @@ -63,7 +62,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -105,7 +104,7 @@ "singularize", "string" ], - "time": "2017-07-22 12:18:28" + "time": "2018-01-09T20:05:19+00:00" }, { "name": "doctrine/lexer", @@ -159,20 +158,20 @@ "lexer", "parser" ], - "time": "2014-09-09 13:34:57" + "time": "2014-09-09T13:34:57+00:00" }, { "name": "egulias/email-validator", - "version": "2.1.3", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04" + "reference": "8790f594151ca6a2010c6218e09d96df67173ad3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/1bec00a10039b823cc94eef4eddd47dcd3b2ca04", - "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/8790f594151ca6a2010c6218e09d96df67173ad3", + "reference": "8790f594151ca6a2010c6218e09d96df67173ad3", "shasum": "" }, "require": { @@ -181,7 +180,7 @@ }, "require-dev": { "dominicsayers/isemail": "dev-master", - "phpunit/phpunit": "^4.8.35", + "phpunit/phpunit": "^4.8.35||^5.7||^6.0", "satooshi/php-coveralls": "^1.0.1" }, "suggest": { @@ -216,23 +215,24 @@ "validation", "validator" ], - "time": "2017-11-15 23:40:40" + "time": "2018-04-10T10:11:19+00:00" }, { "name": "erusev/parsedown", - "version": "1.6.4", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548" + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/fbe3fe878f4fe69048bb8a52783a09802004f548", - "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", "shasum": "" }, "require": { + "ext-mbstring": "*", "php": ">=5.3.0" }, "require-dev": { @@ -261,7 +261,7 @@ "markdown", "parser" ], - "time": "2017-11-14 20:44:03" + "time": "2018-03-08T01:11:30+00:00" }, { "name": "fideloper/proxy", @@ -318,20 +318,20 @@ "proxy", "trusted proxy" ], - "time": "2017-06-15 17:19:42" + "time": "2017-06-15T17:19:42+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.3.0", + "version": "6.3.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", "shasum": "" }, "require": { @@ -341,7 +341,7 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0 || ^5.0", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", "psr/log": "^1.0" }, "suggest": { @@ -350,7 +350,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.2-dev" + "dev-master": "6.3-dev" } }, "autoload": { @@ -383,7 +383,7 @@ "rest", "web service" ], - "time": "2017-06-22 18:50:49" + "time": "2018-04-22T15:46:56+00:00" }, { "name": "guzzlehttp/promises", @@ -434,7 +434,7 @@ "keywords": [ "promise" ], - "time": "2016-12-20 10:07:11" + "time": "2016-12-20T10:07:11+00:00" }, { "name": "guzzlehttp/psr7", @@ -499,7 +499,7 @@ "uri", "url" ], - "time": "2017-03-20 17:10:46" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -542,7 +542,7 @@ "homepage": "http://www.acci.cz" } ], - "time": "2014-04-08 15:00:19" + "time": "2014-04-08T15:00:19+00:00" }, { "name": "jakub-onderka/php-console-highlighter", @@ -586,31 +586,31 @@ "homepage": "http://www.acci.cz/" } ], - "time": "2015-04-20 18:58:01" + "time": "2015-04-20T18:58:01+00:00" }, { "name": "laravel/framework", - "version": "v5.5.34", + "version": "v5.5.40", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1de7c0aec13eadbdddc2d1ba4019b064b2c6b966" + "reference": "d724ce0aa61bbd9adf658215eec484f5dd6711d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1de7c0aec13eadbdddc2d1ba4019b064b2c6b966", - "reference": "1de7c0aec13eadbdddc2d1ba4019b064b2c6b966", + "url": "https://api.github.com/repos/laravel/framework/zipball/d724ce0aa61bbd9adf658215eec484f5dd6711d6", + "reference": "d724ce0aa61bbd9adf658215eec484f5dd6711d6", "shasum": "" }, "require": { "doctrine/inflector": "~1.1", - "erusev/parsedown": "~1.6", + "erusev/parsedown": "~1.7", "ext-mbstring": "*", "ext-openssl": "*", - "league/flysystem": "~1.0", + "league/flysystem": "^1.0.8", "monolog/monolog": "~1.12", "mtdowling/cron-expression": "~1.0", - "nesbot/carbon": "~1.20", + "nesbot/carbon": "^1.24.1", "php": ">=7.0", "psr/container": "~1.0", "psr/simple-cache": "^1.0", @@ -656,7 +656,7 @@ "illuminate/translation": "self.version", "illuminate/validation": "self.version", "illuminate/view": "self.version", - "tightenco/collect": "self.version" + "tightenco/collect": "<5.5.33" }, "require-dev": { "aws/aws-sdk-php": "~3.0", @@ -720,20 +720,20 @@ "framework", "laravel" ], - "time": "2018-02-06 15:36:55" + "time": "2018-03-30T13:29:30+00:00" }, { "name": "laravel/tinker", - "version": "v1.0.3", + "version": "v1.0.7", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6" + "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/852c2abe0b0991555a403f1c0583e64de6acb4a6", - "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6", + "url": "https://api.github.com/repos/laravel/tinker/zipball/e3086ee8cb1f54a39ae8dcb72d1c37d10128997d", + "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d", "shasum": "" }, "require": { @@ -741,7 +741,7 @@ "illuminate/contracts": "~5.1", "illuminate/support": "~5.1", "php": ">=5.5.9", - "psy/psysh": "0.7.*|0.8.*", + "psy/psysh": "0.7.*|0.8.*|0.9.*", "symfony/var-dumper": "~3.0|~4.0" }, "require-dev": { @@ -783,20 +783,20 @@ "laravel", "psysh" ], - "time": "2017-12-18 16:25:11" + "time": "2018-05-17T13:42:07+00:00" }, { "name": "laravelcollective/html", - "version": "v5.5.1", + "version": "v5.5.4", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6" + "reference": "04c596a69975b901f2223eb6eb4adf55354121c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6", - "reference": "2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/04c596a69975b901f2223eb6eb4adf55354121c2", + "reference": "04c596a69975b901f2223eb6eb4adf55354121c2", "shasum": "" }, "require": { @@ -814,6 +814,9 @@ }, "type": "library", "extra": { + "branch-alias": { + "dev-master": "5.5-dev" + }, "laravel": { "providers": [ "Collective\\Html\\HtmlServiceProvider" @@ -847,21 +850,21 @@ } ], "description": "HTML and Form Builders for the Laravel Framework", - "homepage": "http://laravelcollective.com", - "time": "2017-08-31 14:46:03" + "homepage": "https://laravelcollective.com", + "time": "2018-03-24T00:39:21+00:00" }, { "name": "league/flysystem", - "version": "1.0.42", + "version": "1.0.45", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "09eabc54e199950041aef258a85847676496fe8e" + "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/09eabc54e199950041aef258a85847676496fe8e", - "reference": "09eabc54e199950041aef258a85847676496fe8e", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a99f94e63b512d75f851b181afcdf0ee9ebef7e6", + "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6", "shasum": "" }, "require": { @@ -932,7 +935,7 @@ "sftp", "storage" ], - "time": "2018-01-27 16:03:56" + "time": "2018-05-07T08:44:23+00:00" }, { "name": "monolog/monolog", @@ -1010,7 +1013,7 @@ "logging", "psr-3" ], - "time": "2017-06-19 01:22:40" + "time": "2017-06-19T01:22:40+00:00" }, { "name": "mtdowling/cron-expression", @@ -1054,39 +1057,34 @@ "cron", "schedule" ], - "time": "2017-01-23 04:29:33" + "time": "2017-01-23T04:29:33+00:00" }, { "name": "nesbot/carbon", - "version": "1.22.1", + "version": "1.29.2", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc" + "reference": "ed6aa898982f441ccc9b2acdec51490f2bc5d337" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ed6aa898982f441ccc9b2acdec51490f2bc5d337", + "reference": "ed6aa898982f441ccc9b2acdec51490f2bc5d337", "shasum": "" }, "require": { - "php": ">=5.3.0", - "symfony/translation": "~2.6 || ~3.0" + "php": ">=5.3.9", + "symfony/translation": "~2.6 || ~3.0 || ~4.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2", - "phpunit/phpunit": "~4.0 || ~5.0" + "phpunit/phpunit": "^4.8.35 || ^5.7" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.23-dev" - } - }, "autoload": { "psr-4": { - "Carbon\\": "src/Carbon/" + "": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1107,28 +1105,28 @@ "datetime", "time" ], - "time": "2017-01-16 07:55:07" + "time": "2018-05-29T15:23:46+00:00" }, { "name": "nikic/php-parser", - "version": "v3.1.4", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "e57b3a09784f846411aa7ed664eedb73e3399078" + "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e57b3a09784f846411aa7ed664eedb73e3399078", - "reference": "e57b3a09784f846411aa7ed664eedb73e3399078", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/35b8caf75e791ba1b2d24fec1552168d72692b12", + "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.5" + "php": ">=7.0" }, "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" + "phpunit/phpunit": "^6.5 || ^7.0" }, "bin": [ "bin/php-parse" @@ -1136,7 +1134,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1158,20 +1156,20 @@ "parser", "php" ], - "time": "2018-01-25 21:31:33" + "time": "2018-06-03T11:33:10+00:00" }, { "name": "paragonie/random_compat", - "version": "v2.0.11", + "version": "v2.0.15", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8" + "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09", + "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09", "shasum": "" }, "require": { @@ -1203,10 +1201,11 @@ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "keywords": [ "csprng", + "polyfill", "pseudorandom", "random" ], - "time": "2017-09-27 21:40:39" + "time": "2018-06-08T15:26:40+00:00" }, { "name": "psr/container", @@ -1255,7 +1254,7 @@ "container-interop", "psr" ], - "time": "2017-02-14 16:28:37" + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/http-message", @@ -1305,7 +1304,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", @@ -1352,20 +1351,20 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "psr/simple-cache", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/simple-cache.git", - "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24" + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/753fa598e8f3b9966c886fe13f370baa45ef0e24", - "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", "shasum": "" }, "require": { @@ -1400,34 +1399,34 @@ "psr-16", "simple-cache" ], - "time": "2017-01-02 13:31:39" + "time": "2017-10-23T01:57:42+00:00" }, { "name": "psy/psysh", - "version": "v0.8.17", + "version": "v0.9.6", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec" + "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5069b70e8c4ea492c2b5939b6eddc78bfe41cfec", - "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4a2ce86f199d51b6e2524214dc06835e872f4fce", + "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce", "shasum": "" }, "require": { "dnoegel/php-xdg-base-dir": "0.1", "jakub-onderka/php-console-highlighter": "0.3.*", - "nikic/php-parser": "~1.3|~2.0|~3.0", - "php": ">=5.3.9", + "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0", + "php": ">=5.4.0", "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", "symfony/var-dumper": "~2.7|~3.0|~4.0" }, "require-dev": { - "hoa/console": "~3.16|~1.14", - "phpunit/phpunit": "^4.8.35|^5.4.3", - "symfony/finder": "~2.1|~3.0|~4.0" + "bamarni/composer-bin-plugin": "^1.2", + "hoa/console": "~2.15|~3.16", + "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", @@ -1442,15 +1441,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-develop": "0.8.x-dev" + "dev-develop": "0.9.x-dev" } }, "autoload": { "files": [ - "src/Psy/functions.php" + "src/functions.php" ], "psr-4": { - "Psy\\": "src/Psy/" + "Psy\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1472,7 +1471,7 @@ "interactive", "shell" ], - "time": "2017-12-28 16:14:16" + "time": "2018-06-10T17:57:20+00:00" }, { "name": "ramsey/uuid", @@ -1552,7 +1551,7 @@ "identifier", "uuid" ], - "time": "2018-01-20 00:28:24" + "time": "2018-01-20T00:28:24+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -1607,20 +1606,20 @@ "mail", "mailer" ], - "time": "2017-09-30 22:39:41" + "time": "2017-09-30T22:39:41+00:00" }, { "name": "symfony/console", - "version": "v3.4.4", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "26b6f419edda16c19775211987651cb27baea7f1" + "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/26b6f419edda16c19775211987651cb27baea7f1", - "reference": "26b6f419edda16c19775211987651cb27baea7f1", + "url": "https://api.github.com/repos/symfony/console/zipball/36f83f642443c46f3cf751d4d2ee5d047d757a27", + "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27", "shasum": "" }, "require": { @@ -1641,7 +1640,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -1676,29 +1675,29 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-01-29 09:03:43" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/css-selector", - "version": "v3.4.4", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556" + "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/e66394bc7610e69279bfdb3ab11b4fe65403f556", - "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/03ac71606ecb0b0ce792faa17d74cc32c2949ef4", + "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -1729,20 +1728,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-01-03 07:37:34" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "symfony/debug", - "version": "v3.4.4", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "53f6af2805daf52a43b393b93d2f24925d35c937" + "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/53f6af2805daf52a43b393b93d2f24925d35c937", - "reference": "53f6af2805daf52a43b393b93d2f24925d35c937", + "url": "https://api.github.com/repos/symfony/debug/zipball/b28fd73fefbac341f673f5efd707d539d6a19f68", + "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68", "shasum": "" }, "require": { @@ -1785,34 +1784,34 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-01-18 22:16:57" + "time": "2018-05-16T14:03:39+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.4", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca" + "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/26b87b6bca8f8f797331a30b76fdae5342dc26ca", - "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5", + "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -1821,7 +1820,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -1848,20 +1847,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-01-03 07:37:34" + "time": "2018-04-06T07:35:57+00:00" }, { "name": "symfony/finder", - "version": "v3.4.4", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f" + "reference": "472a92f3df8b247b49ae364275fb32943b9656c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f", + "url": "https://api.github.com/repos/symfony/finder/zipball/472a92f3df8b247b49ae364275fb32943b9656c6", + "reference": "472a92f3df8b247b49ae364275fb32943b9656c6", "shasum": "" }, "require": { @@ -1897,20 +1896,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-01-03 07:37:34" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.4.4", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "8c39071ac9cc7e6d8dab1d556c990dc0d2cc3d30" + "reference": "a7b5fc605d1c215cea1122359044b1e682eb70c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8c39071ac9cc7e6d8dab1d556c990dc0d2cc3d30", - "reference": "8c39071ac9cc7e6d8dab1d556c990dc0d2cc3d30", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a7b5fc605d1c215cea1122359044b1e682eb70c0", + "reference": "a7b5fc605d1c215cea1122359044b1e682eb70c0", "shasum": "" }, "require": { @@ -1951,20 +1950,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-01-29 09:03:43" + "time": "2018-05-25T11:07:31+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.4.4", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "911d2e5dd4beb63caad9a72e43857de984301907" + "reference": "3dac45df55ee0c5134c457a730cd68e2a2ce0445" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/911d2e5dd4beb63caad9a72e43857de984301907", - "reference": "911d2e5dd4beb63caad9a72e43857de984301907", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3dac45df55ee0c5134c457a730cd68e2a2ce0445", + "reference": "3dac45df55ee0c5134c457a730cd68e2a2ce0445", "shasum": "" }, "require": { @@ -1972,11 +1971,12 @@ "psr/log": "~1.0", "symfony/debug": "~2.8|~3.0|~4.0", "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/http-foundation": "^3.4.4|^4.0.4" + "symfony/http-foundation": "^3.4.4|^4.0.4", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.4", + "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4", "symfony/var-dumper": "<3.3", "twig/twig": "<1.34|<2.4,>=2" }, @@ -1990,7 +1990,7 @@ "symfony/config": "~2.8|~3.0|~4.0", "symfony/console": "~2.8|~3.0|~4.0", "symfony/css-selector": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", + "symfony/dependency-injection": "^3.4.5|^4.0.5", "symfony/dom-crawler": "~2.8|~3.0|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", @@ -2039,20 +2039,75 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-01-29 12:29:46" + "time": "2018-05-25T13:16:28+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-04-30T19:57:29+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "3296adf6a6454a050679cde90f95350ad604b171" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -2064,7 +2119,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -2098,20 +2153,20 @@ "portable", "shim" ], - "time": "2018-01-30 19:27:44" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/polyfill-php70", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6", + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6", "shasum": "" }, "require": { @@ -2121,7 +2176,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -2157,20 +2212,20 @@ "portable", "shim" ], - "time": "2018-01-30 19:27:44" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/process", - "version": "v3.4.4", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "09a5172057be8fc677840e591b17f385e58c7c0d" + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/09a5172057be8fc677840e591b17f385e58c7c0d", - "reference": "09a5172057be8fc677840e591b17f385e58c7c0d", + "url": "https://api.github.com/repos/symfony/process/zipball/4cbf2db9abcb01486a21b7a059e03a62fae63187", + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187", "shasum": "" }, "require": { @@ -2206,27 +2261,27 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-01-29 09:03:43" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/routing", - "version": "v3.4.4", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "235d01730d553a97732990588407eaf6779bb4b2" + "reference": "e382da877f5304aabc12ec3073eec430670c8296" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/235d01730d553a97732990588407eaf6779bb4b2", - "reference": "235d01730d553a97732990588407eaf6779bb4b2", + "url": "https://api.github.com/repos/symfony/routing/zipball/e382da877f5304aabc12ec3073eec430670c8296", + "reference": "e382da877f5304aabc12ec3073eec430670c8296", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8" }, "conflict": { - "symfony/config": "<2.8", + "symfony/config": "<3.3.1", "symfony/dependency-injection": "<3.3", "symfony/yaml": "<3.4" }, @@ -2234,7 +2289,7 @@ "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", + "symfony/config": "^3.3.1|~4.0", "symfony/dependency-injection": "~3.3|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/http-foundation": "~2.8|~3.0|~4.0", @@ -2284,48 +2339,49 @@ "uri", "url" ], - "time": "2018-01-16 18:03:57" + "time": "2018-05-16T12:49:49+00:00" }, { "name": "symfony/translation", - "version": "v3.4.4", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "10b32cf0eae28b9b39fe26c456c42b19854c4b84" + "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/10b32cf0eae28b9b39fe26c456c42b19854c4b84", - "reference": "10b32cf0eae28b9b39fe26c456c42b19854c4b84", + "url": "https://api.github.com/repos/symfony/translation/zipball/16328f5b217cebc8dd4adfe4aeeaa8c377581f5a", + "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.8", + "symfony/config": "<3.4", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/intl": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { - "psr/log": "To use logging capability in translator", + "psr/log-implementation": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2352,20 +2408,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-01-18 22:16:57" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.4.4", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "472a9849930cf21f73abdb02240f17cf5b5bd1a7" + "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/472a9849930cf21f73abdb02240f17cf5b5bd1a7", - "reference": "472a9849930cf21f73abdb02240f17cf5b5bd1a7", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e6545672d8c9ce70dd472adc2f8b03155a46f73", + "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73", "shasum": "" }, "require": { @@ -2421,7 +2477,7 @@ "debug", "dump" ], - "time": "2018-01-29 09:03:43" + "time": "2018-04-26T12:42:15+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -2468,7 +2524,7 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "time": "2017-11-27 11:13:29" + "time": "2017-11-27T11:13:29+00:00" }, { "name": "vlucas/phpdotenv", @@ -2518,38 +2574,38 @@ "env", "environment" ], - "time": "2016-09-01 10:05:43" + "time": "2016-09-01T10:05:43+00:00" } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -2574,20 +2630,20 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "filp/whoops", - "version": "2.1.14", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6" + "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", - "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", + "url": "https://api.github.com/repos/filp/whoops/zipball/181c4502d8f34db7aed7bfe88d4f87875b8e947a", + "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a", "shasum": "" }, "require": { @@ -2595,9 +2651,9 @@ "psr/log": "^1.0.1" }, "require-dev": { - "mockery/mockery": "0.9.*", + "mockery/mockery": "^0.9 || ^1.0", "phpunit/phpunit": "^4.8.35 || ^5.7", - "symfony/var-dumper": "^2.6 || ^3.0" + "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0" }, "suggest": { "symfony/var-dumper": "Pretty print complex values better with var-dumper available", @@ -2606,7 +2662,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -2635,7 +2691,7 @@ "throwable", "whoops" ], - "time": "2017-11-23 18:22:44" + "time": "2018-03-03T17:56:25+00:00" }, { "name": "fzaninotto/faker", @@ -2685,7 +2741,7 @@ "faker", "fixtures" ], - "time": "2017-08-15 16:48:10" + "time": "2017-08-15T16:48:10+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -2733,20 +2789,20 @@ "keywords": [ "test" ], - "time": "2016-01-20 08:20:44" + "time": "2016-01-20T08:20:44+00:00" }, { "name": "mockery/mockery", - "version": "1.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38" + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/1bac8c362b12f522fdd1f1fa3556284c91affa38", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38", + "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99", + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99", "shasum": "" }, "require": { @@ -2755,7 +2811,8 @@ "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~5.7|~6.1" + "phpdocumentor/phpdocumentor": "^2.9", + "phpunit/phpunit": "~5.7.10|~6.5" }, "type": "library", "extra": { @@ -2784,8 +2841,8 @@ "homepage": "http://davedevelopment.co.uk" } ], - "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.", - "homepage": "http://github.com/mockery/mockery", + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", "keywords": [ "BDD", "TDD", @@ -2798,29 +2855,32 @@ "test double", "testing" ], - "time": "2017-10-06 16:20:43" + "time": "2018-05-08T08:54:48+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.7.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", - "phpunit/phpunit": "^4.1" + "phpunit/phpunit": "^7.1" }, "type": "library", "autoload": { @@ -2843,7 +2903,7 @@ "object", "object graph" ], - "time": "2017-10-19 19:58:43" + "time": "2018-06-11T23:09:50+00:00" }, { "name": "phar-io/manifest", @@ -2898,7 +2958,7 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05 18:14:27" + "time": "2017-03-05T18:14:27+00:00" }, { "name": "phar-io/version", @@ -2945,7 +3005,7 @@ } ], "description": "Library for handling version information and constraints", - "time": "2017-03-05 17:38:23" + "time": "2017-03-05T17:38:23+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2999,7 +3059,7 @@ "reflection", "static analysis" ], - "time": "2017-09-11 18:02:19" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -3050,7 +3110,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30 07:14:17" + "time": "2017-11-30T07:14:17+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -3097,32 +3157,32 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14 14:27:02" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", - "version": "1.7.3", + "version": "1.7.6", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" }, "type": "library", "extra": { @@ -3160,20 +3220,20 @@ "spy", "stub" ], - "time": "2017-11-24 13:59:53" + "time": "2018-04-18T13:57:24+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "5.3.0", + "version": "5.3.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" + "reference": "c89677919c5dd6d3b3852f230a663118762218ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac", + "reference": "c89677919c5dd6d3b3852f230a663118762218ac", "shasum": "" }, "require": { @@ -3223,7 +3283,7 @@ "testing", "xunit" ], - "time": "2017-12-06 09:29:45" + "time": "2018-04-06T15:36:58+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3270,7 +3330,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27 13:52:08" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -3311,7 +3371,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -3360,7 +3420,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26 11:10:40" + "time": "2017-02-26T11:10:40+00:00" }, { "name": "phpunit/php-token-stream", @@ -3409,20 +3469,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-11-27 05:48:46" + "time": "2017-11-27T05:48:46+00:00" }, { "name": "phpunit/phpunit", - "version": "6.5.6", + "version": "6.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3330ef26ade05359d006041316ed0fa9e8e3cefe" + "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3330ef26ade05359d006041316ed0fa9e8e3cefe", - "reference": "3330ef26ade05359d006041316ed0fa9e8e3cefe", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b", + "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b", "shasum": "" }, "require": { @@ -3493,20 +3553,20 @@ "testing", "xunit" ], - "time": "2018-02-01 05:57:37" + "time": "2018-04-10T11:38:34+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "5.0.6", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf" + "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf", - "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", + "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", "shasum": "" }, "require": { @@ -3552,7 +3612,7 @@ "mock", "xunit" ], - "time": "2018-01-06 05:45:45" + "time": "2018-05-29T13:50:43+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -3597,7 +3657,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04 06:30:41" + "time": "2017-03-04T06:30:41+00:00" }, { "name": "sebastian/comparator", @@ -3661,7 +3721,7 @@ "compare", "equality" ], - "time": "2018-02-01 13:46:46" + "time": "2018-02-01T13:46:46+00:00" }, { "name": "sebastian/diff", @@ -3713,7 +3773,7 @@ "keywords": [ "diff" ], - "time": "2017-08-03 08:09:46" + "time": "2017-08-03T08:09:46+00:00" }, { "name": "sebastian/environment", @@ -3763,7 +3823,7 @@ "environment", "hhvm" ], - "time": "2017-07-01 08:51:00" + "time": "2017-07-01T08:51:00+00:00" }, { "name": "sebastian/exporter", @@ -3830,7 +3890,7 @@ "export", "exporter" ], - "time": "2017-04-03 13:19:02" + "time": "2017-04-03T13:19:02+00:00" }, { "name": "sebastian/global-state", @@ -3881,7 +3941,7 @@ "keywords": [ "global state" ], - "time": "2017-04-27 15:39:26" + "time": "2017-04-27T15:39:26+00:00" }, { "name": "sebastian/object-enumerator", @@ -3928,7 +3988,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03 12:35:26" + "time": "2017-08-03T12:35:26+00:00" }, { "name": "sebastian/object-reflector", @@ -3973,7 +4033,7 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29 09:07:27" + "time": "2017-03-29T09:07:27+00:00" }, { "name": "sebastian/recursion-context", @@ -4026,7 +4086,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03 06:23:57" + "time": "2017-03-03T06:23:57+00:00" }, { "name": "sebastian/resource-operations", @@ -4068,7 +4128,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -4111,20 +4171,20 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/thanks", - "version": "v1.0.5", + "version": "v1.0.7", "source": { "type": "git", "url": "https://github.com/symfony/thanks.git", - "reference": "c757ee0c9dcfcc0e9e30fbbbdcadeb9dcc9aaaf4" + "reference": "bade4992c46ed722162694b4af8d72f84402819a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/thanks/zipball/c757ee0c9dcfcc0e9e30fbbbdcadeb9dcc9aaaf4", - "reference": "c757ee0c9dcfcc0e9e30fbbbdcadeb9dcc9aaaf4", + "url": "https://api.github.com/repos/symfony/thanks/zipball/bade4992c46ed722162694b4af8d72f84402819a", + "reference": "bade4992c46ed722162694b4af8d72f84402819a", "shasum": "" }, "require": { @@ -4154,7 +4214,7 @@ } ], "description": "Give thanks (in the form of a GitHub ⭐) to your fellow PHP package maintainers (not limited to Symfony components)!", - "time": "2018-01-26 10:44:34" + "time": "2018-03-14T21:51:39+00:00" }, { "name": "theseer/tokenizer", @@ -4194,7 +4254,7 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2017-04-07 12:08:54" + "time": "2017-04-07T12:08:54+00:00" }, { "name": "webmozart/assert", @@ -4244,7 +4304,7 @@ "check", "validate" ], - "time": "2018-01-29 19:49:41" + "time": "2018-01-29T19:49:41+00:00" } ], "aliases": [], diff --git a/config/app.php b/config/app.php index 0dfb0a56..083d9d5b 100644 --- a/config/app.php +++ b/config/app.php @@ -14,7 +14,7 @@ return [ */ 'name' => env('APP_NAME', 'Heimdall'), - 'version' => '1.4.13', + 'version' => '1.4.14', /* |-------------------------------------------------------------------------- diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 36785cf7..1b3ea7ce 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -30,21 +30,38 @@ return array( 'App\\Providers\\RouteServiceProvider' => $baseDir . '/app/Providers/RouteServiceProvider.php', 'App\\Setting' => $baseDir . '/app/Setting.php', 'App\\SettingGroup' => $baseDir . '/app/SettingGroup.php', + 'App\\SupportedApps\\AirSonic' => $baseDir . '/app/SupportedApps/AirSonic.php', + 'App\\SupportedApps\\Booksonic' => $baseDir . '/app/SupportedApps/Booksonic.php', + 'App\\SupportedApps\\Cardigann' => $baseDir . '/app/SupportedApps/Cardigann.php', 'App\\SupportedApps\\Contracts\\Applications' => $baseDir . '/app/SupportedApps/Contracts/Applications.php', 'App\\SupportedApps\\Contracts\\Livestats' => $baseDir . '/app/SupportedApps/Contracts/Livestats.php', + 'App\\SupportedApps\\CouchPotato' => $baseDir . '/app/SupportedApps/CouchPotato.php', 'App\\SupportedApps\\Deluge' => $baseDir . '/app/SupportedApps/Deluge.php', + 'App\\SupportedApps\\Dokuwiki' => $baseDir . '/app/SupportedApps/Dokuwiki.php', 'App\\SupportedApps\\Duplicati' => $baseDir . '/app/SupportedApps/Duplicati.php', 'App\\SupportedApps\\Emby' => $baseDir . '/app/SupportedApps/Emby.php', + 'App\\SupportedApps\\Flood' => $baseDir . '/app/SupportedApps/Flood.php', + 'App\\SupportedApps\\Gitea' => $baseDir . '/app/SupportedApps/Gitea.php', + 'App\\SupportedApps\\Glances' => $baseDir . '/app/SupportedApps/Glances.php', + 'App\\SupportedApps\\Grafana' => $baseDir . '/app/SupportedApps/Grafana.php', + 'App\\SupportedApps\\Graylog' => $baseDir . '/app/SupportedApps/Graylog.php', + 'App\\SupportedApps\\Headphones' => $baseDir . '/app/SupportedApps/Headphones.php', 'App\\SupportedApps\\HomeAssistant' => $baseDir . '/app/SupportedApps/HomeAssistant.php', 'App\\SupportedApps\\Jackett' => $baseDir . '/app/SupportedApps/Jackett.php', 'App\\SupportedApps\\Jdownloader' => $baseDir . '/app/SupportedApps/Jdownloader.php', + 'App\\SupportedApps\\Krusader' => $baseDir . '/app/SupportedApps/Krusader.php', 'App\\SupportedApps\\Lidarr' => $baseDir . '/app/SupportedApps/Lidarr.php', 'App\\SupportedApps\\Mcmyadmin' => $baseDir . '/app/SupportedApps/Mcmyadmin.php', 'App\\SupportedApps\\Medusa' => $baseDir . '/app/SupportedApps/Medusa.php', + 'App\\SupportedApps\\MusicBrainz' => $baseDir . '/app/SupportedApps/MusicBrainz.php', + 'App\\SupportedApps\\Mylar' => $baseDir . '/app/SupportedApps/Mylar.php', 'App\\SupportedApps\\Netdata' => $baseDir . '/app/SupportedApps/Netdata.php', 'App\\SupportedApps\\Nextcloud' => $baseDir . '/app/SupportedApps/Nextcloud.php', + 'App\\SupportedApps\\NowShowing' => $baseDir . '/app/SupportedApps/NowShowing.php', 'App\\SupportedApps\\Nzbget' => $baseDir . '/app/SupportedApps/Nzbget.php', 'App\\SupportedApps\\Nzbhydra' => $baseDir . '/app/SupportedApps/Nzbhydra.php', + 'App\\SupportedApps\\Ombi' => $baseDir . '/app/SupportedApps/Ombi.php', + 'App\\SupportedApps\\OpenMediaVault' => $baseDir . '/app/SupportedApps/OpenMediaVault.php', 'App\\SupportedApps\\Openhab' => $baseDir . '/app/SupportedApps/Openhab.php', 'App\\SupportedApps\\Opnsense' => $baseDir . '/app/SupportedApps/Opnsense.php', 'App\\SupportedApps\\Pfsense' => $baseDir . '/app/SupportedApps/Pfsense.php', @@ -55,19 +72,30 @@ return array( 'App\\SupportedApps\\Portainer' => $baseDir . '/app/SupportedApps/Portainer.php', 'App\\SupportedApps\\Proxmox' => $baseDir . '/app/SupportedApps/Proxmox.php', 'App\\SupportedApps\\Radarr' => $baseDir . '/app/SupportedApps/Radarr.php', + 'App\\SupportedApps\\Rancher' => $baseDir . '/app/SupportedApps/Rancher.php', + 'App\\SupportedApps\\Runeaudio' => $baseDir . '/app/SupportedApps/Runeaudio.php', 'App\\SupportedApps\\Sabnzbd' => $baseDir . '/app/SupportedApps/Sabnzbd.php', + 'App\\SupportedApps\\Sickrage' => $baseDir . '/app/SupportedApps/Sickrage.php', 'App\\SupportedApps\\Sonarr' => $baseDir . '/app/SupportedApps/Sonarr.php', + 'App\\SupportedApps\\Syncthing' => $baseDir . '/app/SupportedApps/Syncthing.php', + 'App\\SupportedApps\\Tautulli' => $baseDir . '/app/SupportedApps/Tautulli.php', 'App\\SupportedApps\\Traefik' => $baseDir . '/app/SupportedApps/Traefik.php', 'App\\SupportedApps\\Transmission' => $baseDir . '/app/SupportedApps/Transmission.php', 'App\\SupportedApps\\Ttrss' => $baseDir . '/app/SupportedApps/Ttrss.php', 'App\\SupportedApps\\Unifi' => $baseDir . '/app/SupportedApps/Unifi.php', + 'App\\SupportedApps\\Unraid' => $baseDir . '/app/SupportedApps/Unraid.php', + 'App\\SupportedApps\\Watcher3' => $baseDir . '/app/SupportedApps/Watcher3.php', + 'App\\SupportedApps\\WebTools' => $baseDir . '/app/SupportedApps/WebTools.php', + 'App\\SupportedApps\\pyLoad' => $baseDir . '/app/SupportedApps/pyLoad.php', 'App\\SupportedApps\\ruTorrent' => $baseDir . '/app/SupportedApps/ruTorrent.php', 'App\\User' => $baseDir . '/app/User.php', 'ArithmeticError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php', 'AssertionError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/AssertionError.php', 'Carbon\\Carbon' => $vendorDir . '/nesbot/carbon/src/Carbon/Carbon.php', 'Carbon\\CarbonInterval' => $vendorDir . '/nesbot/carbon/src/Carbon/CarbonInterval.php', + 'Carbon\\CarbonPeriod' => $vendorDir . '/nesbot/carbon/src/Carbon/CarbonPeriod.php', 'Carbon\\Exceptions\\InvalidDateException' => $vendorDir . '/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php', + 'Carbon\\Translator' => $vendorDir . '/nesbot/carbon/src/Carbon/Translator.php', 'Collective\\Html\\Componentable' => $vendorDir . '/laravelcollective/html/src/Componentable.php', 'Collective\\Html\\Eloquent\\FormAccessible' => $vendorDir . '/laravelcollective/html/src/Eloquent/FormAccessible.php', 'Collective\\Html\\FormBuilder' => $vendorDir . '/laravelcollective/html/src/FormBuilder.php', @@ -1536,6 +1564,7 @@ return array( 'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => $vendorDir . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php', 'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => $vendorDir . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/InvalidStyleException.php', 'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => $vendorDir . '/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php', + 'JsonSerializable' => $vendorDir . '/nesbot/carbon/src/JsonSerializable.php', 'Laravel\\Tinker\\ClassAliasAutoloader' => $vendorDir . '/laravel/tinker/src/ClassAliasAutoloader.php', 'Laravel\\Tinker\\Console\\TinkerCommand' => $vendorDir . '/laravel/tinker/src/Console/TinkerCommand.php', 'Laravel\\Tinker\\TinkerCaster' => $vendorDir . '/laravel/tinker/src/TinkerCaster.php', @@ -1621,6 +1650,7 @@ return array( 'Mockery\\Generator\\StringManipulation\\Pass\\CallTypeHintPass' => $vendorDir . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/CallTypeHintPass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\ClassNamePass' => $vendorDir . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ClassNamePass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\ClassPass' => $vendorDir . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ClassPass.php', + 'Mockery\\Generator\\StringManipulation\\Pass\\ConstantsPass' => $vendorDir . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ConstantsPass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\InstanceMockPass' => $vendorDir . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/InstanceMockPass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\InterfacePass' => $vendorDir . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/InterfacePass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\MagicMethodTypeHintsPass' => $vendorDir . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPass.php', @@ -1637,6 +1667,7 @@ return array( 'Mockery\\Loader\\EvalLoader' => $vendorDir . '/mockery/mockery/library/Mockery/Loader/EvalLoader.php', 'Mockery\\Loader\\Loader' => $vendorDir . '/mockery/mockery/library/Mockery/Loader/Loader.php', 'Mockery\\Loader\\RequireLoader' => $vendorDir . '/mockery/mockery/library/Mockery/Loader/RequireLoader.php', + 'Mockery\\Matcher\\AndAnyOtherArgs' => $vendorDir . '/mockery/mockery/library/Mockery/Matcher/AndAnyOtherArgs.php', 'Mockery\\Matcher\\Any' => $vendorDir . '/mockery/mockery/library/Mockery/Matcher/Any.php', 'Mockery\\Matcher\\AnyArgs' => $vendorDir . '/mockery/mockery/library/Mockery/Matcher/AnyArgs.php', 'Mockery\\Matcher\\AnyOf' => $vendorDir . '/mockery/mockery/library/Mockery/Matcher/AnyOf.php', @@ -2191,10 +2222,9 @@ return array( 'PharIo\\Version\\VersionConstraintParser' => $vendorDir . '/phar-io/version/src/VersionConstraintParser.php', 'PharIo\\Version\\VersionConstraintValue' => $vendorDir . '/phar-io/version/src/VersionConstraintValue.php', 'PharIo\\Version\\VersionNumber' => $vendorDir . '/phar-io/version/src/VersionNumber.php', - 'PhpParser\\Autoloader' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Autoloader.php', 'PhpParser\\Builder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder.php', - 'PhpParser\\BuilderAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderAbstract.php', 'PhpParser\\BuilderFactory' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php', + 'PhpParser\\BuilderHelpers' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderHelpers.php', 'PhpParser\\Builder\\Class_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Class_.php', 'PhpParser\\Builder\\Declaration' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Declaration.php', 'PhpParser\\Builder\\FunctionLike' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php', @@ -2208,19 +2238,31 @@ return array( 'PhpParser\\Builder\\Use_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Use_.php', 'PhpParser\\Comment' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Comment.php', 'PhpParser\\Comment\\Doc' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Comment/Doc.php', + 'PhpParser\\ConstExprEvaluationException' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php', + 'PhpParser\\ConstExprEvaluator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php', 'PhpParser\\Error' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Error.php', 'PhpParser\\ErrorHandler' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ErrorHandler.php', 'PhpParser\\ErrorHandler\\Collecting' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ErrorHandler/Collecting.php', 'PhpParser\\ErrorHandler\\Throwing' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php', + 'PhpParser\\Internal\\DiffElem' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php', + 'PhpParser\\Internal\\Differ' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Internal/Differ.php', + 'PhpParser\\Internal\\PrintableNewAnonClassNode' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php', + 'PhpParser\\Internal\\TokenStream' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php', + 'PhpParser\\JsonDecoder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/JsonDecoder.php', 'PhpParser\\Lexer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer.php', 'PhpParser\\Lexer\\Emulative' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php', + 'PhpParser\\NameContext' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NameContext.php', 'PhpParser\\Node' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node.php', 'PhpParser\\NodeAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeAbstract.php', 'PhpParser\\NodeDumper' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeDumper.php', + 'PhpParser\\NodeFinder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeFinder.php', 'PhpParser\\NodeTraverser' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeTraverser.php', 'PhpParser\\NodeTraverserInterface' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php', 'PhpParser\\NodeVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor.php', 'PhpParser\\NodeVisitorAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php', + 'PhpParser\\NodeVisitor\\CloningVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php', + 'PhpParser\\NodeVisitor\\FindingVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php', + 'PhpParser\\NodeVisitor\\FirstFindingVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php', 'PhpParser\\NodeVisitor\\NameResolver' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php', 'PhpParser\\Node\\Arg' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Arg.php', 'PhpParser\\Node\\Const_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Const_.php', @@ -2314,6 +2356,7 @@ return array( 'PhpParser\\Node\\Expr\\YieldFrom' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php', 'PhpParser\\Node\\Expr\\Yield_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php', 'PhpParser\\Node\\FunctionLike' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php', + 'PhpParser\\Node\\Identifier' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Identifier.php', 'PhpParser\\Node\\Name' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name.php', 'PhpParser\\Node\\Name\\FullyQualified' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php', 'PhpParser\\Node\\Name\\Relative' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php', @@ -2350,6 +2393,7 @@ return array( 'PhpParser\\Node\\Stmt\\Echo_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php', 'PhpParser\\Node\\Stmt\\ElseIf_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php', 'PhpParser\\Node\\Stmt\\Else_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php', + 'PhpParser\\Node\\Stmt\\Expression' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php', 'PhpParser\\Node\\Stmt\\Finally_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php', 'PhpParser\\Node\\Stmt\\For_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php', 'PhpParser\\Node\\Stmt\\Foreach_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php', @@ -2381,6 +2425,7 @@ return array( 'PhpParser\\Node\\Stmt\\UseUse' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php', 'PhpParser\\Node\\Stmt\\Use_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php', 'PhpParser\\Node\\Stmt\\While_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php', + 'PhpParser\\Node\\VarLikeIdentifier' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php', 'PhpParser\\Parser' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser.php', 'PhpParser\\ParserAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ParserAbstract.php', 'PhpParser\\ParserFactory' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ParserFactory.php', @@ -2390,10 +2435,6 @@ return array( 'PhpParser\\Parser\\Tokens' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser/Tokens.php', 'PhpParser\\PrettyPrinterAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php', 'PhpParser\\PrettyPrinter\\Standard' => $vendorDir . '/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php', - 'PhpParser\\Serializer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Serializer.php', - 'PhpParser\\Serializer\\XML' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Serializer/XML.php', - 'PhpParser\\Unserializer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Unserializer.php', - 'PhpParser\\Unserializer\\XML' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Unserializer/XML.php', 'Prophecy\\Argument' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Argument.php', 'Prophecy\\Argument\\ArgumentsWildcard' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Argument/ArgumentsWildcard.php', 'Prophecy\\Argument\\Token\\AnyValueToken' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValueToken.php', @@ -2435,6 +2476,7 @@ return array( 'Prophecy\\Doubler\\Generator\\Node\\ClassNode' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ClassNode.php', 'Prophecy\\Doubler\\Generator\\Node\\MethodNode' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/MethodNode.php', 'Prophecy\\Doubler\\Generator\\ReflectionInterface' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/Generator/ReflectionInterface.php', + 'Prophecy\\Doubler\\Generator\\TypeHintReference' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/Generator/TypeHintReference.php', 'Prophecy\\Doubler\\LazyDouble' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/LazyDouble.php', 'Prophecy\\Doubler\\NameGenerator' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/NameGenerator.php', 'Prophecy\\Exception\\Call\\UnexpectedCallException' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Exception/Call/UnexpectedCallException.php', @@ -2504,136 +2546,144 @@ return array( 'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php', 'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php', 'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php', - 'Psy\\Autoloader' => $vendorDir . '/psy/psysh/src/Psy/Autoloader.php', - 'Psy\\CodeCleaner' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner.php', - 'Psy\\CodeCleaner\\AbstractClassPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/AbstractClassPass.php', - 'Psy\\CodeCleaner\\AssignThisVariablePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/AssignThisVariablePass.php', - 'Psy\\CodeCleaner\\CallTimePassByReferencePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/CallTimePassByReferencePass.php', - 'Psy\\CodeCleaner\\CalledClassPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/CalledClassPass.php', - 'Psy\\CodeCleaner\\CodeCleanerPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/CodeCleanerPass.php', - 'Psy\\CodeCleaner\\ExitPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/ExitPass.php', - 'Psy\\CodeCleaner\\FinalClassPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/FinalClassPass.php', - 'Psy\\CodeCleaner\\FunctionContextPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/FunctionContextPass.php', - 'Psy\\CodeCleaner\\FunctionReturnInWriteContextPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/FunctionReturnInWriteContextPass.php', - 'Psy\\CodeCleaner\\ImplicitReturnPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/ImplicitReturnPass.php', - 'Psy\\CodeCleaner\\InstanceOfPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php', - 'Psy\\CodeCleaner\\LeavePsyshAlonePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/LeavePsyshAlonePass.php', - 'Psy\\CodeCleaner\\LegacyEmptyPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/LegacyEmptyPass.php', - 'Psy\\CodeCleaner\\LoopContextPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/LoopContextPass.php', - 'Psy\\CodeCleaner\\MagicConstantsPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/MagicConstantsPass.php', - 'Psy\\CodeCleaner\\NamespaceAwarePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/NamespaceAwarePass.php', - 'Psy\\CodeCleaner\\NamespacePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/NamespacePass.php', - 'Psy\\CodeCleaner\\NoReturnValue' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/NoReturnValue.php', - 'Psy\\CodeCleaner\\PassableByReferencePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/PassableByReferencePass.php', - 'Psy\\CodeCleaner\\RequirePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/RequirePass.php', - 'Psy\\CodeCleaner\\StaticConstructorPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php', - 'Psy\\CodeCleaner\\StrictTypesPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php', - 'Psy\\CodeCleaner\\UseStatementPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/UseStatementPass.php', - 'Psy\\CodeCleaner\\ValidClassNamePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/ValidClassNamePass.php', - 'Psy\\CodeCleaner\\ValidConstantPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/ValidConstantPass.php', - 'Psy\\CodeCleaner\\ValidFunctionNamePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/ValidFunctionNamePass.php', - 'Psy\\Command\\BufferCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/BufferCommand.php', - 'Psy\\Command\\ClearCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/ClearCommand.php', - 'Psy\\Command\\Command' => $vendorDir . '/psy/psysh/src/Psy/Command/Command.php', - 'Psy\\Command\\DocCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/DocCommand.php', - 'Psy\\Command\\DumpCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/DumpCommand.php', - 'Psy\\Command\\EditCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/EditCommand.php', - 'Psy\\Command\\ExitCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/ExitCommand.php', - 'Psy\\Command\\HelpCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/HelpCommand.php', - 'Psy\\Command\\HistoryCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/HistoryCommand.php', - 'Psy\\Command\\ListCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand.php', - 'Psy\\Command\\ListCommand\\ClassConstantEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/ClassConstantEnumerator.php', - 'Psy\\Command\\ListCommand\\ClassEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/ClassEnumerator.php', - 'Psy\\Command\\ListCommand\\ConstantEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/ConstantEnumerator.php', - 'Psy\\Command\\ListCommand\\Enumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/Enumerator.php', - 'Psy\\Command\\ListCommand\\FunctionEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/FunctionEnumerator.php', - 'Psy\\Command\\ListCommand\\GlobalVariableEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/GlobalVariableEnumerator.php', - 'Psy\\Command\\ListCommand\\InterfaceEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/InterfaceEnumerator.php', - 'Psy\\Command\\ListCommand\\MethodEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/MethodEnumerator.php', - 'Psy\\Command\\ListCommand\\PropertyEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/PropertyEnumerator.php', - 'Psy\\Command\\ListCommand\\TraitEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/TraitEnumerator.php', - 'Psy\\Command\\ListCommand\\VariableEnumerator' => $vendorDir . '/psy/psysh/src/Psy/Command/ListCommand/VariableEnumerator.php', - 'Psy\\Command\\ParseCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/ParseCommand.php', - 'Psy\\Command\\PsyVersionCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/PsyVersionCommand.php', - 'Psy\\Command\\ReflectingCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/ReflectingCommand.php', - 'Psy\\Command\\ShowCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/ShowCommand.php', - 'Psy\\Command\\SudoCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/SudoCommand.php', - 'Psy\\Command\\ThrowUpCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/ThrowUpCommand.php', - 'Psy\\Command\\TraceCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/TraceCommand.php', - 'Psy\\Command\\WhereamiCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/WhereamiCommand.php', - 'Psy\\Command\\WtfCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/WtfCommand.php', - 'Psy\\Compiler' => $vendorDir . '/psy/psysh/src/Psy/Compiler.php', - 'Psy\\ConfigPaths' => $vendorDir . '/psy/psysh/src/Psy/ConfigPaths.php', - 'Psy\\Configuration' => $vendorDir . '/psy/psysh/src/Psy/Configuration.php', - 'Psy\\ConsoleColorFactory' => $vendorDir . '/psy/psysh/src/Psy/ConsoleColorFactory.php', - 'Psy\\Context' => $vendorDir . '/psy/psysh/src/Psy/Context.php', - 'Psy\\ContextAware' => $vendorDir . '/psy/psysh/src/Psy/ContextAware.php', - 'Psy\\Exception\\BreakException' => $vendorDir . '/psy/psysh/src/Psy/Exception/BreakException.php', - 'Psy\\Exception\\DeprecatedException' => $vendorDir . '/psy/psysh/src/Psy/Exception/DeprecatedException.php', - 'Psy\\Exception\\ErrorException' => $vendorDir . '/psy/psysh/src/Psy/Exception/ErrorException.php', - 'Psy\\Exception\\Exception' => $vendorDir . '/psy/psysh/src/Psy/Exception/Exception.php', - 'Psy\\Exception\\FatalErrorException' => $vendorDir . '/psy/psysh/src/Psy/Exception/FatalErrorException.php', - 'Psy\\Exception\\ParseErrorException' => $vendorDir . '/psy/psysh/src/Psy/Exception/ParseErrorException.php', - 'Psy\\Exception\\RuntimeException' => $vendorDir . '/psy/psysh/src/Psy/Exception/RuntimeException.php', - 'Psy\\Exception\\ThrowUpException' => $vendorDir . '/psy/psysh/src/Psy/Exception/ThrowUpException.php', - 'Psy\\Exception\\TypeErrorException' => $vendorDir . '/psy/psysh/src/Psy/Exception/TypeErrorException.php', - 'Psy\\ExecutionLoop\\ForkingLoop' => $vendorDir . '/psy/psysh/src/Psy/ExecutionLoop/ForkingLoop.php', - 'Psy\\ExecutionLoop\\Loop' => $vendorDir . '/psy/psysh/src/Psy/ExecutionLoop/Loop.php', - 'Psy\\Formatter\\CodeFormatter' => $vendorDir . '/psy/psysh/src/Psy/Formatter/CodeFormatter.php', - 'Psy\\Formatter\\DocblockFormatter' => $vendorDir . '/psy/psysh/src/Psy/Formatter/DocblockFormatter.php', - 'Psy\\Formatter\\Formatter' => $vendorDir . '/psy/psysh/src/Psy/Formatter/Formatter.php', - 'Psy\\Formatter\\SignatureFormatter' => $vendorDir . '/psy/psysh/src/Psy/Formatter/SignatureFormatter.php', - 'Psy\\Input\\CodeArgument' => $vendorDir . '/psy/psysh/src/Psy/Input/CodeArgument.php', - 'Psy\\Input\\FilterOptions' => $vendorDir . '/psy/psysh/src/Psy/Input/FilterOptions.php', - 'Psy\\Input\\ShellInput' => $vendorDir . '/psy/psysh/src/Psy/Input/ShellInput.php', - 'Psy\\Input\\SilentInput' => $vendorDir . '/psy/psysh/src/Psy/Input/SilentInput.php', - 'Psy\\Output\\OutputPager' => $vendorDir . '/psy/psysh/src/Psy/Output/OutputPager.php', - 'Psy\\Output\\PassthruPager' => $vendorDir . '/psy/psysh/src/Psy/Output/PassthruPager.php', - 'Psy\\Output\\ProcOutputPager' => $vendorDir . '/psy/psysh/src/Psy/Output/ProcOutputPager.php', - 'Psy\\Output\\ShellOutput' => $vendorDir . '/psy/psysh/src/Psy/Output/ShellOutput.php', - 'Psy\\ParserFactory' => $vendorDir . '/psy/psysh/src/Psy/ParserFactory.php', - 'Psy\\Readline\\GNUReadline' => $vendorDir . '/psy/psysh/src/Psy/Readline/GNUReadline.php', - 'Psy\\Readline\\HoaConsole' => $vendorDir . '/psy/psysh/src/Psy/Readline/HoaConsole.php', - 'Psy\\Readline\\Libedit' => $vendorDir . '/psy/psysh/src/Psy/Readline/Libedit.php', - 'Psy\\Readline\\Readline' => $vendorDir . '/psy/psysh/src/Psy/Readline/Readline.php', - 'Psy\\Readline\\Transient' => $vendorDir . '/psy/psysh/src/Psy/Readline/Transient.php', - 'Psy\\Reflection\\ReflectionConstant' => $vendorDir . '/psy/psysh/src/Psy/Reflection/ReflectionConstant.php', - 'Psy\\Reflection\\ReflectionLanguageConstruct' => $vendorDir . '/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstruct.php', - 'Psy\\Reflection\\ReflectionLanguageConstructParameter' => $vendorDir . '/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstructParameter.php', - 'Psy\\Shell' => $vendorDir . '/psy/psysh/src/Psy/Shell.php', - 'Psy\\Sudo' => $vendorDir . '/psy/psysh/src/Psy/Sudo.php', - 'Psy\\Sudo\\SudoVisitor' => $vendorDir . '/psy/psysh/src/Psy/Sudo/SudoVisitor.php', - 'Psy\\TabCompletion\\AutoCompleter' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/AutoCompleter.php', - 'Psy\\TabCompletion\\Matcher\\AbstractContextAwareMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractContextAwareMatcher.php', - 'Psy\\TabCompletion\\Matcher\\AbstractDefaultParametersMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php', - 'Psy\\TabCompletion\\Matcher\\AbstractMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ClassAttributesMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassAttributesMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ClassMethodDefaultParametersMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ClassMethodsMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ClassNamesMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassNamesMatcher.php', - 'Psy\\TabCompletion\\Matcher\\CommandsMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/CommandsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ConstantsMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/ConstantsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\FunctionDefaultParametersMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php', - 'Psy\\TabCompletion\\Matcher\\FunctionsMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\KeywordsMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/KeywordsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\MongoClientMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/MongoClientMatcher.php', - 'Psy\\TabCompletion\\Matcher\\MongoDatabaseMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/MongoDatabaseMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ObjectAttributesMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ObjectMethodDefaultParametersMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ObjectMethodsMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\VariablesMatcher' => $vendorDir . '/psy/psysh/src/Psy/TabCompletion/Matcher/VariablesMatcher.php', - 'Psy\\Util\\Docblock' => $vendorDir . '/psy/psysh/src/Psy/Util/Docblock.php', - 'Psy\\Util\\Json' => $vendorDir . '/psy/psysh/src/Psy/Util/Json.php', - 'Psy\\Util\\Mirror' => $vendorDir . '/psy/psysh/src/Psy/Util/Mirror.php', - 'Psy\\Util\\Str' => $vendorDir . '/psy/psysh/src/Psy/Util/Str.php', - 'Psy\\VarDumper\\Cloner' => $vendorDir . '/psy/psysh/src/Psy/VarDumper/Cloner.php', - 'Psy\\VarDumper\\Dumper' => $vendorDir . '/psy/psysh/src/Psy/VarDumper/Dumper.php', - 'Psy\\VarDumper\\Presenter' => $vendorDir . '/psy/psysh/src/Psy/VarDumper/Presenter.php', - 'Psy\\VarDumper\\PresenterAware' => $vendorDir . '/psy/psysh/src/Psy/VarDumper/PresenterAware.php', - 'Psy\\VersionUpdater\\Checker' => $vendorDir . '/psy/psysh/src/Psy/VersionUpdater/Checker.php', - 'Psy\\VersionUpdater\\GitHubChecker' => $vendorDir . '/psy/psysh/src/Psy/VersionUpdater/GitHubChecker.php', - 'Psy\\VersionUpdater\\IntervalChecker' => $vendorDir . '/psy/psysh/src/Psy/VersionUpdater/IntervalChecker.php', - 'Psy\\VersionUpdater\\NoopChecker' => $vendorDir . '/psy/psysh/src/Psy/VersionUpdater/NoopChecker.php', + 'Psy\\CodeCleaner' => $vendorDir . '/psy/psysh/src/CodeCleaner.php', + 'Psy\\CodeCleaner\\AbstractClassPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/AbstractClassPass.php', + 'Psy\\CodeCleaner\\AssignThisVariablePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/AssignThisVariablePass.php', + 'Psy\\CodeCleaner\\CallTimePassByReferencePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/CallTimePassByReferencePass.php', + 'Psy\\CodeCleaner\\CalledClassPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/CalledClassPass.php', + 'Psy\\CodeCleaner\\CodeCleanerPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/CodeCleanerPass.php', + 'Psy\\CodeCleaner\\ExitPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ExitPass.php', + 'Psy\\CodeCleaner\\FinalClassPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/FinalClassPass.php', + 'Psy\\CodeCleaner\\FunctionContextPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/FunctionContextPass.php', + 'Psy\\CodeCleaner\\FunctionReturnInWriteContextPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/FunctionReturnInWriteContextPass.php', + 'Psy\\CodeCleaner\\ImplicitReturnPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ImplicitReturnPass.php', + 'Psy\\CodeCleaner\\InstanceOfPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/InstanceOfPass.php', + 'Psy\\CodeCleaner\\LeavePsyshAlonePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php', + 'Psy\\CodeCleaner\\LegacyEmptyPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php', + 'Psy\\CodeCleaner\\ListPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ListPass.php', + 'Psy\\CodeCleaner\\LoopContextPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LoopContextPass.php', + 'Psy\\CodeCleaner\\MagicConstantsPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/MagicConstantsPass.php', + 'Psy\\CodeCleaner\\NamespaceAwarePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php', + 'Psy\\CodeCleaner\\NamespacePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/NamespacePass.php', + 'Psy\\CodeCleaner\\NoReturnValue' => $vendorDir . '/psy/psysh/src/CodeCleaner/NoReturnValue.php', + 'Psy\\CodeCleaner\\PassableByReferencePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/PassableByReferencePass.php', + 'Psy\\CodeCleaner\\RequirePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/RequirePass.php', + 'Psy\\CodeCleaner\\StrictTypesPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/StrictTypesPass.php', + 'Psy\\CodeCleaner\\UseStatementPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/UseStatementPass.php', + 'Psy\\CodeCleaner\\ValidClassNamePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ValidClassNamePass.php', + 'Psy\\CodeCleaner\\ValidConstantPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ValidConstantPass.php', + 'Psy\\CodeCleaner\\ValidConstructorPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ValidConstructorPass.php', + 'Psy\\CodeCleaner\\ValidFunctionNamePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ValidFunctionNamePass.php', + 'Psy\\Command\\BufferCommand' => $vendorDir . '/psy/psysh/src/Command/BufferCommand.php', + 'Psy\\Command\\ClearCommand' => $vendorDir . '/psy/psysh/src/Command/ClearCommand.php', + 'Psy\\Command\\Command' => $vendorDir . '/psy/psysh/src/Command/Command.php', + 'Psy\\Command\\DocCommand' => $vendorDir . '/psy/psysh/src/Command/DocCommand.php', + 'Psy\\Command\\DumpCommand' => $vendorDir . '/psy/psysh/src/Command/DumpCommand.php', + 'Psy\\Command\\EditCommand' => $vendorDir . '/psy/psysh/src/Command/EditCommand.php', + 'Psy\\Command\\ExitCommand' => $vendorDir . '/psy/psysh/src/Command/ExitCommand.php', + 'Psy\\Command\\HelpCommand' => $vendorDir . '/psy/psysh/src/Command/HelpCommand.php', + 'Psy\\Command\\HistoryCommand' => $vendorDir . '/psy/psysh/src/Command/HistoryCommand.php', + 'Psy\\Command\\ListCommand' => $vendorDir . '/psy/psysh/src/Command/ListCommand.php', + 'Psy\\Command\\ListCommand\\ClassConstantEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/ClassConstantEnumerator.php', + 'Psy\\Command\\ListCommand\\ClassEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/ClassEnumerator.php', + 'Psy\\Command\\ListCommand\\ConstantEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/ConstantEnumerator.php', + 'Psy\\Command\\ListCommand\\Enumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/Enumerator.php', + 'Psy\\Command\\ListCommand\\FunctionEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/FunctionEnumerator.php', + 'Psy\\Command\\ListCommand\\GlobalVariableEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/GlobalVariableEnumerator.php', + 'Psy\\Command\\ListCommand\\InterfaceEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/InterfaceEnumerator.php', + 'Psy\\Command\\ListCommand\\MethodEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/MethodEnumerator.php', + 'Psy\\Command\\ListCommand\\PropertyEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/PropertyEnumerator.php', + 'Psy\\Command\\ListCommand\\TraitEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/TraitEnumerator.php', + 'Psy\\Command\\ListCommand\\VariableEnumerator' => $vendorDir . '/psy/psysh/src/Command/ListCommand/VariableEnumerator.php', + 'Psy\\Command\\ParseCommand' => $vendorDir . '/psy/psysh/src/Command/ParseCommand.php', + 'Psy\\Command\\PsyVersionCommand' => $vendorDir . '/psy/psysh/src/Command/PsyVersionCommand.php', + 'Psy\\Command\\ReflectingCommand' => $vendorDir . '/psy/psysh/src/Command/ReflectingCommand.php', + 'Psy\\Command\\ShowCommand' => $vendorDir . '/psy/psysh/src/Command/ShowCommand.php', + 'Psy\\Command\\SudoCommand' => $vendorDir . '/psy/psysh/src/Command/SudoCommand.php', + 'Psy\\Command\\ThrowUpCommand' => $vendorDir . '/psy/psysh/src/Command/ThrowUpCommand.php', + 'Psy\\Command\\TimeitCommand' => $vendorDir . '/psy/psysh/src/Command/TimeitCommand.php', + 'Psy\\Command\\TimeitCommand\\TimeitVisitor' => $vendorDir . '/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php', + 'Psy\\Command\\TraceCommand' => $vendorDir . '/psy/psysh/src/Command/TraceCommand.php', + 'Psy\\Command\\WhereamiCommand' => $vendorDir . '/psy/psysh/src/Command/WhereamiCommand.php', + 'Psy\\Command\\WtfCommand' => $vendorDir . '/psy/psysh/src/Command/WtfCommand.php', + 'Psy\\ConfigPaths' => $vendorDir . '/psy/psysh/src/ConfigPaths.php', + 'Psy\\Configuration' => $vendorDir . '/psy/psysh/src/Configuration.php', + 'Psy\\ConsoleColorFactory' => $vendorDir . '/psy/psysh/src/ConsoleColorFactory.php', + 'Psy\\Context' => $vendorDir . '/psy/psysh/src/Context.php', + 'Psy\\ContextAware' => $vendorDir . '/psy/psysh/src/ContextAware.php', + 'Psy\\Exception\\BreakException' => $vendorDir . '/psy/psysh/src/Exception/BreakException.php', + 'Psy\\Exception\\DeprecatedException' => $vendorDir . '/psy/psysh/src/Exception/DeprecatedException.php', + 'Psy\\Exception\\ErrorException' => $vendorDir . '/psy/psysh/src/Exception/ErrorException.php', + 'Psy\\Exception\\Exception' => $vendorDir . '/psy/psysh/src/Exception/Exception.php', + 'Psy\\Exception\\FatalErrorException' => $vendorDir . '/psy/psysh/src/Exception/FatalErrorException.php', + 'Psy\\Exception\\ParseErrorException' => $vendorDir . '/psy/psysh/src/Exception/ParseErrorException.php', + 'Psy\\Exception\\RuntimeException' => $vendorDir . '/psy/psysh/src/Exception/RuntimeException.php', + 'Psy\\Exception\\ThrowUpException' => $vendorDir . '/psy/psysh/src/Exception/ThrowUpException.php', + 'Psy\\Exception\\TypeErrorException' => $vendorDir . '/psy/psysh/src/Exception/TypeErrorException.php', + 'Psy\\ExecutionClosure' => $vendorDir . '/psy/psysh/src/ExecutionClosure.php', + 'Psy\\ExecutionLoop' => $vendorDir . '/psy/psysh/src/ExecutionLoop.php', + 'Psy\\ExecutionLoopClosure' => $vendorDir . '/psy/psysh/src/ExecutionLoopClosure.php', + 'Psy\\ExecutionLoop\\AbstractListener' => $vendorDir . '/psy/psysh/src/ExecutionLoop/AbstractListener.php', + 'Psy\\ExecutionLoop\\Listener' => $vendorDir . '/psy/psysh/src/ExecutionLoop/Listener.php', + 'Psy\\ExecutionLoop\\ProcessForker' => $vendorDir . '/psy/psysh/src/ExecutionLoop/ProcessForker.php', + 'Psy\\ExecutionLoop\\RunkitReloader' => $vendorDir . '/psy/psysh/src/ExecutionLoop/RunkitReloader.php', + 'Psy\\Formatter\\CodeFormatter' => $vendorDir . '/psy/psysh/src/Formatter/CodeFormatter.php', + 'Psy\\Formatter\\DocblockFormatter' => $vendorDir . '/psy/psysh/src/Formatter/DocblockFormatter.php', + 'Psy\\Formatter\\Formatter' => $vendorDir . '/psy/psysh/src/Formatter/Formatter.php', + 'Psy\\Formatter\\SignatureFormatter' => $vendorDir . '/psy/psysh/src/Formatter/SignatureFormatter.php', + 'Psy\\Input\\CodeArgument' => $vendorDir . '/psy/psysh/src/Input/CodeArgument.php', + 'Psy\\Input\\FilterOptions' => $vendorDir . '/psy/psysh/src/Input/FilterOptions.php', + 'Psy\\Input\\ShellInput' => $vendorDir . '/psy/psysh/src/Input/ShellInput.php', + 'Psy\\Input\\SilentInput' => $vendorDir . '/psy/psysh/src/Input/SilentInput.php', + 'Psy\\Output\\OutputPager' => $vendorDir . '/psy/psysh/src/Output/OutputPager.php', + 'Psy\\Output\\PassthruPager' => $vendorDir . '/psy/psysh/src/Output/PassthruPager.php', + 'Psy\\Output\\ProcOutputPager' => $vendorDir . '/psy/psysh/src/Output/ProcOutputPager.php', + 'Psy\\Output\\ShellOutput' => $vendorDir . '/psy/psysh/src/Output/ShellOutput.php', + 'Psy\\ParserFactory' => $vendorDir . '/psy/psysh/src/ParserFactory.php', + 'Psy\\Readline\\GNUReadline' => $vendorDir . '/psy/psysh/src/Readline/GNUReadline.php', + 'Psy\\Readline\\HoaConsole' => $vendorDir . '/psy/psysh/src/Readline/HoaConsole.php', + 'Psy\\Readline\\Libedit' => $vendorDir . '/psy/psysh/src/Readline/Libedit.php', + 'Psy\\Readline\\Readline' => $vendorDir . '/psy/psysh/src/Readline/Readline.php', + 'Psy\\Readline\\Transient' => $vendorDir . '/psy/psysh/src/Readline/Transient.php', + 'Psy\\Reflection\\ReflectionClassConstant' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionClassConstant.php', + 'Psy\\Reflection\\ReflectionConstant' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionConstant.php', + 'Psy\\Reflection\\ReflectionConstant_' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionConstant_.php', + 'Psy\\Reflection\\ReflectionLanguageConstruct' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php', + 'Psy\\Reflection\\ReflectionLanguageConstructParameter' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php', + 'Psy\\Shell' => $vendorDir . '/psy/psysh/src/Shell.php', + 'Psy\\Sudo' => $vendorDir . '/psy/psysh/src/Sudo.php', + 'Psy\\Sudo\\SudoVisitor' => $vendorDir . '/psy/psysh/src/Sudo/SudoVisitor.php', + 'Psy\\TabCompletion\\AutoCompleter' => $vendorDir . '/psy/psysh/src/TabCompletion/AutoCompleter.php', + 'Psy\\TabCompletion\\Matcher\\AbstractContextAwareMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/AbstractContextAwareMatcher.php', + 'Psy\\TabCompletion\\Matcher\\AbstractDefaultParametersMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php', + 'Psy\\TabCompletion\\Matcher\\AbstractMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/AbstractMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ClassAttributesMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ClassMethodDefaultParametersMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ClassMethodsMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/ClassMethodsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ClassNamesMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/ClassNamesMatcher.php', + 'Psy\\TabCompletion\\Matcher\\CommandsMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/CommandsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ConstantsMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/ConstantsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\FunctionDefaultParametersMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php', + 'Psy\\TabCompletion\\Matcher\\FunctionsMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/FunctionsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\KeywordsMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/KeywordsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\MongoClientMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/MongoClientMatcher.php', + 'Psy\\TabCompletion\\Matcher\\MongoDatabaseMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/MongoDatabaseMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ObjectAttributesMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ObjectMethodDefaultParametersMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ObjectMethodsMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/ObjectMethodsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\VariablesMatcher' => $vendorDir . '/psy/psysh/src/TabCompletion/Matcher/VariablesMatcher.php', + 'Psy\\Util\\Docblock' => $vendorDir . '/psy/psysh/src/Util/Docblock.php', + 'Psy\\Util\\Json' => $vendorDir . '/psy/psysh/src/Util/Json.php', + 'Psy\\Util\\Mirror' => $vendorDir . '/psy/psysh/src/Util/Mirror.php', + 'Psy\\Util\\Str' => $vendorDir . '/psy/psysh/src/Util/Str.php', + 'Psy\\VarDumper\\Cloner' => $vendorDir . '/psy/psysh/src/VarDumper/Cloner.php', + 'Psy\\VarDumper\\Dumper' => $vendorDir . '/psy/psysh/src/VarDumper/Dumper.php', + 'Psy\\VarDumper\\Presenter' => $vendorDir . '/psy/psysh/src/VarDumper/Presenter.php', + 'Psy\\VarDumper\\PresenterAware' => $vendorDir . '/psy/psysh/src/VarDumper/PresenterAware.php', + 'Psy\\VersionUpdater\\Checker' => $vendorDir . '/psy/psysh/src/VersionUpdater/Checker.php', + 'Psy\\VersionUpdater\\GitHubChecker' => $vendorDir . '/psy/psysh/src/VersionUpdater/GitHubChecker.php', + 'Psy\\VersionUpdater\\IntervalChecker' => $vendorDir . '/psy/psysh/src/VersionUpdater/IntervalChecker.php', + 'Psy\\VersionUpdater\\NoopChecker' => $vendorDir . '/psy/psysh/src/VersionUpdater/NoopChecker.php', 'Ramsey\\Uuid\\BinaryUtils' => $vendorDir . '/ramsey/uuid/src/BinaryUtils.php', 'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php', 'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php', @@ -2917,7 +2967,6 @@ return array( 'Symfony\\Component\\Debug\\FatalErrorHandler\\FatalErrorHandlerInterface' => $vendorDir . '/symfony/debug/FatalErrorHandler/FatalErrorHandlerInterface.php', 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedFunctionFatalErrorHandler' => $vendorDir . '/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php', 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedMethodFatalErrorHandler' => $vendorDir . '/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php', - 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/ContainerAwareEventDispatcher.php', 'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php', 'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcherInterface' => $vendorDir . '/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php', 'Symfony\\Component\\EventDispatcher\\Debug\\WrappedListener' => $vendorDir . '/symfony/event-dispatcher/Debug/WrappedListener.php', @@ -3196,6 +3245,7 @@ return array( 'Symfony\\Component\\Routing\\Loader\\Configurator\\Traits\\RouteTrait' => $vendorDir . '/symfony/routing/Loader/Configurator/Traits/RouteTrait.php', 'Symfony\\Component\\Routing\\Loader\\DependencyInjection\\ServiceRouterLoader' => $vendorDir . '/symfony/routing/Loader/DependencyInjection/ServiceRouterLoader.php', 'Symfony\\Component\\Routing\\Loader\\DirectoryLoader' => $vendorDir . '/symfony/routing/Loader/DirectoryLoader.php', + 'Symfony\\Component\\Routing\\Loader\\GlobFileLoader' => $vendorDir . '/symfony/routing/Loader/GlobFileLoader.php', 'Symfony\\Component\\Routing\\Loader\\ObjectRouteLoader' => $vendorDir . '/symfony/routing/Loader/ObjectRouteLoader.php', 'Symfony\\Component\\Routing\\Loader\\PhpFileLoader' => $vendorDir . '/symfony/routing/Loader/PhpFileLoader.php', 'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => $vendorDir . '/symfony/routing/Loader/PhpFileLoader.php', @@ -3328,6 +3378,7 @@ return array( 'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Exception/ThrowingCasterException.php', 'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestTrait.php', 'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php', + 'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php', 'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php', 'Symfony\\Polyfill\\Php70\\Php70' => $vendorDir . '/symfony/polyfill-php70/Php70.php', 'Symfony\\Thanks\\Command\\ThanksCommand' => $vendorDir . '/symfony/thanks/src/Command/ThanksCommand.php', diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 9c8c93e1..1d1d477c 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -11,13 +11,14 @@ return array( '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php', '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php', '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php', - 'e7223560d890eab89cda23685e711e2c' => $vendorDir . '/psy/psysh/src/Psy/functions.php', - '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', + '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', - 'f18cc91337d49233e5754e93f3ed9ec3' => $vendorDir . '/laravelcollective/html/src/helpers.php', + '801c31d8ed748cfa537fa45402288c95' => $vendorDir . '/psy/psysh/src/functions.php', + '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', + '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', 'f0906e6318348a765ffb6eb24e0d0938' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/helpers.php', '58571171fd5812e6e447dce228f52f4d' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php', - '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', + 'f18cc91337d49233e5754e93f3ed9ec3' => $vendorDir . '/laravelcollective/html/src/helpers.php', 'e617b14322a074392076a2f38eaf6115' => $baseDir . '/app/Helper.php', ); diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 6987608a..4c0b1f17 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -15,6 +15,7 @@ return array( 'Symfony\\Thanks\\' => array($vendorDir . '/symfony/thanks/src'), 'Symfony\\Polyfill\\Php70\\' => array($vendorDir . '/symfony/polyfill-php70'), 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), + 'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'), 'Symfony\\Component\\VarDumper\\' => array($vendorDir . '/symfony/var-dumper'), 'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'), 'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'), @@ -27,7 +28,7 @@ return array( 'Symfony\\Component\\CssSelector\\' => array($vendorDir . '/symfony/css-selector'), 'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'), 'Ramsey\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'), - 'Psy\\' => array($vendorDir . '/psy/psysh/src/Psy'), + 'Psy\\' => array($vendorDir . '/psy/psysh/src'), 'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'), 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'), 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'), @@ -49,6 +50,6 @@ return array( 'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'), 'Cron\\' => array($vendorDir . '/mtdowling/cron-expression/src/Cron'), 'Collective\\Html\\' => array($vendorDir . '/laravelcollective/html/src'), - 'Carbon\\' => array($vendorDir . '/nesbot/carbon/src/Carbon'), 'App\\' => array($baseDir . '/app'), + '' => array($vendorDir . '/nesbot/carbon/src'), ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index be408257..4eb048a0 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -12,14 +12,15 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf '023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php', '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php', '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php', - 'e7223560d890eab89cda23685e711e2c' => __DIR__ . '/..' . '/psy/psysh/src/Psy/functions.php', - '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', + '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', - 'f18cc91337d49233e5754e93f3ed9ec3' => __DIR__ . '/..' . '/laravelcollective/html/src/helpers.php', + '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php', + '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', + '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', 'f0906e6318348a765ffb6eb24e0d0938' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/helpers.php', '58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php', - '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', + 'f18cc91337d49233e5754e93f3ed9ec3' => __DIR__ . '/..' . '/laravelcollective/html/src/helpers.php', 'e617b14322a074392076a2f38eaf6115' => __DIR__ . '/../..' . '/app/Helper.php', ); @@ -47,6 +48,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'Symfony\\Thanks\\' => 15, 'Symfony\\Polyfill\\Php70\\' => 23, 'Symfony\\Polyfill\\Mbstring\\' => 26, + 'Symfony\\Polyfill\\Ctype\\' => 23, 'Symfony\\Component\\VarDumper\\' => 28, 'Symfony\\Component\\Translation\\' => 30, 'Symfony\\Component\\Routing\\' => 26, @@ -111,7 +113,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf array ( 'Cron\\' => 5, 'Collective\\Html\\' => 16, - 'Carbon\\' => 7, ), 'A' => array ( @@ -158,6 +159,10 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring', ), + 'Symfony\\Polyfill\\Ctype\\' => + array ( + 0 => __DIR__ . '/..' . '/symfony/polyfill-ctype', + ), 'Symfony\\Component\\VarDumper\\' => array ( 0 => __DIR__ . '/..' . '/symfony/var-dumper', @@ -208,7 +213,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf ), 'Psy\\' => array ( - 0 => __DIR__ . '/..' . '/psy/psysh/src/Psy', + 0 => __DIR__ . '/..' . '/psy/psysh/src', ), 'Psr\\SimpleCache\\' => array ( @@ -294,16 +299,16 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf array ( 0 => __DIR__ . '/..' . '/laravelcollective/html/src', ), - 'Carbon\\' => - array ( - 0 => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon', - ), 'App\\' => array ( 0 => __DIR__ . '/../..' . '/app', ), ); + public static $fallbackDirsPsr4 = array ( + 0 => __DIR__ . '/..' . '/nesbot/carbon/src', + ); + public static $prefixesPsr0 = array ( 'P' => array ( @@ -368,21 +373,38 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'App\\Providers\\RouteServiceProvider' => __DIR__ . '/../..' . '/app/Providers/RouteServiceProvider.php', 'App\\Setting' => __DIR__ . '/../..' . '/app/Setting.php', 'App\\SettingGroup' => __DIR__ . '/../..' . '/app/SettingGroup.php', + 'App\\SupportedApps\\AirSonic' => __DIR__ . '/../..' . '/app/SupportedApps/AirSonic.php', + 'App\\SupportedApps\\Booksonic' => __DIR__ . '/../..' . '/app/SupportedApps/Booksonic.php', + 'App\\SupportedApps\\Cardigann' => __DIR__ . '/../..' . '/app/SupportedApps/Cardigann.php', 'App\\SupportedApps\\Contracts\\Applications' => __DIR__ . '/../..' . '/app/SupportedApps/Contracts/Applications.php', 'App\\SupportedApps\\Contracts\\Livestats' => __DIR__ . '/../..' . '/app/SupportedApps/Contracts/Livestats.php', + 'App\\SupportedApps\\CouchPotato' => __DIR__ . '/../..' . '/app/SupportedApps/CouchPotato.php', 'App\\SupportedApps\\Deluge' => __DIR__ . '/../..' . '/app/SupportedApps/Deluge.php', + 'App\\SupportedApps\\Dokuwiki' => __DIR__ . '/../..' . '/app/SupportedApps/Dokuwiki.php', 'App\\SupportedApps\\Duplicati' => __DIR__ . '/../..' . '/app/SupportedApps/Duplicati.php', 'App\\SupportedApps\\Emby' => __DIR__ . '/../..' . '/app/SupportedApps/Emby.php', + 'App\\SupportedApps\\Flood' => __DIR__ . '/../..' . '/app/SupportedApps/Flood.php', + 'App\\SupportedApps\\Gitea' => __DIR__ . '/../..' . '/app/SupportedApps/Gitea.php', + 'App\\SupportedApps\\Glances' => __DIR__ . '/../..' . '/app/SupportedApps/Glances.php', + 'App\\SupportedApps\\Grafana' => __DIR__ . '/../..' . '/app/SupportedApps/Grafana.php', + 'App\\SupportedApps\\Graylog' => __DIR__ . '/../..' . '/app/SupportedApps/Graylog.php', + 'App\\SupportedApps\\Headphones' => __DIR__ . '/../..' . '/app/SupportedApps/Headphones.php', 'App\\SupportedApps\\HomeAssistant' => __DIR__ . '/../..' . '/app/SupportedApps/HomeAssistant.php', 'App\\SupportedApps\\Jackett' => __DIR__ . '/../..' . '/app/SupportedApps/Jackett.php', 'App\\SupportedApps\\Jdownloader' => __DIR__ . '/../..' . '/app/SupportedApps/Jdownloader.php', + 'App\\SupportedApps\\Krusader' => __DIR__ . '/../..' . '/app/SupportedApps/Krusader.php', 'App\\SupportedApps\\Lidarr' => __DIR__ . '/../..' . '/app/SupportedApps/Lidarr.php', 'App\\SupportedApps\\Mcmyadmin' => __DIR__ . '/../..' . '/app/SupportedApps/Mcmyadmin.php', 'App\\SupportedApps\\Medusa' => __DIR__ . '/../..' . '/app/SupportedApps/Medusa.php', + 'App\\SupportedApps\\MusicBrainz' => __DIR__ . '/../..' . '/app/SupportedApps/MusicBrainz.php', + 'App\\SupportedApps\\Mylar' => __DIR__ . '/../..' . '/app/SupportedApps/Mylar.php', 'App\\SupportedApps\\Netdata' => __DIR__ . '/../..' . '/app/SupportedApps/Netdata.php', 'App\\SupportedApps\\Nextcloud' => __DIR__ . '/../..' . '/app/SupportedApps/Nextcloud.php', + 'App\\SupportedApps\\NowShowing' => __DIR__ . '/../..' . '/app/SupportedApps/NowShowing.php', 'App\\SupportedApps\\Nzbget' => __DIR__ . '/../..' . '/app/SupportedApps/Nzbget.php', 'App\\SupportedApps\\Nzbhydra' => __DIR__ . '/../..' . '/app/SupportedApps/Nzbhydra.php', + 'App\\SupportedApps\\Ombi' => __DIR__ . '/../..' . '/app/SupportedApps/Ombi.php', + 'App\\SupportedApps\\OpenMediaVault' => __DIR__ . '/../..' . '/app/SupportedApps/OpenMediaVault.php', 'App\\SupportedApps\\Openhab' => __DIR__ . '/../..' . '/app/SupportedApps/Openhab.php', 'App\\SupportedApps\\Opnsense' => __DIR__ . '/../..' . '/app/SupportedApps/Opnsense.php', 'App\\SupportedApps\\Pfsense' => __DIR__ . '/../..' . '/app/SupportedApps/Pfsense.php', @@ -393,19 +415,30 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'App\\SupportedApps\\Portainer' => __DIR__ . '/../..' . '/app/SupportedApps/Portainer.php', 'App\\SupportedApps\\Proxmox' => __DIR__ . '/../..' . '/app/SupportedApps/Proxmox.php', 'App\\SupportedApps\\Radarr' => __DIR__ . '/../..' . '/app/SupportedApps/Radarr.php', + 'App\\SupportedApps\\Rancher' => __DIR__ . '/../..' . '/app/SupportedApps/Rancher.php', + 'App\\SupportedApps\\Runeaudio' => __DIR__ . '/../..' . '/app/SupportedApps/Runeaudio.php', 'App\\SupportedApps\\Sabnzbd' => __DIR__ . '/../..' . '/app/SupportedApps/Sabnzbd.php', + 'App\\SupportedApps\\Sickrage' => __DIR__ . '/../..' . '/app/SupportedApps/Sickrage.php', 'App\\SupportedApps\\Sonarr' => __DIR__ . '/../..' . '/app/SupportedApps/Sonarr.php', + 'App\\SupportedApps\\Syncthing' => __DIR__ . '/../..' . '/app/SupportedApps/Syncthing.php', + 'App\\SupportedApps\\Tautulli' => __DIR__ . '/../..' . '/app/SupportedApps/Tautulli.php', 'App\\SupportedApps\\Traefik' => __DIR__ . '/../..' . '/app/SupportedApps/Traefik.php', 'App\\SupportedApps\\Transmission' => __DIR__ . '/../..' . '/app/SupportedApps/Transmission.php', 'App\\SupportedApps\\Ttrss' => __DIR__ . '/../..' . '/app/SupportedApps/Ttrss.php', 'App\\SupportedApps\\Unifi' => __DIR__ . '/../..' . '/app/SupportedApps/Unifi.php', + 'App\\SupportedApps\\Unraid' => __DIR__ . '/../..' . '/app/SupportedApps/Unraid.php', + 'App\\SupportedApps\\Watcher3' => __DIR__ . '/../..' . '/app/SupportedApps/Watcher3.php', + 'App\\SupportedApps\\WebTools' => __DIR__ . '/../..' . '/app/SupportedApps/WebTools.php', + 'App\\SupportedApps\\pyLoad' => __DIR__ . '/../..' . '/app/SupportedApps/pyLoad.php', 'App\\SupportedApps\\ruTorrent' => __DIR__ . '/../..' . '/app/SupportedApps/ruTorrent.php', 'App\\User' => __DIR__ . '/../..' . '/app/User.php', 'ArithmeticError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php', 'AssertionError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/AssertionError.php', 'Carbon\\Carbon' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Carbon.php', 'Carbon\\CarbonInterval' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/CarbonInterval.php', + 'Carbon\\CarbonPeriod' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/CarbonPeriod.php', 'Carbon\\Exceptions\\InvalidDateException' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php', + 'Carbon\\Translator' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Translator.php', 'Collective\\Html\\Componentable' => __DIR__ . '/..' . '/laravelcollective/html/src/Componentable.php', 'Collective\\Html\\Eloquent\\FormAccessible' => __DIR__ . '/..' . '/laravelcollective/html/src/Eloquent/FormAccessible.php', 'Collective\\Html\\FormBuilder' => __DIR__ . '/..' . '/laravelcollective/html/src/FormBuilder.php', @@ -1874,6 +1907,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php', 'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/InvalidStyleException.php', 'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => __DIR__ . '/..' . '/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php', + 'JsonSerializable' => __DIR__ . '/..' . '/nesbot/carbon/src/JsonSerializable.php', 'Laravel\\Tinker\\ClassAliasAutoloader' => __DIR__ . '/..' . '/laravel/tinker/src/ClassAliasAutoloader.php', 'Laravel\\Tinker\\Console\\TinkerCommand' => __DIR__ . '/..' . '/laravel/tinker/src/Console/TinkerCommand.php', 'Laravel\\Tinker\\TinkerCaster' => __DIR__ . '/..' . '/laravel/tinker/src/TinkerCaster.php', @@ -1959,6 +1993,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'Mockery\\Generator\\StringManipulation\\Pass\\CallTypeHintPass' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/CallTypeHintPass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\ClassNamePass' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ClassNamePass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\ClassPass' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ClassPass.php', + 'Mockery\\Generator\\StringManipulation\\Pass\\ConstantsPass' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ConstantsPass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\InstanceMockPass' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/InstanceMockPass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\InterfacePass' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/InterfacePass.php', 'Mockery\\Generator\\StringManipulation\\Pass\\MagicMethodTypeHintsPass' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPass.php', @@ -1975,6 +2010,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'Mockery\\Loader\\EvalLoader' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Loader/EvalLoader.php', 'Mockery\\Loader\\Loader' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Loader/Loader.php', 'Mockery\\Loader\\RequireLoader' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Loader/RequireLoader.php', + 'Mockery\\Matcher\\AndAnyOtherArgs' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Matcher/AndAnyOtherArgs.php', 'Mockery\\Matcher\\Any' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Matcher/Any.php', 'Mockery\\Matcher\\AnyArgs' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Matcher/AnyArgs.php', 'Mockery\\Matcher\\AnyOf' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Matcher/AnyOf.php', @@ -2529,10 +2565,9 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'PharIo\\Version\\VersionConstraintParser' => __DIR__ . '/..' . '/phar-io/version/src/VersionConstraintParser.php', 'PharIo\\Version\\VersionConstraintValue' => __DIR__ . '/..' . '/phar-io/version/src/VersionConstraintValue.php', 'PharIo\\Version\\VersionNumber' => __DIR__ . '/..' . '/phar-io/version/src/VersionNumber.php', - 'PhpParser\\Autoloader' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Autoloader.php', 'PhpParser\\Builder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder.php', - 'PhpParser\\BuilderAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderAbstract.php', 'PhpParser\\BuilderFactory' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php', + 'PhpParser\\BuilderHelpers' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderHelpers.php', 'PhpParser\\Builder\\Class_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Class_.php', 'PhpParser\\Builder\\Declaration' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Declaration.php', 'PhpParser\\Builder\\FunctionLike' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php', @@ -2546,19 +2581,31 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'PhpParser\\Builder\\Use_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Use_.php', 'PhpParser\\Comment' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Comment.php', 'PhpParser\\Comment\\Doc' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Comment/Doc.php', + 'PhpParser\\ConstExprEvaluationException' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php', + 'PhpParser\\ConstExprEvaluator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php', 'PhpParser\\Error' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Error.php', 'PhpParser\\ErrorHandler' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ErrorHandler.php', 'PhpParser\\ErrorHandler\\Collecting' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ErrorHandler/Collecting.php', 'PhpParser\\ErrorHandler\\Throwing' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php', + 'PhpParser\\Internal\\DiffElem' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php', + 'PhpParser\\Internal\\Differ' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Internal/Differ.php', + 'PhpParser\\Internal\\PrintableNewAnonClassNode' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php', + 'PhpParser\\Internal\\TokenStream' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php', + 'PhpParser\\JsonDecoder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/JsonDecoder.php', 'PhpParser\\Lexer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer.php', 'PhpParser\\Lexer\\Emulative' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php', + 'PhpParser\\NameContext' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NameContext.php', 'PhpParser\\Node' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node.php', 'PhpParser\\NodeAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeAbstract.php', 'PhpParser\\NodeDumper' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeDumper.php', + 'PhpParser\\NodeFinder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeFinder.php', 'PhpParser\\NodeTraverser' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeTraverser.php', 'PhpParser\\NodeTraverserInterface' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php', 'PhpParser\\NodeVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor.php', 'PhpParser\\NodeVisitorAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php', + 'PhpParser\\NodeVisitor\\CloningVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php', + 'PhpParser\\NodeVisitor\\FindingVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php', + 'PhpParser\\NodeVisitor\\FirstFindingVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php', 'PhpParser\\NodeVisitor\\NameResolver' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php', 'PhpParser\\Node\\Arg' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Arg.php', 'PhpParser\\Node\\Const_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Const_.php', @@ -2652,6 +2699,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'PhpParser\\Node\\Expr\\YieldFrom' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php', 'PhpParser\\Node\\Expr\\Yield_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php', 'PhpParser\\Node\\FunctionLike' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php', + 'PhpParser\\Node\\Identifier' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Identifier.php', 'PhpParser\\Node\\Name' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name.php', 'PhpParser\\Node\\Name\\FullyQualified' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php', 'PhpParser\\Node\\Name\\Relative' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php', @@ -2688,6 +2736,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'PhpParser\\Node\\Stmt\\Echo_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php', 'PhpParser\\Node\\Stmt\\ElseIf_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php', 'PhpParser\\Node\\Stmt\\Else_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php', + 'PhpParser\\Node\\Stmt\\Expression' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php', 'PhpParser\\Node\\Stmt\\Finally_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php', 'PhpParser\\Node\\Stmt\\For_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php', 'PhpParser\\Node\\Stmt\\Foreach_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php', @@ -2719,6 +2768,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'PhpParser\\Node\\Stmt\\UseUse' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php', 'PhpParser\\Node\\Stmt\\Use_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php', 'PhpParser\\Node\\Stmt\\While_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php', + 'PhpParser\\Node\\VarLikeIdentifier' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php', 'PhpParser\\Parser' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser.php', 'PhpParser\\ParserAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ParserAbstract.php', 'PhpParser\\ParserFactory' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ParserFactory.php', @@ -2728,10 +2778,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'PhpParser\\Parser\\Tokens' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser/Tokens.php', 'PhpParser\\PrettyPrinterAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php', 'PhpParser\\PrettyPrinter\\Standard' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php', - 'PhpParser\\Serializer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Serializer.php', - 'PhpParser\\Serializer\\XML' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Serializer/XML.php', - 'PhpParser\\Unserializer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Unserializer.php', - 'PhpParser\\Unserializer\\XML' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Unserializer/XML.php', 'Prophecy\\Argument' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Argument.php', 'Prophecy\\Argument\\ArgumentsWildcard' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Argument/ArgumentsWildcard.php', 'Prophecy\\Argument\\Token\\AnyValueToken' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValueToken.php', @@ -2773,6 +2819,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'Prophecy\\Doubler\\Generator\\Node\\ClassNode' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ClassNode.php', 'Prophecy\\Doubler\\Generator\\Node\\MethodNode' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/MethodNode.php', 'Prophecy\\Doubler\\Generator\\ReflectionInterface' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/Generator/ReflectionInterface.php', + 'Prophecy\\Doubler\\Generator\\TypeHintReference' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/Generator/TypeHintReference.php', 'Prophecy\\Doubler\\LazyDouble' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/LazyDouble.php', 'Prophecy\\Doubler\\NameGenerator' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/NameGenerator.php', 'Prophecy\\Exception\\Call\\UnexpectedCallException' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Exception/Call/UnexpectedCallException.php', @@ -2842,136 +2889,144 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php', 'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php', 'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php', - 'Psy\\Autoloader' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Autoloader.php', - 'Psy\\CodeCleaner' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner.php', - 'Psy\\CodeCleaner\\AbstractClassPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/AbstractClassPass.php', - 'Psy\\CodeCleaner\\AssignThisVariablePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/AssignThisVariablePass.php', - 'Psy\\CodeCleaner\\CallTimePassByReferencePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/CallTimePassByReferencePass.php', - 'Psy\\CodeCleaner\\CalledClassPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/CalledClassPass.php', - 'Psy\\CodeCleaner\\CodeCleanerPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/CodeCleanerPass.php', - 'Psy\\CodeCleaner\\ExitPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ExitPass.php', - 'Psy\\CodeCleaner\\FinalClassPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/FinalClassPass.php', - 'Psy\\CodeCleaner\\FunctionContextPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/FunctionContextPass.php', - 'Psy\\CodeCleaner\\FunctionReturnInWriteContextPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/FunctionReturnInWriteContextPass.php', - 'Psy\\CodeCleaner\\ImplicitReturnPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ImplicitReturnPass.php', - 'Psy\\CodeCleaner\\InstanceOfPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php', - 'Psy\\CodeCleaner\\LeavePsyshAlonePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/LeavePsyshAlonePass.php', - 'Psy\\CodeCleaner\\LegacyEmptyPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/LegacyEmptyPass.php', - 'Psy\\CodeCleaner\\LoopContextPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/LoopContextPass.php', - 'Psy\\CodeCleaner\\MagicConstantsPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/MagicConstantsPass.php', - 'Psy\\CodeCleaner\\NamespaceAwarePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/NamespaceAwarePass.php', - 'Psy\\CodeCleaner\\NamespacePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/NamespacePass.php', - 'Psy\\CodeCleaner\\NoReturnValue' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/NoReturnValue.php', - 'Psy\\CodeCleaner\\PassableByReferencePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/PassableByReferencePass.php', - 'Psy\\CodeCleaner\\RequirePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/RequirePass.php', - 'Psy\\CodeCleaner\\StaticConstructorPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php', - 'Psy\\CodeCleaner\\StrictTypesPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php', - 'Psy\\CodeCleaner\\UseStatementPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/UseStatementPass.php', - 'Psy\\CodeCleaner\\ValidClassNamePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ValidClassNamePass.php', - 'Psy\\CodeCleaner\\ValidConstantPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ValidConstantPass.php', - 'Psy\\CodeCleaner\\ValidFunctionNamePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ValidFunctionNamePass.php', - 'Psy\\Command\\BufferCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/BufferCommand.php', - 'Psy\\Command\\ClearCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ClearCommand.php', - 'Psy\\Command\\Command' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/Command.php', - 'Psy\\Command\\DocCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/DocCommand.php', - 'Psy\\Command\\DumpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/DumpCommand.php', - 'Psy\\Command\\EditCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/EditCommand.php', - 'Psy\\Command\\ExitCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ExitCommand.php', - 'Psy\\Command\\HelpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/HelpCommand.php', - 'Psy\\Command\\HistoryCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/HistoryCommand.php', - 'Psy\\Command\\ListCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand.php', - 'Psy\\Command\\ListCommand\\ClassConstantEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/ClassConstantEnumerator.php', - 'Psy\\Command\\ListCommand\\ClassEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/ClassEnumerator.php', - 'Psy\\Command\\ListCommand\\ConstantEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/ConstantEnumerator.php', - 'Psy\\Command\\ListCommand\\Enumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/Enumerator.php', - 'Psy\\Command\\ListCommand\\FunctionEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/FunctionEnumerator.php', - 'Psy\\Command\\ListCommand\\GlobalVariableEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/GlobalVariableEnumerator.php', - 'Psy\\Command\\ListCommand\\InterfaceEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/InterfaceEnumerator.php', - 'Psy\\Command\\ListCommand\\MethodEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/MethodEnumerator.php', - 'Psy\\Command\\ListCommand\\PropertyEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/PropertyEnumerator.php', - 'Psy\\Command\\ListCommand\\TraitEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/TraitEnumerator.php', - 'Psy\\Command\\ListCommand\\VariableEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/VariableEnumerator.php', - 'Psy\\Command\\ParseCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ParseCommand.php', - 'Psy\\Command\\PsyVersionCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/PsyVersionCommand.php', - 'Psy\\Command\\ReflectingCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ReflectingCommand.php', - 'Psy\\Command\\ShowCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ShowCommand.php', - 'Psy\\Command\\SudoCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/SudoCommand.php', - 'Psy\\Command\\ThrowUpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ThrowUpCommand.php', - 'Psy\\Command\\TraceCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/TraceCommand.php', - 'Psy\\Command\\WhereamiCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/WhereamiCommand.php', - 'Psy\\Command\\WtfCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/WtfCommand.php', - 'Psy\\Compiler' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Compiler.php', - 'Psy\\ConfigPaths' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ConfigPaths.php', - 'Psy\\Configuration' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Configuration.php', - 'Psy\\ConsoleColorFactory' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ConsoleColorFactory.php', - 'Psy\\Context' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Context.php', - 'Psy\\ContextAware' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ContextAware.php', - 'Psy\\Exception\\BreakException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/BreakException.php', - 'Psy\\Exception\\DeprecatedException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/DeprecatedException.php', - 'Psy\\Exception\\ErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/ErrorException.php', - 'Psy\\Exception\\Exception' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/Exception.php', - 'Psy\\Exception\\FatalErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/FatalErrorException.php', - 'Psy\\Exception\\ParseErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/ParseErrorException.php', - 'Psy\\Exception\\RuntimeException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/RuntimeException.php', - 'Psy\\Exception\\ThrowUpException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/ThrowUpException.php', - 'Psy\\Exception\\TypeErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/TypeErrorException.php', - 'Psy\\ExecutionLoop\\ForkingLoop' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ExecutionLoop/ForkingLoop.php', - 'Psy\\ExecutionLoop\\Loop' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ExecutionLoop/Loop.php', - 'Psy\\Formatter\\CodeFormatter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Formatter/CodeFormatter.php', - 'Psy\\Formatter\\DocblockFormatter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Formatter/DocblockFormatter.php', - 'Psy\\Formatter\\Formatter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Formatter/Formatter.php', - 'Psy\\Formatter\\SignatureFormatter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Formatter/SignatureFormatter.php', - 'Psy\\Input\\CodeArgument' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Input/CodeArgument.php', - 'Psy\\Input\\FilterOptions' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Input/FilterOptions.php', - 'Psy\\Input\\ShellInput' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Input/ShellInput.php', - 'Psy\\Input\\SilentInput' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Input/SilentInput.php', - 'Psy\\Output\\OutputPager' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Output/OutputPager.php', - 'Psy\\Output\\PassthruPager' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Output/PassthruPager.php', - 'Psy\\Output\\ProcOutputPager' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Output/ProcOutputPager.php', - 'Psy\\Output\\ShellOutput' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Output/ShellOutput.php', - 'Psy\\ParserFactory' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ParserFactory.php', - 'Psy\\Readline\\GNUReadline' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Readline/GNUReadline.php', - 'Psy\\Readline\\HoaConsole' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Readline/HoaConsole.php', - 'Psy\\Readline\\Libedit' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Readline/Libedit.php', - 'Psy\\Readline\\Readline' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Readline/Readline.php', - 'Psy\\Readline\\Transient' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Readline/Transient.php', - 'Psy\\Reflection\\ReflectionConstant' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Reflection/ReflectionConstant.php', - 'Psy\\Reflection\\ReflectionLanguageConstruct' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstruct.php', - 'Psy\\Reflection\\ReflectionLanguageConstructParameter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstructParameter.php', - 'Psy\\Shell' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Shell.php', - 'Psy\\Sudo' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Sudo.php', - 'Psy\\Sudo\\SudoVisitor' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Sudo/SudoVisitor.php', - 'Psy\\TabCompletion\\AutoCompleter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/AutoCompleter.php', - 'Psy\\TabCompletion\\Matcher\\AbstractContextAwareMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractContextAwareMatcher.php', - 'Psy\\TabCompletion\\Matcher\\AbstractDefaultParametersMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php', - 'Psy\\TabCompletion\\Matcher\\AbstractMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ClassAttributesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassAttributesMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ClassMethodDefaultParametersMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ClassMethodsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ClassNamesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassNamesMatcher.php', - 'Psy\\TabCompletion\\Matcher\\CommandsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/CommandsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ConstantsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ConstantsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\FunctionDefaultParametersMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php', - 'Psy\\TabCompletion\\Matcher\\FunctionsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\KeywordsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/KeywordsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\MongoClientMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/MongoClientMatcher.php', - 'Psy\\TabCompletion\\Matcher\\MongoDatabaseMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/MongoDatabaseMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ObjectAttributesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ObjectMethodDefaultParametersMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php', - 'Psy\\TabCompletion\\Matcher\\ObjectMethodsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodsMatcher.php', - 'Psy\\TabCompletion\\Matcher\\VariablesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/VariablesMatcher.php', - 'Psy\\Util\\Docblock' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Util/Docblock.php', - 'Psy\\Util\\Json' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Util/Json.php', - 'Psy\\Util\\Mirror' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Util/Mirror.php', - 'Psy\\Util\\Str' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Util/Str.php', - 'Psy\\VarDumper\\Cloner' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VarDumper/Cloner.php', - 'Psy\\VarDumper\\Dumper' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VarDumper/Dumper.php', - 'Psy\\VarDumper\\Presenter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VarDumper/Presenter.php', - 'Psy\\VarDumper\\PresenterAware' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VarDumper/PresenterAware.php', - 'Psy\\VersionUpdater\\Checker' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VersionUpdater/Checker.php', - 'Psy\\VersionUpdater\\GitHubChecker' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VersionUpdater/GitHubChecker.php', - 'Psy\\VersionUpdater\\IntervalChecker' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VersionUpdater/IntervalChecker.php', - 'Psy\\VersionUpdater\\NoopChecker' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VersionUpdater/NoopChecker.php', + 'Psy\\CodeCleaner' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner.php', + 'Psy\\CodeCleaner\\AbstractClassPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/AbstractClassPass.php', + 'Psy\\CodeCleaner\\AssignThisVariablePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/AssignThisVariablePass.php', + 'Psy\\CodeCleaner\\CallTimePassByReferencePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/CallTimePassByReferencePass.php', + 'Psy\\CodeCleaner\\CalledClassPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/CalledClassPass.php', + 'Psy\\CodeCleaner\\CodeCleanerPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/CodeCleanerPass.php', + 'Psy\\CodeCleaner\\ExitPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ExitPass.php', + 'Psy\\CodeCleaner\\FinalClassPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/FinalClassPass.php', + 'Psy\\CodeCleaner\\FunctionContextPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/FunctionContextPass.php', + 'Psy\\CodeCleaner\\FunctionReturnInWriteContextPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/FunctionReturnInWriteContextPass.php', + 'Psy\\CodeCleaner\\ImplicitReturnPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ImplicitReturnPass.php', + 'Psy\\CodeCleaner\\InstanceOfPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/InstanceOfPass.php', + 'Psy\\CodeCleaner\\LeavePsyshAlonePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php', + 'Psy\\CodeCleaner\\LegacyEmptyPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php', + 'Psy\\CodeCleaner\\ListPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ListPass.php', + 'Psy\\CodeCleaner\\LoopContextPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LoopContextPass.php', + 'Psy\\CodeCleaner\\MagicConstantsPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/MagicConstantsPass.php', + 'Psy\\CodeCleaner\\NamespaceAwarePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php', + 'Psy\\CodeCleaner\\NamespacePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/NamespacePass.php', + 'Psy\\CodeCleaner\\NoReturnValue' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/NoReturnValue.php', + 'Psy\\CodeCleaner\\PassableByReferencePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/PassableByReferencePass.php', + 'Psy\\CodeCleaner\\RequirePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/RequirePass.php', + 'Psy\\CodeCleaner\\StrictTypesPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/StrictTypesPass.php', + 'Psy\\CodeCleaner\\UseStatementPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/UseStatementPass.php', + 'Psy\\CodeCleaner\\ValidClassNamePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ValidClassNamePass.php', + 'Psy\\CodeCleaner\\ValidConstantPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ValidConstantPass.php', + 'Psy\\CodeCleaner\\ValidConstructorPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ValidConstructorPass.php', + 'Psy\\CodeCleaner\\ValidFunctionNamePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ValidFunctionNamePass.php', + 'Psy\\Command\\BufferCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/BufferCommand.php', + 'Psy\\Command\\ClearCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ClearCommand.php', + 'Psy\\Command\\Command' => __DIR__ . '/..' . '/psy/psysh/src/Command/Command.php', + 'Psy\\Command\\DocCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/DocCommand.php', + 'Psy\\Command\\DumpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/DumpCommand.php', + 'Psy\\Command\\EditCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/EditCommand.php', + 'Psy\\Command\\ExitCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ExitCommand.php', + 'Psy\\Command\\HelpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/HelpCommand.php', + 'Psy\\Command\\HistoryCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/HistoryCommand.php', + 'Psy\\Command\\ListCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand.php', + 'Psy\\Command\\ListCommand\\ClassConstantEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/ClassConstantEnumerator.php', + 'Psy\\Command\\ListCommand\\ClassEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/ClassEnumerator.php', + 'Psy\\Command\\ListCommand\\ConstantEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/ConstantEnumerator.php', + 'Psy\\Command\\ListCommand\\Enumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/Enumerator.php', + 'Psy\\Command\\ListCommand\\FunctionEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/FunctionEnumerator.php', + 'Psy\\Command\\ListCommand\\GlobalVariableEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/GlobalVariableEnumerator.php', + 'Psy\\Command\\ListCommand\\InterfaceEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/InterfaceEnumerator.php', + 'Psy\\Command\\ListCommand\\MethodEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/MethodEnumerator.php', + 'Psy\\Command\\ListCommand\\PropertyEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/PropertyEnumerator.php', + 'Psy\\Command\\ListCommand\\TraitEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/TraitEnumerator.php', + 'Psy\\Command\\ListCommand\\VariableEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Command/ListCommand/VariableEnumerator.php', + 'Psy\\Command\\ParseCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ParseCommand.php', + 'Psy\\Command\\PsyVersionCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/PsyVersionCommand.php', + 'Psy\\Command\\ReflectingCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ReflectingCommand.php', + 'Psy\\Command\\ShowCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ShowCommand.php', + 'Psy\\Command\\SudoCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/SudoCommand.php', + 'Psy\\Command\\ThrowUpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ThrowUpCommand.php', + 'Psy\\Command\\TimeitCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/TimeitCommand.php', + 'Psy\\Command\\TimeitCommand\\TimeitVisitor' => __DIR__ . '/..' . '/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php', + 'Psy\\Command\\TraceCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/TraceCommand.php', + 'Psy\\Command\\WhereamiCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/WhereamiCommand.php', + 'Psy\\Command\\WtfCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/WtfCommand.php', + 'Psy\\ConfigPaths' => __DIR__ . '/..' . '/psy/psysh/src/ConfigPaths.php', + 'Psy\\Configuration' => __DIR__ . '/..' . '/psy/psysh/src/Configuration.php', + 'Psy\\ConsoleColorFactory' => __DIR__ . '/..' . '/psy/psysh/src/ConsoleColorFactory.php', + 'Psy\\Context' => __DIR__ . '/..' . '/psy/psysh/src/Context.php', + 'Psy\\ContextAware' => __DIR__ . '/..' . '/psy/psysh/src/ContextAware.php', + 'Psy\\Exception\\BreakException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/BreakException.php', + 'Psy\\Exception\\DeprecatedException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/DeprecatedException.php', + 'Psy\\Exception\\ErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/ErrorException.php', + 'Psy\\Exception\\Exception' => __DIR__ . '/..' . '/psy/psysh/src/Exception/Exception.php', + 'Psy\\Exception\\FatalErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/FatalErrorException.php', + 'Psy\\Exception\\ParseErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/ParseErrorException.php', + 'Psy\\Exception\\RuntimeException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/RuntimeException.php', + 'Psy\\Exception\\ThrowUpException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/ThrowUpException.php', + 'Psy\\Exception\\TypeErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/TypeErrorException.php', + 'Psy\\ExecutionClosure' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionClosure.php', + 'Psy\\ExecutionLoop' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop.php', + 'Psy\\ExecutionLoopClosure' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoopClosure.php', + 'Psy\\ExecutionLoop\\AbstractListener' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/AbstractListener.php', + 'Psy\\ExecutionLoop\\Listener' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/Listener.php', + 'Psy\\ExecutionLoop\\ProcessForker' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/ProcessForker.php', + 'Psy\\ExecutionLoop\\RunkitReloader' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/RunkitReloader.php', + 'Psy\\Formatter\\CodeFormatter' => __DIR__ . '/..' . '/psy/psysh/src/Formatter/CodeFormatter.php', + 'Psy\\Formatter\\DocblockFormatter' => __DIR__ . '/..' . '/psy/psysh/src/Formatter/DocblockFormatter.php', + 'Psy\\Formatter\\Formatter' => __DIR__ . '/..' . '/psy/psysh/src/Formatter/Formatter.php', + 'Psy\\Formatter\\SignatureFormatter' => __DIR__ . '/..' . '/psy/psysh/src/Formatter/SignatureFormatter.php', + 'Psy\\Input\\CodeArgument' => __DIR__ . '/..' . '/psy/psysh/src/Input/CodeArgument.php', + 'Psy\\Input\\FilterOptions' => __DIR__ . '/..' . '/psy/psysh/src/Input/FilterOptions.php', + 'Psy\\Input\\ShellInput' => __DIR__ . '/..' . '/psy/psysh/src/Input/ShellInput.php', + 'Psy\\Input\\SilentInput' => __DIR__ . '/..' . '/psy/psysh/src/Input/SilentInput.php', + 'Psy\\Output\\OutputPager' => __DIR__ . '/..' . '/psy/psysh/src/Output/OutputPager.php', + 'Psy\\Output\\PassthruPager' => __DIR__ . '/..' . '/psy/psysh/src/Output/PassthruPager.php', + 'Psy\\Output\\ProcOutputPager' => __DIR__ . '/..' . '/psy/psysh/src/Output/ProcOutputPager.php', + 'Psy\\Output\\ShellOutput' => __DIR__ . '/..' . '/psy/psysh/src/Output/ShellOutput.php', + 'Psy\\ParserFactory' => __DIR__ . '/..' . '/psy/psysh/src/ParserFactory.php', + 'Psy\\Readline\\GNUReadline' => __DIR__ . '/..' . '/psy/psysh/src/Readline/GNUReadline.php', + 'Psy\\Readline\\HoaConsole' => __DIR__ . '/..' . '/psy/psysh/src/Readline/HoaConsole.php', + 'Psy\\Readline\\Libedit' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Libedit.php', + 'Psy\\Readline\\Readline' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Readline.php', + 'Psy\\Readline\\Transient' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Transient.php', + 'Psy\\Reflection\\ReflectionClassConstant' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionClassConstant.php', + 'Psy\\Reflection\\ReflectionConstant' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionConstant.php', + 'Psy\\Reflection\\ReflectionConstant_' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionConstant_.php', + 'Psy\\Reflection\\ReflectionLanguageConstruct' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php', + 'Psy\\Reflection\\ReflectionLanguageConstructParameter' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php', + 'Psy\\Shell' => __DIR__ . '/..' . '/psy/psysh/src/Shell.php', + 'Psy\\Sudo' => __DIR__ . '/..' . '/psy/psysh/src/Sudo.php', + 'Psy\\Sudo\\SudoVisitor' => __DIR__ . '/..' . '/psy/psysh/src/Sudo/SudoVisitor.php', + 'Psy\\TabCompletion\\AutoCompleter' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/AutoCompleter.php', + 'Psy\\TabCompletion\\Matcher\\AbstractContextAwareMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/AbstractContextAwareMatcher.php', + 'Psy\\TabCompletion\\Matcher\\AbstractDefaultParametersMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php', + 'Psy\\TabCompletion\\Matcher\\AbstractMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/AbstractMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ClassAttributesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ClassMethodDefaultParametersMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ClassMethodsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/ClassMethodsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ClassNamesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/ClassNamesMatcher.php', + 'Psy\\TabCompletion\\Matcher\\CommandsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/CommandsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ConstantsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/ConstantsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\FunctionDefaultParametersMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php', + 'Psy\\TabCompletion\\Matcher\\FunctionsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/FunctionsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\KeywordsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/KeywordsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\MongoClientMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/MongoClientMatcher.php', + 'Psy\\TabCompletion\\Matcher\\MongoDatabaseMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/MongoDatabaseMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ObjectAttributesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ObjectMethodDefaultParametersMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php', + 'Psy\\TabCompletion\\Matcher\\ObjectMethodsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/ObjectMethodsMatcher.php', + 'Psy\\TabCompletion\\Matcher\\VariablesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/TabCompletion/Matcher/VariablesMatcher.php', + 'Psy\\Util\\Docblock' => __DIR__ . '/..' . '/psy/psysh/src/Util/Docblock.php', + 'Psy\\Util\\Json' => __DIR__ . '/..' . '/psy/psysh/src/Util/Json.php', + 'Psy\\Util\\Mirror' => __DIR__ . '/..' . '/psy/psysh/src/Util/Mirror.php', + 'Psy\\Util\\Str' => __DIR__ . '/..' . '/psy/psysh/src/Util/Str.php', + 'Psy\\VarDumper\\Cloner' => __DIR__ . '/..' . '/psy/psysh/src/VarDumper/Cloner.php', + 'Psy\\VarDumper\\Dumper' => __DIR__ . '/..' . '/psy/psysh/src/VarDumper/Dumper.php', + 'Psy\\VarDumper\\Presenter' => __DIR__ . '/..' . '/psy/psysh/src/VarDumper/Presenter.php', + 'Psy\\VarDumper\\PresenterAware' => __DIR__ . '/..' . '/psy/psysh/src/VarDumper/PresenterAware.php', + 'Psy\\VersionUpdater\\Checker' => __DIR__ . '/..' . '/psy/psysh/src/VersionUpdater/Checker.php', + 'Psy\\VersionUpdater\\GitHubChecker' => __DIR__ . '/..' . '/psy/psysh/src/VersionUpdater/GitHubChecker.php', + 'Psy\\VersionUpdater\\IntervalChecker' => __DIR__ . '/..' . '/psy/psysh/src/VersionUpdater/IntervalChecker.php', + 'Psy\\VersionUpdater\\NoopChecker' => __DIR__ . '/..' . '/psy/psysh/src/VersionUpdater/NoopChecker.php', 'Ramsey\\Uuid\\BinaryUtils' => __DIR__ . '/..' . '/ramsey/uuid/src/BinaryUtils.php', 'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php', 'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php', @@ -3255,7 +3310,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'Symfony\\Component\\Debug\\FatalErrorHandler\\FatalErrorHandlerInterface' => __DIR__ . '/..' . '/symfony/debug/FatalErrorHandler/FatalErrorHandlerInterface.php', 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedFunctionFatalErrorHandler' => __DIR__ . '/..' . '/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php', 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedMethodFatalErrorHandler' => __DIR__ . '/..' . '/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php', - 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher' => __DIR__ . '/..' . '/symfony/event-dispatcher/ContainerAwareEventDispatcher.php', 'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher' => __DIR__ . '/..' . '/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php', 'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcherInterface' => __DIR__ . '/..' . '/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php', 'Symfony\\Component\\EventDispatcher\\Debug\\WrappedListener' => __DIR__ . '/..' . '/symfony/event-dispatcher/Debug/WrappedListener.php', @@ -3534,6 +3588,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'Symfony\\Component\\Routing\\Loader\\Configurator\\Traits\\RouteTrait' => __DIR__ . '/..' . '/symfony/routing/Loader/Configurator/Traits/RouteTrait.php', 'Symfony\\Component\\Routing\\Loader\\DependencyInjection\\ServiceRouterLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/DependencyInjection/ServiceRouterLoader.php', 'Symfony\\Component\\Routing\\Loader\\DirectoryLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/DirectoryLoader.php', + 'Symfony\\Component\\Routing\\Loader\\GlobFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/GlobFileLoader.php', 'Symfony\\Component\\Routing\\Loader\\ObjectRouteLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/ObjectRouteLoader.php', 'Symfony\\Component\\Routing\\Loader\\PhpFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/PhpFileLoader.php', 'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/PhpFileLoader.php', @@ -3666,6 +3721,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf 'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => __DIR__ . '/..' . '/symfony/var-dumper/Exception/ThrowingCasterException.php', 'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestTrait.php', 'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php', + 'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php', 'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php', 'Symfony\\Polyfill\\Php70\\Php70' => __DIR__ . '/..' . '/symfony/polyfill-php70/Php70.php', 'Symfony\\Thanks\\Command\\ThanksCommand' => __DIR__ . '/..' . '/symfony/thanks/src/Command/ThanksCommand.php', @@ -3785,6 +3841,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf return \Closure::bind(function () use ($loader) { $loader->prefixLengthsPsr4 = ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf::$prefixLengthsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf::$prefixDirsPsr4; + $loader->fallbackDirsPsr4 = ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf::$fallbackDirsPsr4; $loader->prefixesPsr0 = ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf::$prefixesPsr0; $loader->classMap = ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf::$classMap; diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 23b777c1..ab2ebd4a 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1,49 +1,4 @@ [ - { - "name": "symfony/thanks", - "version": "v1.0.5", - "version_normalized": "1.0.5.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/thanks.git", - "reference": "c757ee0c9dcfcc0e9e30fbbbdcadeb9dcc9aaaf4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/thanks/zipball/c757ee0c9dcfcc0e9e30fbbbdcadeb9dcc9aaaf4", - "reference": "c757ee0c9dcfcc0e9e30fbbbdcadeb9dcc9aaaf4", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": "^5.5.9|^7.0.0" - }, - "time": "2018-01-26 10:44:34", - "type": "composer-plugin", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "class": "Symfony\\Thanks\\Thanks" - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Thanks\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - } - ], - "description": "Give thanks (in the form of a GitHub ⭐) to your fellow PHP package maintainers (not limited to Symfony components)!" - }, { "name": "doctrine/lexer", "version": "v1.0.1", @@ -62,7 +17,7 @@ "require": { "php": ">=5.3.2" }, - "time": "2014-09-09 13:34:57", + "time": "2014-09-09T13:34:57+00:00", "type": "library", "extra": { "branch-alias": { @@ -100,53 +55,6 @@ "parser" ] }, - { - "name": "erusev/parsedown", - "version": "1.6.4", - "version_normalized": "1.6.4.0", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown.git", - "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/fbe3fe878f4fe69048bb8a52783a09802004f548", - "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "time": "2017-11-14 20:44:03", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "Parsedown": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "Parser for Markdown.", - "homepage": "http://parsedown.org", - "keywords": [ - "markdown", - "parser" - ] - }, { "name": "vlucas/phpdotenv", "version": "v2.4.0", @@ -168,7 +76,7 @@ "require-dev": { "phpunit/phpunit": "^4.8 || ^5.0" }, - "time": "2016-09-01 10:05:43", + "time": "2016-09-01T10:05:43+00:00", "type": "library", "extra": { "branch-alias": { @@ -221,7 +129,7 @@ "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, - "time": "2017-11-27 11:13:29", + "time": "2017-11-27T11:13:29+00:00", "type": "library", "extra": { "branch-alias": { @@ -248,56 +156,6 @@ "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles" }, - { - "name": "paragonie/random_compat", - "version": "v2.0.11", - "version_normalized": "2.0.11.0", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8", - "shasum": "" - }, - "require": { - "php": ">=5.2.0" - }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." - }, - "time": "2017-09-27 21:40:39", - "type": "library", - "installation-source": "dist", - "autoload": { - "files": [ - "lib/random.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" - } - ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", - "keywords": [ - "csprng", - "pseudorandom", - "random" - ] - }, { "name": "psr/log", "version": "1.0.2", @@ -316,7 +174,7 @@ "require": { "php": ">=5.3.0" }, - "time": "2016-10-10 12:19:37", + "time": "2016-10-10T12:19:37+00:00", "type": "library", "extra": { "branch-alias": { @@ -347,65 +205,6 @@ "psr-3" ] }, - { - "name": "egulias/email-validator", - "version": "2.1.3", - "version_normalized": "2.1.3.0", - "source": { - "type": "git", - "url": "https://github.com/egulias/EmailValidator.git", - "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/1bec00a10039b823cc94eef4eddd47dcd3b2ca04", - "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04", - "shasum": "" - }, - "require": { - "doctrine/lexer": "^1.0.1", - "php": ">= 5.5" - }, - "require-dev": { - "dominicsayers/isemail": "dev-master", - "phpunit/phpunit": "^4.8.35", - "satooshi/php-coveralls": "^1.0.1" - }, - "suggest": { - "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" - }, - "time": "2017-11-15 23:40:40", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Egulias\\EmailValidator\\": "EmailValidator" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eduardo Gulias Davis" - } - ], - "description": "A library for validating emails against several RFCs", - "homepage": "https://github.com/egulias/EmailValidator", - "keywords": [ - "email", - "emailvalidation", - "emailvalidator", - "validation", - "validator" - ] - }, { "name": "swiftmailer/swiftmailer", "version": "v6.0.2", @@ -429,7 +228,7 @@ "mockery/mockery": "~0.9.1", "symfony/phpunit-bridge": "~3.3@dev" }, - "time": "2017-09-30 22:39:41", + "time": "2017-09-30T22:39:41+00:00", "type": "library", "extra": { "branch-alias": { @@ -505,7 +304,7 @@ "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." }, - "time": "2018-01-20 00:28:24", + "time": "2018-01-20T00:28:24+00:00", "type": "library", "extra": { "branch-alias": { @@ -545,56 +344,6 @@ "uuid" ] }, - { - "name": "psr/simple-cache", - "version": "1.0.0", - "version_normalized": "1.0.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/753fa598e8f3b9966c886fe13f370baa45ef0e24", - "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "time": "2017-01-02 13:31:39", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ] - }, { "name": "psr/container", "version": "1.0.0", @@ -613,7 +362,7 @@ "require": { "php": ">=5.3.0" }, - "time": "2017-02-14 16:28:37", + "time": "2017-02-14T16:28:37+00:00", "type": "library", "extra": { "branch-alias": { @@ -646,61 +395,6 @@ "psr" ] }, - { - "name": "nesbot/carbon", - "version": "1.22.1", - "version_normalized": "1.22.1.0", - "source": { - "type": "git", - "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "symfony/translation": "~2.6 || ~3.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2", - "phpunit/phpunit": "~4.0 || ~5.0" - }, - "time": "2017-01-16 07:55:07", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.23-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Carbon\\": "src/Carbon/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brian Nesbitt", - "email": "brian@nesbot.com", - "homepage": "http://nesbot.com" - } - ], - "description": "A simple API extension for DateTime.", - "homepage": "http://carbon.nesbot.com", - "keywords": [ - "date", - "datetime", - "time" - ] - }, { "name": "mtdowling/cron-expression", "version": "v1.2.1", @@ -722,7 +416,7 @@ "require-dev": { "phpunit/phpunit": "~4.0|~5.0" }, - "time": "2017-01-23 04:29:33", + "time": "2017-01-23T04:29:33+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -795,7 +489,7 @@ "ruflin/elastica": "Allow sending log messages to an Elastic Search server", "sentry/sentry": "Allow sending log messages to a Sentry server" }, - "time": "2017-06-19 01:22:40", + "time": "2017-06-19T01:22:40+00:00", "type": "library", "extra": { "branch-alias": { @@ -851,7 +545,7 @@ "mockery/mockery": "~0.9.3", "phpunit/phpunit": "^5.7" }, - "time": "2017-06-15 17:19:42", + "time": "2017-06-15T17:19:42+00:00", "type": "library", "extra": { "branch-alias": { @@ -911,7 +605,7 @@ "phpunit/phpunit": "3.7.*", "squizlabs/php_codesniffer": "1.*" }, - "time": "2014-04-08 15:00:19", + "time": "2014-04-08T15:00:19+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -931,59 +625,6 @@ } ] }, - { - "name": "nikic/php-parser", - "version": "v3.1.4", - "version_normalized": "3.1.4.0", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "e57b3a09784f846411aa7ed664eedb73e3399078" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e57b3a09784f846411aa7ed664eedb73e3399078", - "reference": "e57b3a09784f846411aa7ed664eedb73e3399078", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "time": "2018-01-25 21:31:33", - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ] - }, { "name": "jakub-onderka/php-console-highlighter", "version": "v0.3.2", @@ -1010,7 +651,7 @@ "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "~1.5" }, - "time": "2015-04-20 18:58:01", + "time": "2015-04-20T18:58:01+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1051,7 +692,7 @@ "require-dev": { "phpunit/phpunit": "@stable" }, - "time": "2014-10-24 07:27:01", + "time": "2014-10-24T07:27:01+00:00", "type": "project", "installation-source": "dist", "autoload": { @@ -1065,208 +706,6 @@ ], "description": "implementation of xdg base directory specification for php" }, - { - "name": "psy/psysh", - "version": "v0.8.17", - "version_normalized": "0.8.17.0", - "source": { - "type": "git", - "url": "https://github.com/bobthecow/psysh.git", - "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5069b70e8c4ea492c2b5939b6eddc78bfe41cfec", - "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec", - "shasum": "" - }, - "require": { - "dnoegel/php-xdg-base-dir": "0.1", - "jakub-onderka/php-console-highlighter": "0.3.*", - "nikic/php-parser": "~1.3|~2.0|~3.0", - "php": ">=5.3.9", - "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", - "symfony/var-dumper": "~2.7|~3.0|~4.0" - }, - "require-dev": { - "hoa/console": "~3.16|~1.14", - "phpunit/phpunit": "^4.8.35|^5.4.3", - "symfony/finder": "~2.1|~3.0|~4.0" - }, - "suggest": { - "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", - "ext-pdo-sqlite": "The doc command requires SQLite to work.", - "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.", - "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." - }, - "time": "2017-12-28 16:14:16", - "bin": [ - "bin/psysh" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.8.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "files": [ - "src/Psy/functions.php" - ], - "psr-4": { - "Psy\\": "src/Psy/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Justin Hileman", - "email": "justin@justinhileman.info", - "homepage": "http://justinhileman.com" - } - ], - "description": "An interactive shell for modern PHP.", - "homepage": "http://psysh.org", - "keywords": [ - "REPL", - "console", - "interactive", - "shell" - ] - }, - { - "name": "laravel/tinker", - "version": "v1.0.3", - "version_normalized": "1.0.3.0", - "source": { - "type": "git", - "url": "https://github.com/laravel/tinker.git", - "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/852c2abe0b0991555a403f1c0583e64de6acb4a6", - "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6", - "shasum": "" - }, - "require": { - "illuminate/console": "~5.1", - "illuminate/contracts": "~5.1", - "illuminate/support": "~5.1", - "php": ">=5.5.9", - "psy/psysh": "0.7.*|0.8.*", - "symfony/var-dumper": "~3.0|~4.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "suggest": { - "illuminate/database": "The Illuminate Database package (~5.1)." - }, - "time": "2017-12-18 16:25:11", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "laravel": { - "providers": [ - "Laravel\\Tinker\\TinkerServiceProvider" - ] - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Laravel\\Tinker\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Powerful REPL for the Laravel framework.", - "keywords": [ - "REPL", - "Tinker", - "laravel", - "psysh" - ] - }, - { - "name": "filp/whoops", - "version": "2.1.14", - "version_normalized": "2.1.14.0", - "source": { - "type": "git", - "url": "https://github.com/filp/whoops.git", - "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", - "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", - "shasum": "" - }, - "require": { - "php": "^5.5.9 || ^7.0", - "psr/log": "^1.0.1" - }, - "require-dev": { - "mockery/mockery": "0.9.*", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "symfony/var-dumper": "^2.6 || ^3.0" - }, - "suggest": { - "symfony/var-dumper": "Pretty print complex values better with var-dumper available", - "whoops/soap": "Formats errors as SOAP responses" - }, - "time": "2017-11-23 18:22:44", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Whoops\\": "src/Whoops/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Filipe Dobreira", - "homepage": "https://github.com/filp", - "role": "Developer" - } - ], - "description": "php error handling for cool kids", - "homepage": "https://filp.github.io/whoops/", - "keywords": [ - "error", - "exception", - "handling", - "library", - "throwable", - "whoops" - ] - }, { "name": "fzaninotto/faker", "version": "v1.7.1", @@ -1290,7 +729,7 @@ "phpunit/phpunit": "^4.0 || ^5.0", "squizlabs/php_codesniffer": "^1.5" }, - "time": "2017-08-15 16:48:10", + "time": "2017-08-15T16:48:10+00:00", "type": "library", "extra": { "branch-alias": { @@ -1347,7 +786,7 @@ "phpunit/phpunit": "~4.0", "satooshi/php-coveralls": "^1.0" }, - "time": "2016-01-20 08:20:44", + "time": "2016-01-20T08:20:44+00:00", "type": "library", "extra": { "branch-alias": { @@ -1369,73 +808,6 @@ "test" ] }, - { - "name": "mockery/mockery", - "version": "1.0", - "version_normalized": "1.0.0.0", - "source": { - "type": "git", - "url": "https://github.com/mockery/mockery.git", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/1bac8c362b12f522fdd1f1fa3556284c91affa38", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38", - "shasum": "" - }, - "require": { - "hamcrest/hamcrest-php": "~2.0", - "lib-pcre": ">=7.0", - "php": ">=5.6.0" - }, - "require-dev": { - "phpunit/phpunit": "~5.7|~6.1" - }, - "time": "2017-10-06 16:20:43", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Mockery": "library/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Pádraic Brady", - "email": "padraic.brady@gmail.com", - "homepage": "http://blog.astrumfutura.com" - }, - { - "name": "Dave Marshall", - "email": "dave.marshall@atstsolutions.co.uk", - "homepage": "http://davedevelopment.co.uk" - } - ], - "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.", - "homepage": "http://github.com/mockery/mockery", - "keywords": [ - "BDD", - "TDD", - "library", - "mock", - "mock objects", - "mockery", - "stub", - "test", - "test double", - "testing" - ] - }, { "name": "phpdocumentor/reflection-common", "version": "1.0.1", @@ -1457,7 +829,7 @@ "require-dev": { "phpunit/phpunit": "^4.6" }, - "time": "2017-09-11 18:02:19", + "time": "2017-09-11T18:02:19+00:00", "type": "library", "extra": { "branch-alias": { @@ -1515,7 +887,7 @@ "mockery/mockery": "^0.9.4", "phpunit/phpunit": "^5.2||^4.8.24" }, - "time": "2017-07-14 14:27:02", + "time": "2017-07-14T14:27:02+00:00", "type": "library", "extra": { "branch-alias": { @@ -1563,7 +935,7 @@ "require-dev": { "phpunit/phpunit": "^6.2.4" }, - "time": "2017-11-27 05:48:46", + "time": "2017-11-27T05:48:46+00:00", "type": "library", "extra": { "branch-alias": { @@ -1610,7 +982,7 @@ "require": { "php": ">=5.6" }, - "time": "2016-10-03 07:35:21", + "time": "2016-10-03T07:35:21+00:00", "type": "library", "extra": { "branch-alias": { @@ -1655,7 +1027,7 @@ "require": { "php": ">=5.6.0" }, - "time": "2015-07-28 20:34:47", + "time": "2015-07-28T20:34:47+00:00", "type": "library", "extra": { "branch-alias": { @@ -1702,7 +1074,7 @@ "require-dev": { "phpunit/phpunit": "^6.0" }, - "time": "2017-03-03 06:23:57", + "time": "2017-03-03T06:23:57+00:00", "type": "library", "extra": { "branch-alias": { @@ -1757,7 +1129,7 @@ "require-dev": { "phpunit/phpunit": "^6.0" }, - "time": "2017-03-29 09:07:27", + "time": "2017-03-29T09:07:27+00:00", "type": "library", "extra": { "branch-alias": { @@ -1806,7 +1178,7 @@ "require-dev": { "phpunit/phpunit": "^6.0" }, - "time": "2017-08-03 12:35:26", + "time": "2017-08-03T12:35:26+00:00", "type": "library", "extra": { "branch-alias": { @@ -1856,7 +1228,7 @@ "suggest": { "ext-uopz": "*" }, - "time": "2017-04-27 15:39:26", + "time": "2017-04-27T15:39:26+00:00", "type": "library", "extra": { "branch-alias": { @@ -1908,7 +1280,7 @@ "ext-mbstring": "*", "phpunit/phpunit": "^6.0" }, - "time": "2017-04-03 13:19:02", + "time": "2017-04-03T13:19:02+00:00", "type": "library", "extra": { "branch-alias": { @@ -1975,7 +1347,7 @@ "require-dev": { "phpunit/phpunit": "^6.1" }, - "time": "2017-07-01 08:51:00", + "time": "2017-07-01T08:51:00+00:00", "type": "library", "extra": { "branch-alias": { @@ -2027,7 +1399,7 @@ "require-dev": { "phpunit/phpunit": "^6.2" }, - "time": "2017-08-03 08:09:46", + "time": "2017-08-03T08:09:46+00:00", "type": "library", "extra": { "branch-alias": { @@ -2078,7 +1450,7 @@ "require": { "php": ">=5.3.3" }, - "time": "2015-06-21 13:50:34", + "time": "2015-06-21T13:50:34+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2103,67 +1475,6 @@ "template" ] }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "5.0.6", - "version_normalized": "5.0.6.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf", - "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.5", - "php": "^7.0", - "phpunit/php-text-template": "^1.2.1", - "sebastian/exporter": "^3.1" - }, - "conflict": { - "phpunit/phpunit": "<6.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.5" - }, - "suggest": { - "ext-soap": "*" - }, - "time": "2018-01-06 05:45:45", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ] - }, { "name": "phpunit/php-timer", "version": "1.0.9", @@ -2185,7 +1496,7 @@ "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, - "time": "2017-02-26 11:10:40", + "time": "2017-02-26T11:10:40+00:00", "type": "library", "extra": { "branch-alias": { @@ -2233,7 +1544,7 @@ "require": { "php": ">=5.3.3" }, - "time": "2017-11-27 13:52:08", + "time": "2017-11-27T13:52:08+00:00", "type": "library", "extra": { "branch-alias": { @@ -2285,7 +1596,7 @@ "ext-xmlwriter": "*", "php": "^7.0" }, - "time": "2017-04-07 12:08:54", + "time": "2017-04-07T12:08:54+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2327,7 +1638,7 @@ "require-dev": { "phpunit/phpunit": "^5.7 || ^6.0" }, - "time": "2017-03-04 06:30:41", + "time": "2017-03-04T06:30:41+00:00", "type": "library", "extra": { "branch-alias": { @@ -2353,136 +1664,6 @@ "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/" }, - { - "name": "phpunit/php-code-coverage", - "version": "5.3.0", - "version_normalized": "5.3.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-xmlwriter": "*", - "php": "^7.0", - "phpunit/php-file-iterator": "^1.4.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^2.0.1", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.0", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "suggest": { - "ext-xdebug": "^2.5.5" - }, - "time": "2017-12-06 09:29:45", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.3.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ] - }, - { - "name": "phpspec/prophecy", - "version": "1.7.3", - "version_normalized": "1.7.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0" - }, - "require-dev": { - "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7" - }, - "time": "2017-11-24 13:59:53", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Prophecy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ] - }, { "name": "phar-io/version", "version": "1.0.1", @@ -2501,7 +1682,7 @@ "require": { "php": "^5.6 || ^7.0" }, - "time": "2017-03-05 17:38:23", + "time": "2017-03-05T17:38:23+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2553,7 +1734,7 @@ "phar-io/version": "^1.0.1", "php": "^5.6 || ^7.0" }, - "time": "2017-03-05 18:14:27", + "time": "2017-03-05T18:14:27+00:00", "type": "library", "extra": { "branch-alias": { @@ -2589,53 +1770,6 @@ ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)" }, - { - "name": "myclabs/deep-copy", - "version": "1.7.0", - "version_normalized": "1.7.0.0", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^4.1" - }, - "time": "2017-10-19 19:58:43", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, - "files": [ - "src/DeepCopy/deep_copy.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Create deep copies (clones) of your objects", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ] - }, { "name": "sebastian/comparator", "version": "2.1.3", @@ -2659,7 +1793,7 @@ "require-dev": { "phpunit/phpunit": "^6.4" }, - "time": "2018-02-01 13:46:46", + "time": "2018-02-01T13:46:46+00:00", "type": "library", "extra": { "branch-alias": { @@ -2724,7 +1858,7 @@ "phpunit/phpunit": "^4.6", "sebastian/version": "^1.0.1" }, - "time": "2018-01-29 19:49:41", + "time": "2018-01-29T19:49:41+00:00", "type": "library", "extra": { "branch-alias": { @@ -2780,7 +1914,7 @@ "mockery/mockery": "^1.0", "phpunit/phpunit": "^6.4" }, - "time": "2017-11-30 07:14:17", + "time": "2017-11-30T07:14:17+00:00", "type": "library", "extra": { "branch-alias": { @@ -2807,1346 +1941,6 @@ ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock." }, - { - "name": "phpunit/phpunit", - "version": "6.5.6", - "version_normalized": "6.5.6.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3330ef26ade05359d006041316ed0fa9e8e3cefe" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3330ef26ade05359d006041316ed0fa9e8e3cefe", - "reference": "3330ef26ade05359d006041316ed0fa9e8e3cefe", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "myclabs/deep-copy": "^1.6.1", - "phar-io/manifest": "^1.0.1", - "phar-io/version": "^1.0", - "php": "^7.0", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^5.3", - "phpunit/php-file-iterator": "^1.4.3", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^1.0.9", - "phpunit/phpunit-mock-objects": "^5.0.5", - "sebastian/comparator": "^2.1", - "sebastian/diff": "^2.0", - "sebastian/environment": "^3.1", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^1.0", - "sebastian/version": "^2.0.1" - }, - "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2", - "phpunit/dbunit": "<3.0" - }, - "require-dev": { - "ext-pdo": "*" - }, - "suggest": { - "ext-xdebug": "*", - "phpunit/php-invoker": "^1.1" - }, - "time": "2018-02-01 05:57:37", - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.5.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ] - }, - { - "name": "league/flysystem", - "version": "1.0.42", - "version_normalized": "1.0.42.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem.git", - "reference": "09eabc54e199950041aef258a85847676496fe8e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/09eabc54e199950041aef258a85847676496fe8e", - "reference": "09eabc54e199950041aef258a85847676496fe8e", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "conflict": { - "league/flysystem-sftp": "<1.0.6" - }, - "require-dev": { - "ext-fileinfo": "*", - "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7" - }, - "suggest": { - "ext-fileinfo": "Required for MimeType", - "ext-ftp": "Allows you to use FTP server storage", - "ext-openssl": "Allows you to use FTPS server storage", - "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2", - "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3", - "league/flysystem-azure": "Allows you to use Windows Azure Blob storage", - "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching", - "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem", - "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", - "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", - "league/flysystem-webdav": "Allows you to use WebDAV storage", - "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", - "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", - "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" - }, - "time": "2018-01-27 16:03:56", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "League\\Flysystem\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Frank de Jonge", - "email": "info@frenky.net" - } - ], - "description": "Filesystem abstraction: Many filesystems, one API.", - "keywords": [ - "Cloud Files", - "WebDAV", - "abstraction", - "aws", - "cloud", - "copy.com", - "dropbox", - "file systems", - "files", - "filesystem", - "filesystems", - "ftp", - "rackspace", - "remote", - "s3", - "sftp", - "storage" - ] - }, - { - "name": "symfony/debug", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "53f6af2805daf52a43b393b93d2f24925d35c937" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/53f6af2805daf52a43b393b93d2f24925d35c937", - "reference": "53f6af2805daf52a43b393b93d2f24925d35c937", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0" - }, - "time": "2018-01-18 22:16:57", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", - "version_normalized": "1.7.0.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "time": "2018-01-30 19:27:44", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ] - }, - { - "name": "symfony/console", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "26b6f419edda16c19775211987651cb27baea7f1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/26b6f419edda16c19775211987651cb27baea7f1", - "reference": "26b6f419edda16c19775211987651cb27baea7f1", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/process": "<3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" - }, - "time": "2018-01-29 09:03:43", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Console Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/finder", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "time": "2018-01-03 07:37:34", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/polyfill-php70", - "version": "v1.7.0", - "version_normalized": "1.7.0.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0", - "php": ">=5.3.3" - }, - "time": "2018-01-30 19:27:44", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ] - }, - { - "name": "symfony/http-foundation", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-foundation.git", - "reference": "8c39071ac9cc7e6d8dab1d556c990dc0d2cc3d30" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8c39071ac9cc7e6d8dab1d556c990dc0d2cc3d30", - "reference": "8c39071ac9cc7e6d8dab1d556c990dc0d2cc3d30", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-mbstring": "~1.1", - "symfony/polyfill-php70": "~1.6" - }, - "require-dev": { - "symfony/expression-language": "~2.8|~3.0|~4.0" - }, - "time": "2018-01-29 09:03:43", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\HttpFoundation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony HttpFoundation Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/http-kernel", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-kernel.git", - "reference": "911d2e5dd4beb63caad9a72e43857de984301907" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/911d2e5dd4beb63caad9a72e43857de984301907", - "reference": "911d2e5dd4beb63caad9a72e43857de984301907", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0", - "symfony/debug": "~2.8|~3.0|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/http-foundation": "^3.4.4|^4.0.4" - }, - "conflict": { - "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.4", - "symfony/var-dumper": "<3.3", - "twig/twig": "<1.34|<2.4,>=2" - }, - "provide": { - "psr/log-implementation": "1.0" - }, - "require-dev": { - "psr/cache": "~1.0", - "symfony/browser-kit": "~2.8|~3.0|~4.0", - "symfony/class-loader": "~2.8|~3.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/console": "~2.8|~3.0|~4.0", - "symfony/css-selector": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/dom-crawler": "~2.8|~3.0|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/process": "~2.8|~3.0|~4.0", - "symfony/routing": "~3.4|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0", - "symfony/templating": "~2.8|~3.0|~4.0", - "symfony/translation": "~2.8|~3.0|~4.0", - "symfony/var-dumper": "~3.3|~4.0" - }, - "suggest": { - "symfony/browser-kit": "", - "symfony/config": "", - "symfony/console": "", - "symfony/dependency-injection": "", - "symfony/finder": "", - "symfony/var-dumper": "" - }, - "time": "2018-01-29 12:29:46", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\HttpKernel\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony HttpKernel Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/process", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "09a5172057be8fc677840e591b17f385e58c7c0d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/09a5172057be8fc677840e591b17f385e58c7c0d", - "reference": "09a5172057be8fc677840e591b17f385e58c7c0d", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "time": "2018-01-29 09:03:43", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Process Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/routing", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/routing.git", - "reference": "235d01730d553a97732990588407eaf6779bb4b2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/235d01730d553a97732990588407eaf6779bb4b2", - "reference": "235d01730d553a97732990588407eaf6779bb4b2", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "conflict": { - "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.3", - "symfony/yaml": "<3.4" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "doctrine/common": "~2.2", - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/http-foundation": "~2.8|~3.0|~4.0", - "symfony/yaml": "~3.4|~4.0" - }, - "suggest": { - "doctrine/annotations": "For using the annotation loader", - "symfony/config": "For using the all-in-one router or any loader", - "symfony/dependency-injection": "For loading routes from a service", - "symfony/expression-language": "For using expression matching", - "symfony/http-foundation": "For using a Symfony Request object", - "symfony/yaml": "For using the YAML loader" - }, - "time": "2018-01-16 18:03:57", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Routing\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Routing Component", - "homepage": "https://symfony.com", - "keywords": [ - "router", - "routing", - "uri", - "url" - ] - }, - { - "name": "symfony/var-dumper", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "472a9849930cf21f73abdb02240f17cf5b5bd1a7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/472a9849930cf21f73abdb02240f17cf5b5bd1a7", - "reference": "472a9849930cf21f73abdb02240f17cf5b5bd1a7", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" - }, - "require-dev": { - "ext-iconv": "*", - "twig/twig": "~1.34|~2.4" - }, - "suggest": { - "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", - "ext-intl": "To show region name in time zone dump", - "ext-symfony_debug": "" - }, - "time": "2018-01-29 09:03:43", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "files": [ - "Resources/functions/dump.php" - ], - "psr-4": { - "Symfony\\Component\\VarDumper\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony mechanism for exploring and dumping PHP variables", - "homepage": "https://symfony.com", - "keywords": [ - "debug", - "dump" - ] - }, - { - "name": "symfony/translation", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "10b32cf0eae28b9b39fe26c456c42b19854c4b84" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/10b32cf0eae28b9b39fe26c456c42b19854c4b84", - "reference": "10b32cf0eae28b9b39fe26c456c42b19854c4b84", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.4", - "symfony/yaml": "<3.4" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0", - "symfony/yaml": "~3.4|~4.0" - }, - "suggest": { - "psr/log": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" - }, - "time": "2018-01-18 22:16:57", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Translation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Translation Component", - "homepage": "https://symfony.com" - }, - { - "name": "laravelcollective/html", - "version": "v5.5.1", - "version_normalized": "5.5.1.0", - "source": { - "type": "git", - "url": "https://github.com/LaravelCollective/html.git", - "reference": "2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6", - "reference": "2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6", - "shasum": "" - }, - "require": { - "illuminate/http": "5.5.*", - "illuminate/routing": "5.5.*", - "illuminate/session": "5.5.*", - "illuminate/support": "5.5.*", - "illuminate/view": "5.5.*", - "php": ">=7.0.0" - }, - "require-dev": { - "illuminate/database": "5.5.*", - "mockery/mockery": "~0.9.4", - "phpunit/phpunit": "~5.4" - }, - "time": "2017-08-31 14:46:03", - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Collective\\Html\\HtmlServiceProvider" - ], - "aliases": { - "Form": "Collective\\Html\\FormFacade", - "Html": "Collective\\Html\\HtmlFacade" - } - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Collective\\Html\\": "src/" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - }, - { - "name": "Adam Engebretson", - "email": "adam@laravelcollective.com" - } - ], - "description": "HTML and Form Builders for the Laravel Framework", - "homepage": "http://laravelcollective.com" - }, - { - "name": "symfony/css-selector", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/e66394bc7610e69279bfdb3ab11b4fe65403f556", - "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "time": "2018-01-03 07:37:34", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/event-dispatcher", - "version": "v3.4.4", - "version_normalized": "3.4.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/26b87b6bca8f8f797331a30b76fdae5342dc26ca", - "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "conflict": { - "symfony/dependency-injection": "<3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" - }, - "time": "2018-01-03 07:37:34", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony EventDispatcher Component", - "homepage": "https://symfony.com" - }, - { - "name": "doctrine/inflector", - "version": "v1.2.0", - "version_normalized": "1.2.0.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/inflector.git", - "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462", - "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462", - "shasum": "" - }, - "require": { - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.2" - }, - "time": "2017-07-22 12:18:28", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "inflection", - "pluralize", - "singularize", - "string" - ] - }, - { - "name": "laravel/framework", - "version": "v5.5.34", - "version_normalized": "5.5.34.0", - "source": { - "type": "git", - "url": "https://github.com/laravel/framework.git", - "reference": "1de7c0aec13eadbdddc2d1ba4019b064b2c6b966" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1de7c0aec13eadbdddc2d1ba4019b064b2c6b966", - "reference": "1de7c0aec13eadbdddc2d1ba4019b064b2c6b966", - "shasum": "" - }, - "require": { - "doctrine/inflector": "~1.1", - "erusev/parsedown": "~1.6", - "ext-mbstring": "*", - "ext-openssl": "*", - "league/flysystem": "~1.0", - "monolog/monolog": "~1.12", - "mtdowling/cron-expression": "~1.0", - "nesbot/carbon": "~1.20", - "php": ">=7.0", - "psr/container": "~1.0", - "psr/simple-cache": "^1.0", - "ramsey/uuid": "~3.0", - "swiftmailer/swiftmailer": "~6.0", - "symfony/console": "~3.3", - "symfony/debug": "~3.3", - "symfony/finder": "~3.3", - "symfony/http-foundation": "~3.3", - "symfony/http-kernel": "~3.3", - "symfony/process": "~3.3", - "symfony/routing": "~3.3", - "symfony/var-dumper": "~3.3", - "tijsverkoyen/css-to-inline-styles": "~2.2", - "vlucas/phpdotenv": "~2.2" - }, - "replace": { - "illuminate/auth": "self.version", - "illuminate/broadcasting": "self.version", - "illuminate/bus": "self.version", - "illuminate/cache": "self.version", - "illuminate/config": "self.version", - "illuminate/console": "self.version", - "illuminate/container": "self.version", - "illuminate/contracts": "self.version", - "illuminate/cookie": "self.version", - "illuminate/database": "self.version", - "illuminate/encryption": "self.version", - "illuminate/events": "self.version", - "illuminate/filesystem": "self.version", - "illuminate/hashing": "self.version", - "illuminate/http": "self.version", - "illuminate/log": "self.version", - "illuminate/mail": "self.version", - "illuminate/notifications": "self.version", - "illuminate/pagination": "self.version", - "illuminate/pipeline": "self.version", - "illuminate/queue": "self.version", - "illuminate/redis": "self.version", - "illuminate/routing": "self.version", - "illuminate/session": "self.version", - "illuminate/support": "self.version", - "illuminate/translation": "self.version", - "illuminate/validation": "self.version", - "illuminate/view": "self.version", - "tightenco/collect": "self.version" - }, - "require-dev": { - "aws/aws-sdk-php": "~3.0", - "doctrine/dbal": "~2.5", - "filp/whoops": "^2.1.4", - "mockery/mockery": "~1.0", - "orchestra/testbench-core": "3.5.*", - "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~6.0", - "predis/predis": "^1.1.1", - "symfony/css-selector": "~3.3", - "symfony/dom-crawler": "~3.3" - }, - "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", - "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).", - "ext-pcntl": "Required to use all features of the queue worker.", - "ext-posix": "Required to use all features of the queue worker.", - "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", - "laravel/tinker": "Required to use the tinker console command (~1.0).", - "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", - "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", - "nexmo/client": "Required to use the Nexmo transport (~1.0).", - "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", - "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.3).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.3).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)." - }, - "time": "2018-02-06 15:36:55", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.5-dev" - } - }, - "installation-source": "dist", - "autoload": { - "files": [ - "src/Illuminate/Foundation/helpers.php", - "src/Illuminate/Support/helpers.php" - ], - "psr-4": { - "Illuminate\\": "src/Illuminate/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "The Laravel Framework.", - "homepage": "https://laravel.com", - "keywords": [ - "framework", - "laravel" - ] - }, - { - "name": "doctrine/instantiator", - "version": "1.0.5", - "version_normalized": "1.0.5.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", - "shasum": "" - }, - "require": { - "php": ">=5.3,<8.0-DEV" - }, - "require-dev": { - "athletic/athletic": "~0.1.8", - "ext-pdo": "*", - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" - }, - "time": "2015-06-14 21:17:01", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", - "keywords": [ - "constructor", - "instantiate" - ] - }, { "name": "guzzlehttp/promises", "version": "v1.3.1", @@ -4168,7 +1962,7 @@ "require-dev": { "phpunit/phpunit": "^4.0" }, - "time": "2016-12-20 10:07:11", + "time": "2016-12-20T10:07:11+00:00", "type": "library", "extra": { "branch-alias": { @@ -4218,7 +2012,7 @@ "require": { "php": ">=5.3.0" }, - "time": "2016-08-06 14:39:51", + "time": "2016-08-06T14:39:51+00:00", "type": "library", "extra": { "branch-alias": { @@ -4277,7 +2071,7 @@ "require-dev": { "phpunit/phpunit": "~4.0" }, - "time": "2017-03-20 17:10:46", + "time": "2017-03-20T17:10:46+00:00", "type": "library", "extra": { "branch-alias": { @@ -4320,18 +2114,63 @@ ] }, { - "name": "guzzlehttp/guzzle", - "version": "6.3.0", - "version_normalized": "6.3.0.0", + "name": "symfony/thanks", + "version": "v1.0.7", + "version_normalized": "1.0.7.0", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" + "url": "https://github.com/symfony/thanks.git", + "reference": "bade4992c46ed722162694b4af8d72f84402819a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", + "url": "https://api.github.com/repos/symfony/thanks/zipball/bade4992c46ed722162694b4af8d72f84402819a", + "reference": "bade4992c46ed722162694b4af8d72f84402819a", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0", + "php": "^5.5.9|^7.0.0" + }, + "time": "2018-03-14T21:51:39+00:00", + "type": "composer-plugin", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + }, + "class": "Symfony\\Thanks\\Thanks" + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Thanks\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + } + ], + "description": "Give thanks (in the form of a GitHub ⭐) to your fellow PHP package maintainers (not limited to Symfony components)!" + }, + { + "name": "guzzlehttp/guzzle", + "version": "6.3.3", + "version_normalized": "6.3.3.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", "shasum": "" }, "require": { @@ -4341,17 +2180,17 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0 || ^5.0", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", "psr/log": "^1.0" }, "suggest": { "psr/log": "Required for using the Log middleware" }, - "time": "2017-06-22 18:50:49", + "time": "2018-04-22T15:46:56+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "6.2-dev" + "dev-master": "6.3-dev" } }, "installation-source": "dist", @@ -4385,5 +2224,2229 @@ "rest", "web service" ] + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.8.0", + "version_normalized": "1.8.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "3296adf6a6454a050679cde90f95350ad604b171" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "time": "2018-04-26T10:06:28+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ] + }, + { + "name": "symfony/var-dumper", + "version": "v3.4.11", + "version_normalized": "3.4.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e6545672d8c9ce70dd472adc2f8b03155a46f73", + "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + }, + "require-dev": { + "ext-iconv": "*", + "twig/twig": "~1.34|~2.4" + }, + "suggest": { + "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", + "ext-intl": "To show region name in time zone dump", + "ext-symfony_debug": "" + }, + "time": "2018-04-26T12:42:15+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "installation-source": "dist", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony mechanism for exploring and dumping PHP variables", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ] + }, + { + "name": "symfony/debug", + "version": "v3.4.11", + "version_normalized": "3.4.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/b28fd73fefbac341f673f5efd707d539d6a19f68", + "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "psr/log": "~1.0" + }, + "conflict": { + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + }, + "require-dev": { + "symfony/http-kernel": "~2.8|~3.0|~4.0" + }, + "time": "2018-05-16T14:03:39+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Debug Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/console", + "version": "v3.4.11", + "version_normalized": "3.4.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/36f83f642443c46f3cf751d4d2ee5d047d757a27", + "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "symfony/debug": "~2.8|~3.0|~4.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" + }, + "suggest": { + "psr/log-implementation": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" + }, + "time": "2018-05-16T08:49:21+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com" + }, + { + "name": "nikic/php-parser", + "version": "v4.0.2", + "version_normalized": "4.0.2.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/35b8caf75e791ba1b2d24fec1552168d72692b12", + "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.5 || ^7.0" + }, + "time": "2018-06-03T11:33:10+00:00", + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ] + }, + { + "name": "psy/psysh", + "version": "v0.9.6", + "version_normalized": "0.9.6.0", + "source": { + "type": "git", + "url": "https://github.com/bobthecow/psysh.git", + "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4a2ce86f199d51b6e2524214dc06835e872f4fce", + "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce", + "shasum": "" + }, + "require": { + "dnoegel/php-xdg-base-dir": "0.1", + "jakub-onderka/php-console-highlighter": "0.3.*", + "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0", + "php": ">=5.4.0", + "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", + "symfony/var-dumper": "~2.7|~3.0|~4.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.2", + "hoa/console": "~2.15|~3.16", + "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0" + }, + "suggest": { + "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", + "ext-pdo-sqlite": "The doc command requires SQLite to work.", + "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", + "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.", + "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." + }, + "time": "2018-06-10T17:57:20+00:00", + "bin": [ + "bin/psysh" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.9.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Psy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Justin Hileman", + "email": "justin@justinhileman.info", + "homepage": "http://justinhileman.com" + } + ], + "description": "An interactive shell for modern PHP.", + "homepage": "http://psysh.org", + "keywords": [ + "REPL", + "console", + "interactive", + "shell" + ] + }, + { + "name": "symfony/css-selector", + "version": "v4.1.0", + "version_normalized": "4.1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/03ac71606ecb0b0ce792faa17d74cc32c2949ef4", + "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "time": "2018-05-30T07:26:09+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/routing", + "version": "v3.4.11", + "version_normalized": "3.4.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/routing.git", + "reference": "e382da877f5304aabc12ec3073eec430670c8296" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/routing/zipball/e382da877f5304aabc12ec3073eec430670c8296", + "reference": "e382da877f5304aabc12ec3073eec430670c8296", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "conflict": { + "symfony/config": "<3.3.1", + "symfony/dependency-injection": "<3.3", + "symfony/yaml": "<3.4" + }, + "require-dev": { + "doctrine/annotations": "~1.0", + "doctrine/common": "~2.2", + "psr/log": "~1.0", + "symfony/config": "^3.3.1|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/yaml": "~3.4|~4.0" + }, + "suggest": { + "doctrine/annotations": "For using the annotation loader", + "symfony/config": "For using the all-in-one router or any loader", + "symfony/dependency-injection": "For loading routes from a service", + "symfony/expression-language": "For using expression matching", + "symfony/http-foundation": "For using a Symfony Request object", + "symfony/yaml": "For using the YAML loader" + }, + "time": "2018-05-16T12:49:49+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Routing\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Routing Component", + "homepage": "https://symfony.com", + "keywords": [ + "router", + "routing", + "uri", + "url" + ] + }, + { + "name": "symfony/process", + "version": "v3.4.11", + "version_normalized": "3.4.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/4cbf2db9abcb01486a21b7a059e03a62fae63187", + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "time": "2018-05-16T08:49:21+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com" + }, + { + "name": "paragonie/random_compat", + "version": "v2.0.15", + "version_normalized": "2.0.15.0", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09", + "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "time": "2018-06-08T15:26:40+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "files": [ + "lib/random.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "polyfill", + "pseudorandom", + "random" + ] + }, + { + "name": "symfony/polyfill-php70", + "version": "v1.8.0", + "version_normalized": "1.8.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6", + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "~1.0|~2.0", + "php": ">=5.3.3" + }, + "time": "2018-04-26T10:06:28+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php70\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ] + }, + { + "name": "symfony/http-foundation", + "version": "v3.4.11", + "version_normalized": "3.4.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-foundation.git", + "reference": "a7b5fc605d1c215cea1122359044b1e682eb70c0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a7b5fc605d1c215cea1122359044b1e682eb70c0", + "reference": "a7b5fc605d1c215cea1122359044b1e682eb70c0", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php70": "~1.6" + }, + "require-dev": { + "symfony/expression-language": "~2.8|~3.0|~4.0" + }, + "time": "2018-05-25T11:07:31+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpFoundation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony HttpFoundation Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/event-dispatcher", + "version": "v4.1.0", + "version_normalized": "4.1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5", + "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "conflict": { + "symfony/dependency-injection": "<3.4" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "time": "2018-04-06T07:35:57+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", + "version_normalized": "1.8.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2018-04-30T19:57:29+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ] + }, + { + "name": "symfony/http-kernel", + "version": "v3.4.11", + "version_normalized": "3.4.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-kernel.git", + "reference": "3dac45df55ee0c5134c457a730cd68e2a2ce0445" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3dac45df55ee0c5134c457a730cd68e2a2ce0445", + "reference": "3dac45df55ee0c5134c457a730cd68e2a2ce0445", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "psr/log": "~1.0", + "symfony/debug": "~2.8|~3.0|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "^3.4.4|^4.0.4", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/config": "<2.8", + "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4", + "symfony/var-dumper": "<3.3", + "twig/twig": "<1.34|<2.4,>=2" + }, + "provide": { + "psr/log-implementation": "1.0" + }, + "require-dev": { + "psr/cache": "~1.0", + "symfony/browser-kit": "~2.8|~3.0|~4.0", + "symfony/class-loader": "~2.8|~3.0", + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/console": "~2.8|~3.0|~4.0", + "symfony/css-selector": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "^3.4.5|^4.0.5", + "symfony/dom-crawler": "~2.8|~3.0|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0", + "symfony/routing": "~3.4|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0", + "symfony/templating": "~2.8|~3.0|~4.0", + "symfony/translation": "~2.8|~3.0|~4.0", + "symfony/var-dumper": "~3.3|~4.0" + }, + "suggest": { + "symfony/browser-kit": "", + "symfony/config": "", + "symfony/console": "", + "symfony/dependency-injection": "", + "symfony/finder": "", + "symfony/var-dumper": "" + }, + "time": "2018-05-25T13:16:28+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpKernel\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony HttpKernel Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/finder", + "version": "v3.4.11", + "version_normalized": "3.4.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "472a92f3df8b247b49ae364275fb32943b9656c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/472a92f3df8b247b49ae364275fb32943b9656c6", + "reference": "472a92f3df8b247b49ae364275fb32943b9656c6", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "time": "2018-05-16T08:49:21+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "https://symfony.com" + }, + { + "name": "egulias/email-validator", + "version": "2.1.4", + "version_normalized": "2.1.4.0", + "source": { + "type": "git", + "url": "https://github.com/egulias/EmailValidator.git", + "reference": "8790f594151ca6a2010c6218e09d96df67173ad3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/8790f594151ca6a2010c6218e09d96df67173ad3", + "reference": "8790f594151ca6a2010c6218e09d96df67173ad3", + "shasum": "" + }, + "require": { + "doctrine/lexer": "^1.0.1", + "php": ">= 5.5" + }, + "require-dev": { + "dominicsayers/isemail": "dev-master", + "phpunit/phpunit": "^4.8.35||^5.7||^6.0", + "satooshi/php-coveralls": "^1.0.1" + }, + "suggest": { + "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" + }, + "time": "2018-04-10T10:11:19+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Egulias\\EmailValidator\\": "EmailValidator" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eduardo Gulias Davis" + } + ], + "description": "A library for validating emails against several RFCs", + "homepage": "https://github.com/egulias/EmailValidator", + "keywords": [ + "email", + "emailvalidation", + "emailvalidator", + "validation", + "validator" + ] + }, + { + "name": "psr/simple-cache", + "version": "1.0.1", + "version_normalized": "1.0.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2017-10-23T01:57:42+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ] + }, + { + "name": "symfony/translation", + "version": "v4.1.0", + "version_normalized": "4.1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/16328f5b217cebc8dd4adfe4aeeaa8c377581f5a", + "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/config": "<3.4", + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/intl": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" + }, + "suggest": { + "psr/log-implementation": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" + }, + "time": "2018-05-30T07:26:09+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Translation Component", + "homepage": "https://symfony.com" + }, + { + "name": "nesbot/carbon", + "version": "1.29.2", + "version_normalized": "1.29.2.0", + "source": { + "type": "git", + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "ed6aa898982f441ccc9b2acdec51490f2bc5d337" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ed6aa898982f441ccc9b2acdec51490f2bc5d337", + "reference": "ed6aa898982f441ccc9b2acdec51490f2bc5d337", + "shasum": "" + }, + "require": { + "php": ">=5.3.9", + "symfony/translation": "~2.6 || ~3.0 || ~4.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2", + "phpunit/phpunit": "^4.8.35 || ^5.7" + }, + "time": "2018-05-29T15:23:46+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Brian Nesbitt", + "email": "brian@nesbot.com", + "homepage": "http://nesbot.com" + } + ], + "description": "A simple API extension for DateTime.", + "homepage": "http://carbon.nesbot.com", + "keywords": [ + "date", + "datetime", + "time" + ] + }, + { + "name": "league/flysystem", + "version": "1.0.45", + "version_normalized": "1.0.45.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem.git", + "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a99f94e63b512d75f851b181afcdf0ee9ebef7e6", + "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "conflict": { + "league/flysystem-sftp": "<1.0.6" + }, + "require-dev": { + "ext-fileinfo": "*", + "phpspec/phpspec": "^3.4", + "phpunit/phpunit": "^5.7" + }, + "suggest": { + "ext-fileinfo": "Required for MimeType", + "ext-ftp": "Allows you to use FTP server storage", + "ext-openssl": "Allows you to use FTPS server storage", + "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2", + "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3", + "league/flysystem-azure": "Allows you to use Windows Azure Blob storage", + "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching", + "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem", + "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", + "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", + "league/flysystem-webdav": "Allows you to use WebDAV storage", + "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", + "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", + "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" + }, + "time": "2018-05-07T08:44:23+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "League\\Flysystem\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Frank de Jonge", + "email": "info@frenky.net" + } + ], + "description": "Filesystem abstraction: Many filesystems, one API.", + "keywords": [ + "Cloud Files", + "WebDAV", + "abstraction", + "aws", + "cloud", + "copy.com", + "dropbox", + "file systems", + "files", + "filesystem", + "filesystems", + "ftp", + "rackspace", + "remote", + "s3", + "sftp", + "storage" + ] + }, + { + "name": "erusev/parsedown", + "version": "1.7.1", + "version_normalized": "1.7.1.0", + "source": { + "type": "git", + "url": "https://github.com/erusev/parsedown.git", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35" + }, + "time": "2018-03-08T01:11:30+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Parsedown": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Emanuil Rusev", + "email": "hello@erusev.com", + "homepage": "http://erusev.com" + } + ], + "description": "Parser for Markdown.", + "homepage": "http://parsedown.org", + "keywords": [ + "markdown", + "parser" + ] + }, + { + "name": "doctrine/inflector", + "version": "v1.3.0", + "version_normalized": "1.3.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.2" + }, + "time": "2018-01-09T20:05:19+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "inflection", + "pluralize", + "singularize", + "string" + ] + }, + { + "name": "laravel/framework", + "version": "v5.5.40", + "version_normalized": "5.5.40.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/framework.git", + "reference": "d724ce0aa61bbd9adf658215eec484f5dd6711d6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/framework/zipball/d724ce0aa61bbd9adf658215eec484f5dd6711d6", + "reference": "d724ce0aa61bbd9adf658215eec484f5dd6711d6", + "shasum": "" + }, + "require": { + "doctrine/inflector": "~1.1", + "erusev/parsedown": "~1.7", + "ext-mbstring": "*", + "ext-openssl": "*", + "league/flysystem": "^1.0.8", + "monolog/monolog": "~1.12", + "mtdowling/cron-expression": "~1.0", + "nesbot/carbon": "^1.24.1", + "php": ">=7.0", + "psr/container": "~1.0", + "psr/simple-cache": "^1.0", + "ramsey/uuid": "~3.0", + "swiftmailer/swiftmailer": "~6.0", + "symfony/console": "~3.3", + "symfony/debug": "~3.3", + "symfony/finder": "~3.3", + "symfony/http-foundation": "~3.3", + "symfony/http-kernel": "~3.3", + "symfony/process": "~3.3", + "symfony/routing": "~3.3", + "symfony/var-dumper": "~3.3", + "tijsverkoyen/css-to-inline-styles": "~2.2", + "vlucas/phpdotenv": "~2.2" + }, + "replace": { + "illuminate/auth": "self.version", + "illuminate/broadcasting": "self.version", + "illuminate/bus": "self.version", + "illuminate/cache": "self.version", + "illuminate/config": "self.version", + "illuminate/console": "self.version", + "illuminate/container": "self.version", + "illuminate/contracts": "self.version", + "illuminate/cookie": "self.version", + "illuminate/database": "self.version", + "illuminate/encryption": "self.version", + "illuminate/events": "self.version", + "illuminate/filesystem": "self.version", + "illuminate/hashing": "self.version", + "illuminate/http": "self.version", + "illuminate/log": "self.version", + "illuminate/mail": "self.version", + "illuminate/notifications": "self.version", + "illuminate/pagination": "self.version", + "illuminate/pipeline": "self.version", + "illuminate/queue": "self.version", + "illuminate/redis": "self.version", + "illuminate/routing": "self.version", + "illuminate/session": "self.version", + "illuminate/support": "self.version", + "illuminate/translation": "self.version", + "illuminate/validation": "self.version", + "illuminate/view": "self.version", + "tightenco/collect": "<5.5.33" + }, + "require-dev": { + "aws/aws-sdk-php": "~3.0", + "doctrine/dbal": "~2.5", + "filp/whoops": "^2.1.4", + "mockery/mockery": "~1.0", + "orchestra/testbench-core": "3.5.*", + "pda/pheanstalk": "~3.0", + "phpunit/phpunit": "~6.0", + "predis/predis": "^1.1.1", + "symfony/css-selector": "~3.3", + "symfony/dom-crawler": "~3.3" + }, + "suggest": { + "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).", + "ext-pcntl": "Required to use all features of the queue worker.", + "ext-posix": "Required to use all features of the queue worker.", + "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", + "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", + "laravel/tinker": "Required to use the tinker console command (~1.0).", + "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", + "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).", + "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", + "nexmo/client": "Required to use the Nexmo transport (~1.0).", + "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", + "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).", + "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.3).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.3).", + "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)." + }, + "time": "2018-03-30T13:29:30+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.5-dev" + } + }, + "installation-source": "dist", + "autoload": { + "files": [ + "src/Illuminate/Foundation/helpers.php", + "src/Illuminate/Support/helpers.php" + ], + "psr-4": { + "Illuminate\\": "src/Illuminate/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Laravel Framework.", + "homepage": "https://laravel.com", + "keywords": [ + "framework", + "laravel" + ] + }, + { + "name": "laravel/tinker", + "version": "v1.0.7", + "version_normalized": "1.0.7.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/tinker.git", + "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/tinker/zipball/e3086ee8cb1f54a39ae8dcb72d1c37d10128997d", + "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d", + "shasum": "" + }, + "require": { + "illuminate/console": "~5.1", + "illuminate/contracts": "~5.1", + "illuminate/support": "~5.1", + "php": ">=5.5.9", + "psy/psysh": "0.7.*|0.8.*|0.9.*", + "symfony/var-dumper": "~3.0|~4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0|~5.0" + }, + "suggest": { + "illuminate/database": "The Illuminate Database package (~5.1)." + }, + "time": "2018-05-17T13:42:07+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + }, + "laravel": { + "providers": [ + "Laravel\\Tinker\\TinkerServiceProvider" + ] + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Laravel\\Tinker\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Powerful REPL for the Laravel framework.", + "keywords": [ + "REPL", + "Tinker", + "laravel", + "psysh" + ] + }, + { + "name": "laravelcollective/html", + "version": "v5.5.4", + "version_normalized": "5.5.4.0", + "source": { + "type": "git", + "url": "https://github.com/LaravelCollective/html.git", + "reference": "04c596a69975b901f2223eb6eb4adf55354121c2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/04c596a69975b901f2223eb6eb4adf55354121c2", + "reference": "04c596a69975b901f2223eb6eb4adf55354121c2", + "shasum": "" + }, + "require": { + "illuminate/http": "5.5.*", + "illuminate/routing": "5.5.*", + "illuminate/session": "5.5.*", + "illuminate/support": "5.5.*", + "illuminate/view": "5.5.*", + "php": ">=7.0.0" + }, + "require-dev": { + "illuminate/database": "5.5.*", + "mockery/mockery": "~0.9.4", + "phpunit/phpunit": "~5.4" + }, + "time": "2018-03-24T00:39:21+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.5-dev" + }, + "laravel": { + "providers": [ + "Collective\\Html\\HtmlServiceProvider" + ], + "aliases": { + "Form": "Collective\\Html\\FormFacade", + "Html": "Collective\\Html\\HtmlFacade" + } + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Collective\\Html\\": "src/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + }, + { + "name": "Adam Engebretson", + "email": "adam@laravelcollective.com" + } + ], + "description": "HTML and Form Builders for the Laravel Framework", + "homepage": "https://laravelcollective.com" + }, + { + "name": "filp/whoops", + "version": "2.2.0", + "version_normalized": "2.2.0.0", + "source": { + "type": "git", + "url": "https://github.com/filp/whoops.git", + "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/filp/whoops/zipball/181c4502d8f34db7aed7bfe88d4f87875b8e947a", + "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a", + "shasum": "" + }, + "require": { + "php": "^5.5.9 || ^7.0", + "psr/log": "^1.0.1" + }, + "require-dev": { + "mockery/mockery": "^0.9 || ^1.0", + "phpunit/phpunit": "^4.8.35 || ^5.7", + "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0" + }, + "suggest": { + "symfony/var-dumper": "Pretty print complex values better with var-dumper available", + "whoops/soap": "Formats errors as SOAP responses" + }, + "time": "2018-03-03T17:56:25+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Whoops\\": "src/Whoops/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Filipe Dobreira", + "homepage": "https://github.com/filp", + "role": "Developer" + } + ], + "description": "php error handling for cool kids", + "homepage": "https://filp.github.io/whoops/", + "keywords": [ + "error", + "exception", + "handling", + "library", + "throwable", + "whoops" + ] + }, + { + "name": "mockery/mockery", + "version": "1.1.0", + "version_normalized": "1.1.0.0", + "source": { + "type": "git", + "url": "https://github.com/mockery/mockery.git", + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99", + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99", + "shasum": "" + }, + "require": { + "hamcrest/hamcrest-php": "~2.0", + "lib-pcre": ">=7.0", + "php": ">=5.6.0" + }, + "require-dev": { + "phpdocumentor/phpdocumentor": "^2.9", + "phpunit/phpunit": "~5.7.10|~6.5" + }, + "time": "2018-05-08T08:54:48+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Mockery": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "http://blog.astrumfutura.com" + }, + { + "name": "Dave Marshall", + "email": "dave.marshall@atstsolutions.co.uk", + "homepage": "http://davedevelopment.co.uk" + } + ], + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", + "keywords": [ + "BDD", + "TDD", + "library", + "mock", + "mock objects", + "mockery", + "stub", + "test", + "test double", + "testing" + ] + }, + { + "name": "doctrine/instantiator", + "version": "1.1.0", + "version_normalized": "1.1.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" + }, + "time": "2017-07-22T11:58:36+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ] + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "5.0.7", + "version_normalized": "5.0.7.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", + "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.5", + "php": "^7.0", + "phpunit/php-text-template": "^1.2.1", + "sebastian/exporter": "^3.1" + }, + "conflict": { + "phpunit/phpunit": "<6.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.5" + }, + "suggest": { + "ext-soap": "*" + }, + "time": "2018-05-29T13:50:43+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ] + }, + { + "name": "phpunit/php-code-coverage", + "version": "5.3.2", + "version_normalized": "5.3.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "c89677919c5dd6d3b3852f230a663118762218ac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac", + "reference": "c89677919c5dd6d3b3852f230a663118762218ac", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^7.0", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^2.0.1", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^3.0", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "suggest": { + "ext-xdebug": "^2.5.5" + }, + "time": "2018-04-06T15:36:58+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.3.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ] + }, + { + "name": "phpspec/prophecy", + "version": "1.7.6", + "version_normalized": "1.7.6.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" + }, + "require-dev": { + "phpspec/phpspec": "^2.5|^3.2", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" + }, + "time": "2018-04-18T13:57:24+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ] + }, + { + "name": "myclabs/deep-copy", + "version": "1.8.1", + "version_normalized": "1.8.1.0", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^7.1" + }, + "time": "2018-06-11T23:09:50+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ] + }, + { + "name": "phpunit/phpunit", + "version": "6.5.8", + "version_normalized": "6.5.8.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b", + "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "^1.6.1", + "phar-io/manifest": "^1.0.1", + "phar-io/version": "^1.0", + "php": "^7.0", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^5.3", + "phpunit/php-file-iterator": "^1.4.3", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^1.0.9", + "phpunit/phpunit-mock-objects": "^5.0.5", + "sebastian/comparator": "^2.1", + "sebastian/diff": "^2.0", + "sebastian/environment": "^3.1", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^1.0", + "sebastian/version": "^2.0.1" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2", + "phpunit/dbunit": "<3.0" + }, + "require-dev": { + "ext-pdo": "*" + }, + "suggest": { + "ext-xdebug": "*", + "phpunit/php-invoker": "^1.1" + }, + "time": "2018-04-10T11:38:34+00:00", + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.5.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ] } ] diff --git a/vendor/doctrine/inflector/composer.json b/vendor/doctrine/inflector/composer.json index e06b6494..2189ff17 100644 --- a/vendor/doctrine/inflector/composer.json +++ b/vendor/doctrine/inflector/composer.json @@ -13,7 +13,7 @@ {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"} ], "require": { - "php": "^7.0" + "php": "^7.1" }, "require-dev": { "phpunit/phpunit": "^6.2" @@ -22,11 +22,11 @@ "psr-4": { "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" } }, "autoload-dev": { - "psr-4": { "Doctrine\\Tests\\Common\\Inflector\\": "tests/Doctrine/Common/Inflector" } + "psr-4": { "Doctrine\\Tests\\Common\\Inflector\\": "tests/Doctrine/Tests/Common/Inflector" } }, "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } } } diff --git a/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php b/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php index 3a951af8..f9067a02 100644 --- a/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php +++ b/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php @@ -38,7 +38,7 @@ class Inflector /** * Plural inflector rules. * - * @var array + * @var string[][] */ private static $plural = array( 'rules' => array( @@ -53,6 +53,7 @@ class Inflector '/(?:([^f])fe|([lr])f)$/i' => '\1\2ves', '/sis$/i' => 'ses', '/([ti])um$/i' => '\1a', + '/(c)riterion$/i' => '\1riteria', '/(p)erson$/i' => '\1eople', '/(m)an$/i' => '\1en', '/(c)hild$/i' => '\1hildren', @@ -100,6 +101,7 @@ class Inflector 'ganglion' => 'ganglions', 'genie' => 'genies', 'genus' => 'genera', + 'goose' => 'geese', 'graffito' => 'graffiti', 'hippopotamus' => 'hippopotami', 'hoof' => 'hoofs', @@ -138,6 +140,7 @@ class Inflector 'tornado' => 'tornadoes', 'trilby' => 'trilbys', 'turf' => 'turfs', + 'valve' => 'valves', 'volcano' => 'volcanoes', ) ); @@ -145,7 +148,7 @@ class Inflector /** * Singular inflector rules. * - * @var array + * @var string[][] */ private static $singular = array( 'rules' => array( @@ -174,9 +177,11 @@ class Inflector '/(hive)s$/i' => '\1', '/(drive)s$/i' => '\1', '/(dive)s$/i' => '\1', + '/(olive)s$/i' => '\1', '/([^fo])ves$/i' => '\1fe', '/(^analy)ses$/i' => '\1sis', '/(analy|diagno|^ba|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis', + '/(c)riteria$/i' => '\1riterion', '/([ti])a$/i' => '\1um', '/(p)eople$/i' => '\1\2erson', '/(m)en$/i' => '\1an', @@ -196,21 +201,27 @@ class Inflector '.*pox', '.*sheep', '.*ss', + 'data', 'police', 'pants', 'clothes', ), 'irregular' => array( - 'caches' => 'cache', - 'criteria' => 'criterion', - 'curves' => 'curve', - 'emphases' => 'emphasis', - 'foes' => 'foe', - 'hoaxes' => 'hoax', - 'media' => 'medium', - 'neuroses' => 'neurosis', - 'waves' => 'wave', - 'oases' => 'oasis', + 'abuses' => 'abuse', + 'avalanches' => 'avalanche', + 'caches' => 'cache', + 'criteria' => 'criterion', + 'curves' => 'curve', + 'emphases' => 'emphasis', + 'foes' => 'foe', + 'geese' => 'goose', + 'graves' => 'grave', + 'hoaxes' => 'hoax', + 'media' => 'medium', + 'neuroses' => 'neurosis', + 'waves' => 'wave', + 'oases' => 'oasis', + 'valves' => 'valve', ) ); @@ -220,18 +231,18 @@ class Inflector * @var array */ private static $uninflected = array( - 'Amoyese', 'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus', - 'carp', 'chassis', 'clippers', 'cod', 'coitus', 'Congoese', 'contretemps', 'corps', - 'debris', 'diabetes', 'djinn', 'eland', 'elk', 'equipment', 'Faroese', 'flounder', - 'Foochowese', 'Furniture', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'graffiti', - 'headquarters', 'herpes', 'hijinks', 'Hottentotese', 'information', 'innings', - 'jackanapes', 'Kiplingese', 'Kongoese', 'Lucchese', 'Luggage', 'mackerel', 'Maltese', '.*?media', - 'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese', - 'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'pliers', 'Portuguese', - 'proceedings', 'rabies', 'rice', 'rhinoceros', 'salmon', 'Sarawakese', 'scissors', - 'sea[- ]bass', 'series', 'Shavese', 'shears', 'siemens', 'species', 'staff', 'swine', - 'testes', 'trousers', 'trout', 'tuna', 'Vermontese', 'Wenchowese', 'whiting', - 'wildebeest', 'Yengeese' + '.*?media', 'Amoyese', 'audio', 'bison', 'Borghese', 'bream', 'breeches', + 'britches', 'buffalo', 'cantus', 'carp', 'chassis', 'clippers', 'cod', 'coitus', 'compensation', 'Congoese', + 'contretemps', 'coreopsis', 'corps', 'data', 'debris', 'deer', 'diabetes', 'djinn', 'education', 'eland', + 'elk', 'emoji', 'equipment', 'evidence', 'Faroese', 'feedback', 'fish', 'flounder', 'Foochowese', + 'Furniture', 'furniture', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'gold', + 'headquarters', 'herpes', 'hijinks', 'Hottentotese', 'information', 'innings', 'jackanapes', 'jedi', + 'Kiplingese', 'knowledge', 'Kongoese', 'love', 'Lucchese', 'Luggage', 'mackerel', 'Maltese', 'metadata', + 'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese', 'nutrition', 'offspring', + 'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'plankton', 'pliers', 'pokemon', 'police', 'Portuguese', + 'proceedings', 'rabies', 'rain', 'rhinoceros', 'rice', 'salmon', 'Sarawakese', 'scissors', 'sea[- ]bass', + 'series', 'Shavese', 'shears', 'sheep', 'siemens', 'species', 'staff', 'swine', 'traffic', + 'trousers', 'trout', 'tuna', 'us', 'Vermontese', 'Wenchowese', 'wheat', 'whiting', 'wildebeest', 'Yengeese' ); /** @@ -250,36 +261,24 @@ class Inflector /** * Converts a word into the format for a Doctrine table name. Converts 'ModelName' to 'model_name'. - * - * @param string $word The word to tableize. - * - * @return string The tableized word. */ - public static function tableize($word) + public static function tableize(string $word) : string { return strtolower(preg_replace('~(?<=\\w)([A-Z])~', '_$1', $word)); } /** * Converts a word into the format for a Doctrine class name. Converts 'table_name' to 'TableName'. - * - * @param string $word The word to classify. - * - * @return string The classified word. */ - public static function classify($word) + public static function classify(string $word) : string { - return str_replace(' ', '', ucwords(strtr($word, '_-', ' '))); + return str_replace([' ', '_', '-'], '', ucwords($word, ' _-')); } /** * Camelizes a word. This uses the classify() method and turns the first character to lowercase. - * - * @param string $word The word to camelize. - * - * @return string The camelized word. */ - public static function camelize($word) + public static function camelize(string $word) : string { return lcfirst(self::classify($word)); } @@ -288,7 +287,7 @@ class Inflector * Uppercases words with configurable delimeters between words. * * Takes a string and capitalizes all of the words, like PHP's built-in - * ucwords function. This extends that behavior, however, by allowing the + * ucwords function. This extends that behavior, however, by allowing the * word delimeters to be configured, rather than only separating on * whitespace. * @@ -309,24 +308,16 @@ class Inflector * * @return string The string with all delimeter-separated words capitalized. */ - public static function ucwords($string, $delimiters = " \n\t\r\0\x0B-") + public static function ucwords(string $string, string $delimiters = " \n\t\r\0\x0B-") : string { - return preg_replace_callback( - '/[^' . preg_quote($delimiters, '/') . ']+/', - function($matches) { - return ucfirst($matches[0]); - }, - $string - ); + return ucwords($string, $delimiters); } /** * Clears Inflectors inflected value caches, and resets the inflection * rules to the initial values. - * - * @return void */ - public static function reset() + public static function reset() : void { if (empty(self::$initialState)) { self::$initialState = get_class_vars('Inflector'); @@ -335,7 +326,7 @@ class Inflector } foreach (self::$initialState as $key => $val) { - if ($key != 'initialState') { + if ($key !== 'initialState') { self::${$key} = $val; } } @@ -355,14 +346,14 @@ class Inflector * )); * }}} * - * @param string $type The type of inflection, either 'plural' or 'singular' - * @param array $rules An array of rules to be added. - * @param boolean $reset If true, will unset default inflections for all - * new rules that are being defined in $rules. + * @param string $type The type of inflection, either 'plural' or 'singular' + * @param array|iterable $rules An array of rules to be added. + * @param boolean $reset If true, will unset default inflections for all + * new rules that are being defined in $rules. * * @return void */ - public static function rules($type, $rules, $reset = false) + public static function rules(string $type, iterable $rules, bool $reset = false) : void { foreach ($rules as $rule => $pattern) { if ( ! is_array($pattern)) { @@ -400,7 +391,7 @@ class Inflector * * @return string The word in plural form. */ - public static function pluralize($word) + public static function pluralize(string $word) : string { if (isset(self::$cache['pluralize'][$word])) { return self::$cache['pluralize'][$word]; @@ -420,7 +411,7 @@ class Inflector } if (preg_match('/(.*)\\b(' . self::$plural['cacheIrregular'] . ')$/i', $word, $regs)) { - self::$cache['pluralize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$plural['merged']['irregular'][strtolower($regs[2])], 1); + self::$cache['pluralize'][$word] = $regs[1] . $word[0] . substr(self::$plural['merged']['irregular'][strtolower($regs[2])], 1); return self::$cache['pluralize'][$word]; } @@ -447,7 +438,7 @@ class Inflector * * @return string The word in singular form. */ - public static function singularize($word) + public static function singularize(string $word) : string { if (isset(self::$cache['singularize'][$word])) { return self::$cache['singularize'][$word]; @@ -468,12 +459,12 @@ class Inflector } if (!isset(self::$singular['cacheUninflected']) || !isset(self::$singular['cacheIrregular'])) { - self::$singular['cacheUninflected'] = '(?:' . join('|', self::$singular['merged']['uninflected']) . ')'; - self::$singular['cacheIrregular'] = '(?:' . join('|', array_keys(self::$singular['merged']['irregular'])) . ')'; + self::$singular['cacheUninflected'] = '(?:' . implode('|', self::$singular['merged']['uninflected']) . ')'; + self::$singular['cacheIrregular'] = '(?:' . implode('|', array_keys(self::$singular['merged']['irregular'])) . ')'; } if (preg_match('/(.*)\\b(' . self::$singular['cacheIrregular'] . ')$/i', $word, $regs)) { - self::$cache['singularize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$singular['merged']['irregular'][strtolower($regs[2])], 1); + self::$cache['singularize'][$word] = $regs[1] . $word[0] . substr(self::$singular['merged']['irregular'][strtolower($regs[2])], 1); return self::$cache['singularize'][$word]; } diff --git a/vendor/doctrine/instantiator/.gitignore b/vendor/doctrine/instantiator/.gitignore deleted file mode 100644 index e3e368dd..00000000 --- a/vendor/doctrine/instantiator/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -phpunit.xml -composer.lock -build -vendor -coverage.clover diff --git a/vendor/doctrine/instantiator/.scrutinizer.yml b/vendor/doctrine/instantiator/.scrutinizer.yml deleted file mode 100644 index aad5e403..00000000 --- a/vendor/doctrine/instantiator/.scrutinizer.yml +++ /dev/null @@ -1,46 +0,0 @@ -before_commands: - - "composer install --prefer-source" - -tools: - external_code_coverage: - timeout: 600 - php_code_coverage: - enabled: true - test_command: ./vendor/bin/phpunit - php_code_sniffer: - enabled: true - config: - standard: PSR2 - filter: - paths: ["src/*", "tests/*"] - php_cpd: - enabled: true - excluded_dirs: ["build/*", "tests", "vendor"] - php_cs_fixer: - enabled: true - config: - level: all - filter: - paths: ["src/*", "tests/*"] - php_loc: - enabled: true - excluded_dirs: ["build", "tests", "vendor"] - php_mess_detector: - enabled: true - config: - ruleset: phpmd.xml.dist - design_rules: { eval_expression: false } - filter: - paths: ["src/*"] - php_pdepend: - enabled: true - excluded_dirs: ["build", "tests", "vendor"] - php_analyzer: - enabled: true - filter: - paths: ["src/*", "tests/*"] - php_hhvm: - enabled: true - filter: - paths: ["src/*", "tests/*"] - sensiolabs_security_checker: true diff --git a/vendor/doctrine/instantiator/.travis.install.sh b/vendor/doctrine/instantiator/.travis.install.sh deleted file mode 100644 index 2819188c..00000000 --- a/vendor/doctrine/instantiator/.travis.install.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -set -x -if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] || [ "$TRAVIS_PHP_VERSION" = 'hhvm-nightly' ] ; then - curl -sS https://getcomposer.org/installer > composer-installer.php - hhvm composer-installer.php - hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQueryThreshold=30000 composer.phar update --prefer-source -elif [ "$TRAVIS_PHP_VERSION" = '5.3.3' ] ; then - composer self-update - composer update --prefer-source --no-dev - composer dump-autoload -else - composer self-update - composer update --prefer-source -fi diff --git a/vendor/doctrine/instantiator/.travis.yml b/vendor/doctrine/instantiator/.travis.yml deleted file mode 100644 index 7f1ec5f9..00000000 --- a/vendor/doctrine/instantiator/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: php - -php: - - 5.3.3 - - 5.3 - - 5.4 - - 5.5 - - 5.6 - - hhvm - -before_script: - - ./.travis.install.sh - - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then PHPUNIT_FLAGS="--coverage-clover coverage.clover"; else PHPUNIT_FLAGS=""; fi - -script: - - if [ $TRAVIS_PHP_VERSION = '5.3.3' ]; then phpunit; fi - - if [ $TRAVIS_PHP_VERSION != '5.3.3' ]; then ./vendor/bin/phpunit $PHPUNIT_FLAGS; fi - - if [ $TRAVIS_PHP_VERSION != '5.3.3' ]; then ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/; fi - - if [[ $TRAVIS_PHP_VERSION != '5.3.3' && $TRAVIS_PHP_VERSION != '5.4.29' && $TRAVIS_PHP_VERSION != '5.5.13' ]]; then php -n ./vendor/bin/athletic -p ./tests/DoctrineTest/InstantiatorPerformance/ -f GroupedFormatter; fi - -after_script: - - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi diff --git a/vendor/doctrine/instantiator/README.md b/vendor/doctrine/instantiator/README.md index 393ec7ca..b66064bf 100644 --- a/vendor/doctrine/instantiator/README.md +++ b/vendor/doctrine/instantiator/README.md @@ -27,7 +27,7 @@ itself: ```php $instantiator = new \Doctrine\Instantiator\Instantiator(); -$instance = $instantiator->instantiate('My\\ClassName\\Here'); +$instance = $instantiator->instantiate(\My\ClassName\Here::class); ``` ## Contributing diff --git a/vendor/doctrine/instantiator/composer.json b/vendor/doctrine/instantiator/composer.json index 4823890b..403ee8e6 100644 --- a/vendor/doctrine/instantiator/composer.json +++ b/vendor/doctrine/instantiator/composer.json @@ -16,13 +16,13 @@ } ], "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "ext-phar": "*", "ext-pdo": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0", + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2", "athletic/athletic": "~0.1.8" }, "autoload": { @@ -39,7 +39,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } } } diff --git a/vendor/doctrine/instantiator/phpmd.xml.dist b/vendor/doctrine/instantiator/phpmd.xml.dist deleted file mode 100644 index 82541056..00000000 --- a/vendor/doctrine/instantiator/phpmd.xml.dist +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/vendor/doctrine/instantiator/phpunit.xml.dist b/vendor/doctrine/instantiator/phpunit.xml.dist deleted file mode 100644 index 0a8d5709..00000000 --- a/vendor/doctrine/instantiator/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - ./tests/DoctrineTest/InstantiatorTest - - - - ./src - - - diff --git a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php index ea8d28c5..cb57aa86 100644 --- a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php +++ b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php @@ -29,12 +29,7 @@ use ReflectionClass; */ class InvalidArgumentException extends BaseInvalidArgumentException implements ExceptionInterface { - /** - * @param string $className - * - * @return self - */ - public static function fromNonExistingClass($className) + public static function fromNonExistingClass(string $className) : self { if (interface_exists($className)) { return new self(sprintf('The provided type "%s" is an interface, and can not be instantiated', $className)); @@ -47,12 +42,7 @@ class InvalidArgumentException extends BaseInvalidArgumentException implements E return new self(sprintf('The provided class "%s" does not exist', $className)); } - /** - * @param ReflectionClass $reflectionClass - * - * @return self - */ - public static function fromAbstractClass(ReflectionClass $reflectionClass) + public static function fromAbstractClass(ReflectionClass $reflectionClass) : self { return new self(sprintf( 'The provided class "%s" is abstract, and can not be instantiated', diff --git a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php index 1681e56e..2b704b92 100644 --- a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php +++ b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php @@ -30,14 +30,10 @@ use UnexpectedValueException as BaseUnexpectedValueException; */ class UnexpectedValueException extends BaseUnexpectedValueException implements ExceptionInterface { - /** - * @param ReflectionClass $reflectionClass - * @param Exception $exception - * - * @return self - */ - public static function fromSerializationTriggeredException(ReflectionClass $reflectionClass, Exception $exception) - { + public static function fromSerializationTriggeredException( + ReflectionClass $reflectionClass, + Exception $exception + ) : self { return new self( sprintf( 'An exception was raised while trying to instantiate an instance of "%s" via un-serialization', @@ -48,22 +44,13 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements E ); } - /** - * @param ReflectionClass $reflectionClass - * @param string $errorString - * @param int $errorCode - * @param string $errorFile - * @param int $errorLine - * - * @return UnexpectedValueException - */ public static function fromUncleanUnSerialization( ReflectionClass $reflectionClass, - $errorString, - $errorCode, - $errorFile, - $errorLine - ) { + string $errorString, + int $errorCode, + string $errorFile, + int $errorLine + ) : self { return new self( sprintf( 'Could not produce an instance of "%s" via un-serialization, since an error was triggered ' diff --git a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php index 6d5b3b65..69fe65da 100644 --- a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php +++ b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php @@ -19,7 +19,6 @@ namespace Doctrine\Instantiator; -use Closure; use Doctrine\Instantiator\Exception\InvalidArgumentException; use Doctrine\Instantiator\Exception\UnexpectedValueException; use Exception; @@ -41,14 +40,14 @@ final class Instantiator implements InstantiatorInterface const SERIALIZATION_FORMAT_AVOID_UNSERIALIZER = 'O'; /** - * @var \Closure[] of {@see \Closure} instances used to instantiate specific classes + * @var \callable[] used to instantiate specific classes, indexed by class name */ - private static $cachedInstantiators = array(); + private static $cachedInstantiators = []; /** - * @var object[] of objects that can directly be cloned + * @var object[] of objects that can directly be cloned, indexed by class name */ - private static $cachedCloneables = array(); + private static $cachedCloneables = []; /** * {@inheritDoc} @@ -71,11 +70,9 @@ final class Instantiator implements InstantiatorInterface /** * Builds the requested object and caches it in static properties for performance * - * @param string $className - * * @return object */ - private function buildAndCacheFromFactory($className) + private function buildAndCacheFromFactory(string $className) { $factory = self::$cachedInstantiators[$className] = $this->buildFactory($className); $instance = $factory(); @@ -88,26 +85,24 @@ final class Instantiator implements InstantiatorInterface } /** - * Builds a {@see \Closure} capable of instantiating the given $className without + * Builds a callable capable of instantiating the given $className without * invoking its constructor. * - * @param string $className - * - * @return Closure + * @throws InvalidArgumentException + * @throws UnexpectedValueException + * @throws \ReflectionException */ - private function buildFactory($className) + private function buildFactory(string $className) : callable { $reflectionClass = $this->getReflectionClass($className); if ($this->isInstantiableViaReflection($reflectionClass)) { - return function () use ($reflectionClass) { - return $reflectionClass->newInstanceWithoutConstructor(); - }; + return [$reflectionClass, 'newInstanceWithoutConstructor']; } $serializedString = sprintf( '%s:%d:"%s":0:{}', - $this->getSerializationFormat($reflectionClass), + self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER, strlen($className), $className ); @@ -125,8 +120,9 @@ final class Instantiator implements InstantiatorInterface * @return ReflectionClass * * @throws InvalidArgumentException + * @throws \ReflectionException */ - private function getReflectionClass($className) + private function getReflectionClass($className) : ReflectionClass { if (! class_exists($className)) { throw InvalidArgumentException::fromNonExistingClass($className); @@ -149,9 +145,9 @@ final class Instantiator implements InstantiatorInterface * * @return void */ - private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionClass, $serializedString) + private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionClass, $serializedString) : void { - set_error_handler(function ($code, $message, $file, $line) use ($reflectionClass, & $error) { + set_error_handler(function ($code, $message, $file, $line) use ($reflectionClass, & $error) : void { $error = UnexpectedValueException::fromUncleanUnSerialization( $reflectionClass, $message, @@ -178,7 +174,7 @@ final class Instantiator implements InstantiatorInterface * * @return void */ - private function attemptInstantiationViaUnSerialization(ReflectionClass $reflectionClass, $serializedString) + private function attemptInstantiationViaUnSerialization(ReflectionClass $reflectionClass, $serializedString) : void { try { unserialize($serializedString); @@ -189,28 +185,15 @@ final class Instantiator implements InstantiatorInterface } } - /** - * @param ReflectionClass $reflectionClass - * - * @return bool - */ - private function isInstantiableViaReflection(ReflectionClass $reflectionClass) + private function isInstantiableViaReflection(ReflectionClass $reflectionClass) : bool { - if (\PHP_VERSION_ID >= 50600) { - return ! ($this->hasInternalAncestors($reflectionClass) && $reflectionClass->isFinal()); - } - - return \PHP_VERSION_ID >= 50400 && ! $this->hasInternalAncestors($reflectionClass); + return ! ($this->hasInternalAncestors($reflectionClass) && $reflectionClass->isFinal()); } /** * Verifies whether the given class is to be considered internal - * - * @param ReflectionClass $reflectionClass - * - * @return bool */ - private function hasInternalAncestors(ReflectionClass $reflectionClass) + private function hasInternalAncestors(ReflectionClass $reflectionClass) : bool { do { if ($reflectionClass->isInternal()) { @@ -221,53 +204,13 @@ final class Instantiator implements InstantiatorInterface return false; } - /** - * Verifies if the given PHP version implements the `Serializable` interface serialization - * with an incompatible serialization format. If that's the case, use serialization marker - * "C" instead of "O". - * - * @link http://news.php.net/php.internals/74654 - * - * @param ReflectionClass $reflectionClass - * - * @return string the serialization format marker, either self::SERIALIZATION_FORMAT_USE_UNSERIALIZER - * or self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER - */ - private function getSerializationFormat(ReflectionClass $reflectionClass) - { - if ($this->isPhpVersionWithBrokenSerializationFormat() - && $reflectionClass->implementsInterface('Serializable') - ) { - return self::SERIALIZATION_FORMAT_USE_UNSERIALIZER; - } - - return self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER; - } - - /** - * Checks whether the current PHP runtime uses an incompatible serialization format - * - * @return bool - */ - private function isPhpVersionWithBrokenSerializationFormat() - { - return PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513; - } - /** * Checks if a class is cloneable * - * @param ReflectionClass $reflection - * - * @return bool + * Classes implementing `__clone` cannot be safely cloned, as that may cause side-effects. */ - private function isSafeToClone(ReflectionClass $reflection) + private function isSafeToClone(ReflectionClass $reflection) : bool { - if (method_exists($reflection, 'isCloneable') && ! $reflection->isCloneable()) { - return false; - } - - // not cloneable if it implements `__clone`, as we want to avoid calling it - return ! $reflection->hasMethod('__clone'); + return $reflection->isCloneable() && ! $reflection->hasMethod('__clone'); } } diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorPerformance/InstantiatorPerformanceEvent.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorPerformance/InstantiatorPerformanceEvent.php deleted file mode 100644 index 3e8fc6ff..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorPerformance/InstantiatorPerformanceEvent.php +++ /dev/null @@ -1,96 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorPerformance; - -use Athletic\AthleticEvent; -use Doctrine\Instantiator\Instantiator; - -/** - * Performance tests for {@see \Doctrine\Instantiator\Instantiator} - * - * @author Marco Pivetta - */ -class InstantiatorPerformanceEvent extends AthleticEvent -{ - /** - * @var \Doctrine\Instantiator\Instantiator - */ - private $instantiator; - - /** - * {@inheritDoc} - */ - protected function setUp() - { - $this->instantiator = new Instantiator(); - - $this->instantiator->instantiate(__CLASS__); - $this->instantiator->instantiate('ArrayObject'); - $this->instantiator->instantiate('DoctrineTest\\InstantiatorTestAsset\\SimpleSerializableAsset'); - $this->instantiator->instantiate('DoctrineTest\\InstantiatorTestAsset\\SerializableArrayObjectAsset'); - $this->instantiator->instantiate('DoctrineTest\\InstantiatorTestAsset\\UnCloneableAsset'); - } - - /** - * @iterations 20000 - * @baseline - * @group instantiation - */ - public function testInstantiateSelf() - { - $this->instantiator->instantiate(__CLASS__); - } - - /** - * @iterations 20000 - * @group instantiation - */ - public function testInstantiateInternalClass() - { - $this->instantiator->instantiate('ArrayObject'); - } - - /** - * @iterations 20000 - * @group instantiation - */ - public function testInstantiateSimpleSerializableAssetClass() - { - $this->instantiator->instantiate('DoctrineTest\\InstantiatorTestAsset\\SimpleSerializableAsset'); - } - - /** - * @iterations 20000 - * @group instantiation - */ - public function testInstantiateSerializableArrayObjectAsset() - { - $this->instantiator->instantiate('DoctrineTest\\InstantiatorTestAsset\\SerializableArrayObjectAsset'); - } - - /** - * @iterations 20000 - * @group instantiation - */ - public function testInstantiateUnCloneableAsset() - { - $this->instantiator->instantiate('DoctrineTest\\InstantiatorTestAsset\\UnCloneableAsset'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/InvalidArgumentExceptionTest.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/InvalidArgumentExceptionTest.php deleted file mode 100644 index 39d9b94d..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/InvalidArgumentExceptionTest.php +++ /dev/null @@ -1,83 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTest\Exception; - -use Doctrine\Instantiator\Exception\InvalidArgumentException; -use PHPUnit_Framework_TestCase; -use ReflectionClass; - -/** - * Tests for {@see \Doctrine\Instantiator\Exception\InvalidArgumentException} - * - * @author Marco Pivetta - * - * @covers \Doctrine\Instantiator\Exception\InvalidArgumentException - */ -class InvalidArgumentExceptionTest extends PHPUnit_Framework_TestCase -{ - public function testFromNonExistingTypeWithNonExistingClass() - { - $className = __CLASS__ . uniqid(); - $exception = InvalidArgumentException::fromNonExistingClass($className); - - $this->assertInstanceOf('Doctrine\\Instantiator\\Exception\\InvalidArgumentException', $exception); - $this->assertSame('The provided class "' . $className . '" does not exist', $exception->getMessage()); - } - - public function testFromNonExistingTypeWithTrait() - { - if (PHP_VERSION_ID < 50400) { - $this->markTestSkipped('Need at least PHP 5.4.0, as this test requires traits support to run'); - } - - $exception = InvalidArgumentException::fromNonExistingClass( - 'DoctrineTest\\InstantiatorTestAsset\\SimpleTraitAsset' - ); - - $this->assertSame( - 'The provided type "DoctrineTest\\InstantiatorTestAsset\\SimpleTraitAsset" is a trait, ' - . 'and can not be instantiated', - $exception->getMessage() - ); - } - - public function testFromNonExistingTypeWithInterface() - { - $exception = InvalidArgumentException::fromNonExistingClass('Doctrine\\Instantiator\\InstantiatorInterface'); - - $this->assertSame( - 'The provided type "Doctrine\\Instantiator\\InstantiatorInterface" is an interface, ' - . 'and can not be instantiated', - $exception->getMessage() - ); - } - - public function testFromAbstractClass() - { - $reflection = new ReflectionClass('DoctrineTest\\InstantiatorTestAsset\\AbstractClassAsset'); - $exception = InvalidArgumentException::fromAbstractClass($reflection); - - $this->assertSame( - 'The provided class "DoctrineTest\\InstantiatorTestAsset\\AbstractClassAsset" is abstract, ' - . 'and can not be instantiated', - $exception->getMessage() - ); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/UnexpectedValueExceptionTest.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/UnexpectedValueExceptionTest.php deleted file mode 100644 index 84154e73..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/UnexpectedValueExceptionTest.php +++ /dev/null @@ -1,69 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTest\Exception; - -use Doctrine\Instantiator\Exception\UnexpectedValueException; -use Exception; -use PHPUnit_Framework_TestCase; -use ReflectionClass; - -/** - * Tests for {@see \Doctrine\Instantiator\Exception\UnexpectedValueException} - * - * @author Marco Pivetta - * - * @covers \Doctrine\Instantiator\Exception\UnexpectedValueException - */ -class UnexpectedValueExceptionTest extends PHPUnit_Framework_TestCase -{ - public function testFromSerializationTriggeredException() - { - $reflectionClass = new ReflectionClass($this); - $previous = new Exception(); - $exception = UnexpectedValueException::fromSerializationTriggeredException($reflectionClass, $previous); - - $this->assertInstanceOf('Doctrine\\Instantiator\\Exception\\UnexpectedValueException', $exception); - $this->assertSame($previous, $exception->getPrevious()); - $this->assertSame( - 'An exception was raised while trying to instantiate an instance of "' - . __CLASS__ . '" via un-serialization', - $exception->getMessage() - ); - } - - public function testFromUncleanUnSerialization() - { - $reflection = new ReflectionClass('DoctrineTest\\InstantiatorTestAsset\\AbstractClassAsset'); - $exception = UnexpectedValueException::fromUncleanUnSerialization($reflection, 'foo', 123, 'bar', 456); - - $this->assertInstanceOf('Doctrine\\Instantiator\\Exception\\UnexpectedValueException', $exception); - $this->assertSame( - 'Could not produce an instance of "DoctrineTest\\InstantiatorTestAsset\\AbstractClassAsset" ' - . 'via un-serialization, since an error was triggered in file "bar" at line "456"', - $exception->getMessage() - ); - - $previous = $exception->getPrevious(); - - $this->assertInstanceOf('Exception', $previous); - $this->assertSame('foo', $previous->getMessage()); - $this->assertSame(123, $previous->getCode()); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php deleted file mode 100644 index 0a2cb931..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php +++ /dev/null @@ -1,219 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTest; - -use Doctrine\Instantiator\Exception\UnexpectedValueException; -use Doctrine\Instantiator\Instantiator; -use PHPUnit_Framework_TestCase; -use ReflectionClass; - -/** - * Tests for {@see \Doctrine\Instantiator\Instantiator} - * - * @author Marco Pivetta - * - * @covers \Doctrine\Instantiator\Instantiator - */ -class InstantiatorTest extends PHPUnit_Framework_TestCase -{ - /** - * @var Instantiator - */ - private $instantiator; - - /** - * {@inheritDoc} - */ - protected function setUp() - { - $this->instantiator = new Instantiator(); - } - - /** - * @param string $className - * - * @dataProvider getInstantiableClasses - */ - public function testCanInstantiate($className) - { - $this->assertInstanceOf($className, $this->instantiator->instantiate($className)); - } - - /** - * @param string $className - * - * @dataProvider getInstantiableClasses - */ - public function testInstantiatesSeparateInstances($className) - { - $instance1 = $this->instantiator->instantiate($className); - $instance2 = $this->instantiator->instantiate($className); - - $this->assertEquals($instance1, $instance2); - $this->assertNotSame($instance1, $instance2); - } - - public function testExceptionOnUnSerializationException() - { - if (defined('HHVM_VERSION')) { - $this->markTestSkipped( - 'As of facebook/hhvm#3432, HHVM has no PDORow, and therefore ' - . ' no internal final classes that cannot be instantiated' - ); - } - - $className = 'DoctrineTest\\InstantiatorTestAsset\\UnserializeExceptionArrayObjectAsset'; - - if (\PHP_VERSION_ID >= 50600) { - $className = 'PDORow'; - } - - if (\PHP_VERSION_ID === 50429 || \PHP_VERSION_ID === 50513) { - $className = 'DoctrineTest\\InstantiatorTestAsset\\SerializableArrayObjectAsset'; - } - - $this->setExpectedException('Doctrine\\Instantiator\\Exception\\UnexpectedValueException'); - - $this->instantiator->instantiate($className); - } - - public function testNoticeOnUnSerializationException() - { - if (\PHP_VERSION_ID >= 50600) { - $this->markTestSkipped( - 'PHP 5.6 supports `ReflectionClass#newInstanceWithoutConstructor()` for some internal classes' - ); - } - - try { - $this->instantiator->instantiate('DoctrineTest\\InstantiatorTestAsset\\WakeUpNoticesAsset'); - - $this->fail('No exception was raised'); - } catch (UnexpectedValueException $exception) { - $wakeUpNoticesReflection = new ReflectionClass('DoctrineTest\\InstantiatorTestAsset\\WakeUpNoticesAsset'); - $previous = $exception->getPrevious(); - - $this->assertInstanceOf('Exception', $previous); - - // in PHP 5.4.29 and PHP 5.5.13, this case is not a notice, but an exception being thrown - if (! (\PHP_VERSION_ID === 50429 || \PHP_VERSION_ID === 50513)) { - $this->assertSame( - 'Could not produce an instance of "DoctrineTest\\InstantiatorTestAsset\WakeUpNoticesAsset" ' - . 'via un-serialization, since an error was triggered in file "' - . $wakeUpNoticesReflection->getFileName() . '" at line "36"', - $exception->getMessage() - ); - - $this->assertSame('Something went bananas while un-serializing this instance', $previous->getMessage()); - $this->assertSame(\E_USER_NOTICE, $previous->getCode()); - } - } - } - - /** - * @param string $invalidClassName - * - * @dataProvider getInvalidClassNames - */ - public function testInstantiationFromNonExistingClass($invalidClassName) - { - $this->setExpectedException('Doctrine\\Instantiator\\Exception\\InvalidArgumentException'); - - $this->instantiator->instantiate($invalidClassName); - } - - public function testInstancesAreNotCloned() - { - $className = 'TemporaryClass' . uniqid(); - - eval('namespace ' . __NAMESPACE__ . '; class ' . $className . '{}'); - - $instance = $this->instantiator->instantiate(__NAMESPACE__ . '\\' . $className); - - $instance->foo = 'bar'; - - $instance2 = $this->instantiator->instantiate(__NAMESPACE__ . '\\' . $className); - - $this->assertObjectNotHasAttribute('foo', $instance2); - } - - /** - * Provides a list of instantiable classes (existing) - * - * @return string[][] - */ - public function getInstantiableClasses() - { - $classes = array( - array('stdClass'), - array(__CLASS__), - array('Doctrine\\Instantiator\\Instantiator'), - array('Exception'), - array('PharException'), - array('DoctrineTest\\InstantiatorTestAsset\\SimpleSerializableAsset'), - array('DoctrineTest\\InstantiatorTestAsset\\ExceptionAsset'), - array('DoctrineTest\\InstantiatorTestAsset\\FinalExceptionAsset'), - array('DoctrineTest\\InstantiatorTestAsset\\PharExceptionAsset'), - array('DoctrineTest\\InstantiatorTestAsset\\UnCloneableAsset'), - array('DoctrineTest\\InstantiatorTestAsset\\XMLReaderAsset'), - ); - - if (\PHP_VERSION_ID === 50429 || \PHP_VERSION_ID === 50513) { - return $classes; - } - - $classes = array_merge( - $classes, - array( - array('PharException'), - array('ArrayObject'), - array('DoctrineTest\\InstantiatorTestAsset\\ArrayObjectAsset'), - array('DoctrineTest\\InstantiatorTestAsset\\SerializableArrayObjectAsset'), - ) - ); - - if (\PHP_VERSION_ID >= 50600) { - $classes[] = array('DoctrineTest\\InstantiatorTestAsset\\WakeUpNoticesAsset'); - $classes[] = array('DoctrineTest\\InstantiatorTestAsset\\UnserializeExceptionArrayObjectAsset'); - } - - return $classes; - } - - /** - * Provides a list of instantiable classes (existing) - * - * @return string[][] - */ - public function getInvalidClassNames() - { - $classNames = array( - array(__CLASS__ . uniqid()), - array('Doctrine\\Instantiator\\InstantiatorInterface'), - array('DoctrineTest\\InstantiatorTestAsset\\AbstractClassAsset'), - ); - - if (\PHP_VERSION_ID >= 50400) { - $classNames[] = array('DoctrineTest\\InstantiatorTestAsset\\SimpleTraitAsset'); - } - - return $classNames; - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/AbstractClassAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/AbstractClassAsset.php deleted file mode 100644 index fbe28ddd..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/AbstractClassAsset.php +++ /dev/null @@ -1,29 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -/** - * A simple asset for an abstract class - * - * @author Marco Pivetta - */ -abstract class AbstractClassAsset -{ -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ArrayObjectAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ArrayObjectAsset.php deleted file mode 100644 index 56146d70..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ArrayObjectAsset.php +++ /dev/null @@ -1,41 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use ArrayObject; -use BadMethodCallException; - -/** - * Test asset that extends an internal PHP class - * - * @author Marco Pivetta - */ -class ArrayObjectAsset extends ArrayObject -{ - /** - * Constructor - should not be called - * - * @throws BadMethodCallException - */ - public function __construct() - { - throw new BadMethodCallException('Not supposed to be called!'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ExceptionAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ExceptionAsset.php deleted file mode 100644 index 43bbe46b..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ExceptionAsset.php +++ /dev/null @@ -1,41 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use BadMethodCallException; -use Exception; - -/** - * Test asset that extends an internal PHP base exception - * - * @author Marco Pivetta - */ -class ExceptionAsset extends Exception -{ - /** - * Constructor - should not be called - * - * @throws BadMethodCallException - */ - public function __construct() - { - throw new BadMethodCallException('Not supposed to be called!'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/FinalExceptionAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/FinalExceptionAsset.php deleted file mode 100644 index 7d268f5b..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/FinalExceptionAsset.php +++ /dev/null @@ -1,41 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use BadMethodCallException; -use Exception; - -/** - * Test asset that extends an internal PHP base exception - * - * @author Marco Pivetta - */ -final class FinalExceptionAsset extends Exception -{ - /** - * Constructor - should not be called - * - * @throws BadMethodCallException - */ - public function __construct() - { - throw new BadMethodCallException('Not supposed to be called!'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharAsset.php deleted file mode 100644 index 553fd561..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharAsset.php +++ /dev/null @@ -1,41 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use BadMethodCallException; -use Phar; - -/** - * Test asset that extends an internal PHP class - * - * @author Marco Pivetta - */ -class PharAsset extends Phar -{ - /** - * Constructor - should not be called - * - * @throws BadMethodCallException - */ - public function __construct() - { - throw new BadMethodCallException('Not supposed to be called!'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharExceptionAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharExceptionAsset.php deleted file mode 100644 index 42bf73e7..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharExceptionAsset.php +++ /dev/null @@ -1,44 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use BadMethodCallException; -use PharException; - -/** - * Test asset that extends an internal PHP class - * This class should be serializable without problems - * and without getting the "Erroneous data format for unserializing" - * error - * - * @author Marco Pivetta - */ -class PharExceptionAsset extends PharException -{ - /** - * Constructor - should not be called - * - * @throws BadMethodCallException - */ - public function __construct() - { - throw new BadMethodCallException('Not supposed to be called!'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SerializableArrayObjectAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SerializableArrayObjectAsset.php deleted file mode 100644 index ba19aaf6..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SerializableArrayObjectAsset.php +++ /dev/null @@ -1,62 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use ArrayObject; -use BadMethodCallException; -use Serializable; - -/** - * Serializable test asset that also extends an internal class - * - * @author Marco Pivetta - */ -class SerializableArrayObjectAsset extends ArrayObject implements Serializable -{ - /** - * Constructor - should not be called - * - * @throws BadMethodCallException - */ - public function __construct() - { - throw new BadMethodCallException('Not supposed to be called!'); - } - - /** - * {@inheritDoc} - */ - public function serialize() - { - return ''; - } - - /** - * {@inheritDoc} - * - * Should not be called - * - * @throws BadMethodCallException - */ - public function unserialize($serialized) - { - throw new BadMethodCallException('Not supposed to be called!'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleSerializableAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleSerializableAsset.php deleted file mode 100644 index 39f84a6c..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleSerializableAsset.php +++ /dev/null @@ -1,61 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use BadMethodCallException; -use Serializable; - -/** - * Base serializable test asset - * - * @author Marco Pivetta - */ -class SimpleSerializableAsset implements Serializable -{ - /** - * Constructor - should not be called - * - * @throws BadMethodCallException - */ - public function __construct() - { - throw new BadMethodCallException('Not supposed to be called!'); - } - - /** - * {@inheritDoc} - */ - public function serialize() - { - return ''; - } - - /** - * {@inheritDoc} - * - * Should not be called - * - * @throws BadMethodCallException - */ - public function unserialize($serialized) - { - throw new BadMethodCallException('Not supposed to be called!'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleTraitAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleTraitAsset.php deleted file mode 100644 index 04e78069..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleTraitAsset.php +++ /dev/null @@ -1,29 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -/** - * A simple trait with no attached logic - * - * @author Marco Pivetta - */ -trait SimpleTraitAsset -{ -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnCloneableAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnCloneableAsset.php deleted file mode 100644 index 7d03bdab..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnCloneableAsset.php +++ /dev/null @@ -1,50 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use BadMethodCallException; - -/** - * Base un-cloneable asset - * - * @author Marco Pivetta - */ -class UnCloneableAsset -{ - /** - * Constructor - should not be called - * - * @throws BadMethodCallException - */ - public function __construct() - { - throw new BadMethodCallException('Not supposed to be called!'); - } - - /** - * Magic `__clone` - should not be invoked - * - * @throws BadMethodCallException - */ - public function __clone() - { - throw new BadMethodCallException('Not supposed to be called!'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnserializeExceptionArrayObjectAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnserializeExceptionArrayObjectAsset.php deleted file mode 100644 index b348a405..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnserializeExceptionArrayObjectAsset.php +++ /dev/null @@ -1,39 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use ArrayObject; -use BadMethodCallException; - -/** - * A simple asset for an abstract class - * - * @author Marco Pivetta - */ -class UnserializeExceptionArrayObjectAsset extends ArrayObject -{ - /** - * {@inheritDoc} - */ - public function __wakeup() - { - throw new BadMethodCallException(); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/WakeUpNoticesAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/WakeUpNoticesAsset.php deleted file mode 100644 index 18dc6711..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/WakeUpNoticesAsset.php +++ /dev/null @@ -1,38 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use ArrayObject; - -/** - * A simple asset for an abstract class - * - * @author Marco Pivetta - */ -class WakeUpNoticesAsset extends ArrayObject -{ - /** - * Wakeup method called after un-serialization - */ - public function __wakeup() - { - trigger_error('Something went bananas while un-serializing this instance'); - } -} diff --git a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/XMLReaderAsset.php b/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/XMLReaderAsset.php deleted file mode 100644 index 39ee6992..00000000 --- a/vendor/doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/XMLReaderAsset.php +++ /dev/null @@ -1,41 +0,0 @@ -. - */ - -namespace DoctrineTest\InstantiatorTestAsset; - -use BadMethodCallException; -use XMLReader; - -/** - * Test asset that extends an internal PHP class - * - * @author Dave Marshall - */ -class XMLReaderAsset extends XMLReader -{ - /** - * Constructor - should not be called - * - * @throws BadMethodCallException - */ - public function __construct() - { - throw new BadMethodCallException('Not supposed to be called!'); - } -} diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php b/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php index ecca1dd9..a03a5874 100644 --- a/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php +++ b/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php @@ -44,7 +44,7 @@ class DNSCheckValidation implements EmailValidation protected function checkDNS($host) { - $host = rtrim($host, '.') . '.'; + $host = rtrim(idn_to_ascii($host, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46), '.') . '.'; $Aresult = true; $MXresult = checkdnsrr($host, 'MX'); diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php b/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php index dd270556..fe712f08 100644 --- a/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php +++ b/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php @@ -13,7 +13,7 @@ class SpoofCheckValidation implements EmailValidation * @var InvalidEmail */ private $error; - + public function __construct() { if (!class_exists(Spoofchecker::class)) { diff --git a/vendor/egulias/email-validator/README.md b/vendor/egulias/email-validator/README.md index fc7c89ea..67bb69ab 100644 --- a/vendor/egulias/email-validator/README.md +++ b/vendor/egulias/email-validator/README.md @@ -6,7 +6,7 @@ With the help of [PHPStorm](https://www.jetbrains.com/phpstorm/) ## Requirements ## * [Composer](https://getcomposer.org) is required for installation - * [Spoofchecking](https://github.com/egulias/EmailValidator/blob/master/EmailValidator/Validation/SpoofCheckValidation.php) validation requires that your PHP system have the [PHP Internationalization Libraries](http://php.net/manual/en/book.intl.php) (also known as PHP Intl) + * [Spoofchecking](https://github.com/egulias/EmailValidator/blob/master/EmailValidator/Validation/SpoofCheckValidation.php) validation requires that your PHP system have the [PHP Internationalization Libraries](https://php.net/manual/en/book.intl.php) (also known as PHP Intl) ## Installation ## @@ -62,7 +62,7 @@ $validator->isValid("example@example.com", $multipleValidations); //true ### How to extend ### -It's easy! You just need to extend [EmailValidation](https://github.com/egulias/EmailValidator/blob/master/EmailValidator/Validation/EmailValidation.php) and you can use your own validation. +It's easy! You just need to implement [EmailValidation](https://github.com/egulias/EmailValidator/blob/master/EmailValidator/Validation/EmailValidation.php) and you can use your own validation. ## Other Contributors ## @@ -70,9 +70,9 @@ It's easy! You just need to extend [EmailValidation](https://github.com/egulias/ As this is a port from another library and work, here are other people related to the previous one: -* Ricard Clau [@ricardclau](http://github.com/ricardclau): Performance against PHP built-in filter_var -* Josepf Bielawski [@stloyd](http://github.com/stloyd): For its first re-work of Dominic's lib -* Dominic Sayers [@dominicsayers](http://github.com/dominicsayers): The original isemail function +* Ricard Clau [@ricardclau](https://github.com/ricardclau): Performance against PHP built-in filter_var +* Josepf Bielawski [@stloyd](https://github.com/stloyd): For its first re-work of Dominic's lib +* Dominic Sayers [@dominicsayers](https://github.com/dominicsayers): The original isemail function ## License ## Released under the MIT License attached with this code. diff --git a/vendor/egulias/email-validator/composer.json b/vendor/egulias/email-validator/composer.json index d09d785d..7cc836f0 100644 --- a/vendor/egulias/email-validator/composer.json +++ b/vendor/egulias/email-validator/composer.json @@ -25,7 +25,7 @@ }, "require-dev" : { "satooshi/php-coveralls": "^1.0.1", - "phpunit/phpunit": "^4.8.35", + "phpunit/phpunit": "^4.8.35||^5.7||^6.0", "dominicsayers/isemail": "dev-master" }, "suggest": { diff --git a/vendor/egulias/email-validator/composer.lock b/vendor/egulias/email-validator/composer.lock deleted file mode 100644 index 93f5f69b..00000000 --- a/vendor/egulias/email-validator/composer.lock +++ /dev/null @@ -1,1813 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "content-hash": "d260b2d1d79771429aea640320702483", - "packages": [ - { - "name": "doctrine/lexer", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "lexer", - "parser" - ], - "time": "2014-09-09T13:34:57+00:00" - } - ], - "packages-dev": [ - { - "name": "doctrine/instantiator", - "version": "1.0.5", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", - "shasum": "" - }, - "require": { - "php": ">=5.3,<8.0-DEV" - }, - "require-dev": { - "athletic/athletic": "~0.1.8", - "ext-pdo": "*", - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", - "keywords": [ - "constructor", - "instantiate" - ], - "time": "2015-06-14T21:17:01+00:00" - }, - { - "name": "dominicsayers/isemail", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/dominicsayers/isemail", - "reference": "64286085b40c39e6f39b1d23276d90635e5b3099" - }, - "type": "library", - "autoload": { - "files": [ - "is_email.php" - ] - }, - "license": [ - "BSD" - ], - "authors": [ - { - "name": "Dominic Sayers", - "email": "dominic@sayers.cc" - } - ], - "description": "Checks an email address against the following RFCs: 3696, 1123, 4291, 5321, 5322", - "homepage": "http://isemail.info", - "keywords": [ - "email", - "validation" - ], - "support": { - "source": "https://github.com/dominicsayers/isemail", - "issues": "https://github.com/dominicsayers/isemail/issues" - }, - "time": "2014-11-26T12:46:56+00:00" - }, - { - "name": "guzzle/guzzle", - "version": "v3.9.3", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" - }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-error-response": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" - }, - "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", - "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.9-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle": "src/", - "Guzzle\\Tests": "tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" - } - ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "abandoned": "guzzlehttp/guzzle", - "time": "2015-03-18T18:23:50+00:00" - }, - { - "name": "guzzlehttp/guzzle", - "version": "6.2.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "d094e337976dff9d8e2424e8485872194e768662" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662", - "reference": "d094e337976dff9d8e2424e8485872194e768662", - "shasum": "" - }, - "require": { - "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.5.0" - }, - "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "~4.0", - "psr/log": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.2-dev" - } - }, - "autoload": { - "files": [ - "src/functions_include.php" - ], - "psr-4": { - "GuzzleHttp\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "time": "2016-03-21T20:02:09+00:00" - }, - { - "name": "guzzlehttp/promises", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8", - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8", - "shasum": "" - }, - "require": { - "php": ">=5.5.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle promises library", - "keywords": [ - "promise" - ], - "time": "2016-03-08T01:15:46+00:00" - }, - { - "name": "guzzlehttp/psr7", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "31382fef2889136415751badebbd1cb022a4ed72" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72", - "reference": "31382fef2889136415751badebbd1cb022a4ed72", - "shasum": "" - }, - "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "PSR-7 message implementation", - "keywords": [ - "http", - "message", - "stream", - "uri" - ], - "time": "2016-04-13T19:56:01+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", - "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "dflydev/markdown": "~1.0", - "erusev/parsedown": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "phpDocumentor": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "mike.vanriel@naenius.com" - } - ], - "time": "2015-02-03T12:10:50+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.6.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972", - "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "~2.0", - "sebastian/comparator": "~1.1", - "sebastian/recursion-context": "~1.0" - }, - "require-dev": { - "phpspec/phpspec": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5.x-dev" - } - }, - "autoload": { - "psr-0": { - "Prophecy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "time": "2016-02-15T07:46:21+00:00" - }, - { - "name": "phpunit/php-code-coverage", - "version": "2.2.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "~1.3", - "sebastian/environment": "^1.3.2", - "sebastian/version": "~1.0" - }, - "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~4" - }, - "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.2.1", - "ext-xmlwriter": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ], - "time": "2015-10-06T15:47:00+00:00" - }, - { - "name": "phpunit/php-file-iterator", - "version": "1.4.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", - "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ], - "time": "2015-06-21T13:08:43+00:00" - }, - { - "name": "phpunit/php-text-template", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "time": "2015-06-21T13:50:34+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "1.0.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4|~5" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "time": "2016-05-12T18:03:57+00:00" - }, - { - "name": "phpunit/php-token-stream", - "version": "1.4.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ], - "time": "2015-09-15T10:49:45+00:00" - }, - { - "name": "phpunit/phpunit", - "version": "4.8.36", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpspec/prophecy": "^1.3.1", - "phpunit/php-code-coverage": "~2.1", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.2.2", - "sebastian/diff": "~1.2", - "sebastian/environment": "~1.3", - "sebastian/exporter": "~1.2", - "sebastian/global-state": "~1.0", - "sebastian/version": "~1.0", - "symfony/yaml": "~2.1|~3.0" - }, - "suggest": { - "phpunit/php-invoker": "~1.1" - }, - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.8.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "time": "2017-06-21T08:07:12+00:00" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "2.3.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": ">=5.3.3", - "phpunit/php-text-template": "~1.2", - "sebastian/exporter": "~1.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "time": "2015-10-02T06:51:40+00:00" - }, - { - "name": "psr/http-message", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP messages", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "time": "2015-05-04T20:22:00+00:00" - }, - { - "name": "psr/log", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", - "shasum": "" - }, - "type": "library", - "autoload": { - "psr-0": { - "Psr\\Log\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "time": "2012-12-21T11:40:51+00:00" - }, - { - "name": "satooshi/php-coveralls", - "version": "v1.0.2", - "source": { - "type": "git", - "url": "https://github.com/php-coveralls/php-coveralls.git", - "reference": "9c07b63acbc9709344948b6fd4f63a32b2ef4127" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/9c07b63acbc9709344948b6fd4f63a32b2ef4127", - "reference": "9c07b63acbc9709344948b6fd4f63a32b2ef4127", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-simplexml": "*", - "guzzle/guzzle": "^2.8 || ^3.0", - "php": "^5.3.3 || ^7.0", - "psr/log": "^1.0", - "symfony/config": "^2.1 || ^3.0 || ^4.0", - "symfony/console": "^2.1 || ^3.0 || ^4.0", - "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0", - "symfony/yaml": "^2.0 || ^3.0 || ^4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0" - }, - "suggest": { - "symfony/http-kernel": "Allows Symfony integration" - }, - "bin": [ - "bin/coveralls" - ], - "type": "library", - "autoload": { - "psr-4": { - "Satooshi\\": "src/Satooshi/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kitamura Satoshi", - "email": "with.no.parachute@gmail.com", - "homepage": "https://www.facebook.com/satooshi.jp" - } - ], - "description": "PHP client library for Coveralls API", - "homepage": "https://github.com/php-coveralls/php-coveralls", - "keywords": [ - "ci", - "coverage", - "github", - "test" - ], - "time": "2017-10-14T23:15:34+00:00" - }, - { - "name": "sebastian/comparator", - "version": "1.2.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2 || ~2.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ], - "time": "2017-01-29T09:50:25+00:00" - }, - { - "name": "sebastian/diff", - "version": "1.4.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff" - ], - "time": "2015-12-08T07:14:41+00:00" - }, - { - "name": "sebastian/environment", - "version": "1.3.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "2292b116f43c272ff4328083096114f84ea46a56" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/2292b116f43c272ff4328083096114f84ea46a56", - "reference": "2292b116f43c272ff4328083096114f84ea46a56", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" - ], - "time": "2016-05-04T07:59:13+00:00" - }, - { - "name": "sebastian/exporter", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~1.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ], - "time": "2015-06-21T07:55:53+00:00" - }, - { - "name": "sebastian/global-state", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.2" - }, - "suggest": { - "ext-uopz": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], - "time": "2015-10-12T03:26:01+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "913401df809e99e4f47b27cdd781f4a258d58791" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", - "reference": "913401df809e99e4f47b27cdd781f4a258d58791", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-11-11T19:50:13+00:00" - }, - { - "name": "sebastian/version", - "version": "1.0.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", - "shasum": "" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21T13:59:46+00:00" - }, - { - "name": "symfony/config", - "version": "v3.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/config.git", - "reference": "24f155da1ff180df8e15e34a8f6e2f8a0eadefa8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/24f155da1ff180df8e15e34a8f6e2f8a0eadefa8", - "reference": "24f155da1ff180df8e15e34a8f6e2f8a0eadefa8", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "symfony/filesystem": "~2.8|~3.0" - }, - "suggest": { - "symfony/yaml": "To use the yaml reference dumper" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Config\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Config Component", - "homepage": "https://symfony.com", - "time": "2016-04-20T18:53:54+00:00" - }, - { - "name": "symfony/console", - "version": "v3.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "34a214710e0714b6efcf40ba3cd1e31373a97820" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/34a214710e0714b6efcf40ba3cd1e31373a97820", - "reference": "34a214710e0714b6efcf40ba3cd1e31373a97820", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "symfony/polyfill-mbstring": "~1.0" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/process": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Console Component", - "homepage": "https://symfony.com", - "time": "2016-04-28T09:48:42+00:00" - }, - { - "name": "symfony/event-dispatcher", - "version": "v2.8.30", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "b59aacf238fadda50d612c9de73b74751872a903" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b59aacf238fadda50d612c9de73b74751872a903", - "reference": "b59aacf238fadda50d612c9de73b74751872a903", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony EventDispatcher Component", - "homepage": "https://symfony.com", - "time": "2017-11-05T15:25:56+00:00" - }, - { - "name": "symfony/filesystem", - "version": "v3.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "74fec3511b62cb934b64bce1d96f06fffa4beafd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/74fec3511b62cb934b64bce1d96f06fffa4beafd", - "reference": "74fec3511b62cb934b64bce1d96f06fffa4beafd", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Filesystem Component", - "homepage": "https://symfony.com", - "time": "2016-04-12T18:09:53+00:00" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.1.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "1289d16209491b584839022f29257ad859b8532d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", - "reference": "1289d16209491b584839022f29257ad859b8532d", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "time": "2016-01-20T09:13:37+00:00" - }, - { - "name": "symfony/stopwatch", - "version": "v3.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "6015187088421e9499d8f8316bdb396f8b806c06" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6015187088421e9499d8f8316bdb396f8b806c06", - "reference": "6015187088421e9499d8f8316bdb396f8b806c06", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Stopwatch Component", - "homepage": "https://symfony.com", - "time": "2016-03-04T07:55:57+00:00" - }, - { - "name": "symfony/yaml", - "version": "v3.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "0047c8366744a16de7516622c5b7355336afae96" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/0047c8366744a16de7516622c5b7355336afae96", - "reference": "0047c8366744a16de7516622c5b7355336afae96", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2016-03-04T07:55:57+00:00" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": { - "dominicsayers/isemail": 20 - }, - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": ">= 5.5" - }, - "platform-dev": [] -} diff --git a/vendor/erusev/parsedown/LICENSE.txt b/vendor/erusev/parsedown/LICENSE.txt index baca86f5..8e7c764d 100644 --- a/vendor/erusev/parsedown/LICENSE.txt +++ b/vendor/erusev/parsedown/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013 Emanuil Rusev, erusev.com +Copyright (c) 2013-2018 Emanuil Rusev, erusev.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/erusev/parsedown/Parsedown.php b/vendor/erusev/parsedown/Parsedown.php index f5dd0fa1..87d612ab 100644 --- a/vendor/erusev/parsedown/Parsedown.php +++ b/vendor/erusev/parsedown/Parsedown.php @@ -17,7 +17,7 @@ class Parsedown { # ~ - const version = '1.6.0'; + const version = '1.7.1'; # ~ @@ -75,6 +75,32 @@ class Parsedown protected $urlsLinked = true; + function setSafeMode($safeMode) + { + $this->safeMode = (bool) $safeMode; + + return $this; + } + + protected $safeMode; + + protected $safeLinksWhitelist = array( + 'http://', + 'https://', + 'ftp://', + 'ftps://', + 'mailto:', + 'data:image/png;base64,', + 'data:image/gif;base64,', + 'data:image/jpeg;base64,', + 'irc:', + 'ircs:', + 'git:', + 'ssh:', + 'news:', + 'steam:', + ); + # # Lines # @@ -342,8 +368,6 @@ class Parsedown { $text = $Block['element']['text']['text']; - $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8'); - $Block['element']['text']['text'] = $text; return $Block; @@ -354,7 +378,7 @@ class Parsedown protected function blockComment($Line) { - if ($this->markupEscaped) + if ($this->markupEscaped or $this->safeMode) { return; } @@ -396,7 +420,7 @@ class Parsedown protected function blockFencedCode($Line) { - if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches)) + if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([^`]+)?[ ]*$/', $Line['text'], $matches)) { $Element = array( 'name' => 'code', @@ -457,8 +481,6 @@ class Parsedown { $text = $Block['element']['text']['text']; - $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8'); - $Block['element']['text']['text'] = $text; return $Block; @@ -515,10 +537,10 @@ class Parsedown ), ); - if($name === 'ol') + if($name === 'ol') { $listStart = stristr($matches[0], '.', true); - + if($listStart !== '1') { $Block['element']['attributes'] = array('start' => $listStart); @@ -547,6 +569,8 @@ class Parsedown { $Block['li']['text'] []= ''; + $Block['loose'] = true; + unset($Block['interrupted']); } @@ -595,6 +619,22 @@ class Parsedown } } + protected function blockListComplete(array $Block) + { + if (isset($Block['loose'])) + { + foreach ($Block['element']['text'] as &$li) + { + if (end($li['text']) !== '') + { + $li['text'] []= ''; + } + } + } + + return $Block; + } + # # Quote @@ -678,12 +718,12 @@ class Parsedown protected function blockMarkup($Line) { - if ($this->markupEscaped) + if ($this->markupEscaped or $this->safeMode) { return; } - if (preg_match('/^<(\w*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches)) + if (preg_match('/^<(\w[\w-]*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches)) { $element = strtolower($matches[1]); @@ -997,7 +1037,7 @@ class Parsedown # ~ # - public function line($text) + public function line($text, $nonNestables=array()) { $markup = ''; @@ -1013,6 +1053,13 @@ class Parsedown foreach ($this->InlineTypes[$marker] as $inlineType) { + # check to see if the current inline type is nestable in the current context + + if ( ! empty($nonNestables) and in_array($inlineType, $nonNestables)) + { + continue; + } + $Inline = $this->{'inline'.$inlineType}($Excerpt); if ( ! isset($Inline)) @@ -1034,6 +1081,13 @@ class Parsedown $Inline['position'] = $markerPosition; } + # cause the new element to 'inherit' our non nestables + + foreach ($nonNestables as $non_nestable) + { + $Inline['element']['nonNestables'][] = $non_nestable; + } + # the text that comes before the inline $unmarkedText = substr($text, 0, $Inline['position']); @@ -1074,7 +1128,6 @@ class Parsedown if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(? 'a', 'handler' => 'line', + 'nonNestables' => array('Url', 'Link'), 'text' => null, 'attributes' => array( 'href' => null, @@ -1253,8 +1307,6 @@ class Parsedown $Element['attributes']['title'] = $Definition['title']; } - $Element['attributes']['href'] = str_replace(array('&', '<'), array('&', '<'), $Element['attributes']['href']); - return array( 'extent' => $extent, 'element' => $Element, @@ -1263,12 +1315,12 @@ class Parsedown protected function inlineMarkup($Excerpt) { - if ($this->markupEscaped or strpos($Excerpt['text'], '>') === false) + if ($this->markupEscaped or $this->safeMode or strpos($Excerpt['text'], '>') === false) { return; } - if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w*[ ]*>/s', $Excerpt['text'], $matches)) + if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w[\w-]*[ ]*>/s', $Excerpt['text'], $matches)) { return array( 'markup' => $matches[0], @@ -1284,7 +1336,7 @@ class Parsedown ); } - if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches)) + if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w[\w-]*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches)) { return array( 'markup' => $matches[0], @@ -1343,14 +1395,16 @@ class Parsedown if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE)) { + $url = $matches[0][0]; + $Inline = array( 'extent' => strlen($matches[0][0]), 'position' => $matches[0][1], 'element' => array( 'name' => 'a', - 'text' => $matches[0][0], + 'text' => $url, 'attributes' => array( - 'href' => $matches[0][0], + 'href' => $url, ), ), ); @@ -1363,7 +1417,7 @@ class Parsedown { if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $Excerpt['text'], $matches)) { - $url = str_replace(array('&', '<'), array('&', '<'), $matches[1]); + $url = $matches[1]; return array( 'extent' => strlen($matches[0]), @@ -1401,6 +1455,11 @@ class Parsedown protected function element(array $Element) { + if ($this->safeMode) + { + $Element = $this->sanitiseElement($Element); + } + $markup = '<'.$Element['name']; if (isset($Element['attributes'])) @@ -1412,7 +1471,7 @@ class Parsedown continue; } - $markup .= ' '.$name.'="'.$value.'"'; + $markup .= ' '.$name.'="'.self::escape($value).'"'; } } @@ -1420,13 +1479,18 @@ class Parsedown { $markup .= '>'; + if (!isset($Element['nonNestables'])) + { + $Element['nonNestables'] = array(); + } + if (isset($Element['handler'])) { - $markup .= $this->{$Element['handler']}($Element['text']); + $markup .= $this->{$Element['handler']}($Element['text'], $Element['nonNestables']); } else { - $markup .= $Element['text']; + $markup .= self::escape($Element['text'], true); } $markup .= ''; @@ -1485,10 +1549,77 @@ class Parsedown return $markup; } + protected function sanitiseElement(array $Element) + { + static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/'; + static $safeUrlNameToAtt = array( + 'a' => 'href', + 'img' => 'src', + ); + + if (isset($safeUrlNameToAtt[$Element['name']])) + { + $Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]); + } + + if ( ! empty($Element['attributes'])) + { + foreach ($Element['attributes'] as $att => $val) + { + # filter out badly parsed attribute + if ( ! preg_match($goodAttribute, $att)) + { + unset($Element['attributes'][$att]); + } + # dump onevent attribute + elseif (self::striAtStart($att, 'on')) + { + unset($Element['attributes'][$att]); + } + } + } + + return $Element; + } + + protected function filterUnsafeUrlInAttribute(array $Element, $attribute) + { + foreach ($this->safeLinksWhitelist as $scheme) + { + if (self::striAtStart($Element['attributes'][$attribute], $scheme)) + { + return $Element; + } + } + + $Element['attributes'][$attribute] = str_replace(':', '%3A', $Element['attributes'][$attribute]); + + return $Element; + } + # # Static Methods # + protected static function escape($text, $allowQuotes = false) + { + return htmlspecialchars($text, $allowQuotes ? ENT_NOQUOTES : ENT_QUOTES, 'UTF-8'); + } + + protected static function striAtStart($string, $needle) + { + $len = strlen($needle); + + if ($len > strlen($string)) + { + return false; + } + else + { + return strtolower(substr($string, 0, $len)) === strtolower($needle); + } + } + static function instance($name = 'default') { if (isset(self::$instances[$name])) diff --git a/vendor/erusev/parsedown/README.md b/vendor/erusev/parsedown/README.md index 5f5c38e3..b5d9ed2e 100644 --- a/vendor/erusev/parsedown/README.md +++ b/vendor/erusev/parsedown/README.md @@ -1,4 +1,4 @@ -> You might also like [Caret](https://caret.io?ref=parsedown) - our Markdown editor for Mac / Windows / Linux. +> I also make [Caret](https://caret.io?ref=parsedown) - a Markdown editor for Mac and PC. ## Parsedown @@ -38,7 +38,32 @@ More examples in [the wiki](https://github.com/erusev/parsedown/wiki/) and in [t ### Security -Parsedown does not sanitize the HTML that it generates. When you deal with untrusted content (ex: user commnets) you should also use a HTML sanitizer like [HTML Purifier](http://htmlpurifier.org/). +Parsedown is capable of escaping user-input within the HTML that it generates. Additionally Parsedown will apply sanitisation to additional scripting vectors (such as scripting link destinations) that are introduced by the markdown syntax itself. + +To tell Parsedown that it is processing untrusted user-input, use the following: +```php +$parsedown = new Parsedown; +$parsedown->setSafeMode(true); +``` + +If instead, you wish to allow HTML within untrusted user-input, but still want output to be free from XSS it is recommended that you make use of a HTML sanitiser that allows HTML tags to be whitelisted, like [HTML Purifier](http://htmlpurifier.org/). + +In both cases you should strongly consider employing defence-in-depth measures, like [deploying a Content-Security-Policy](https://scotthelme.co.uk/content-security-policy-an-introduction/) (a browser security feature) so that your page is likely to be safe even if an attacker finds a vulnerability in one of the first lines of defence above. + +#### Security of Parsedown Extensions + +Safe mode does not necessarily yield safe results when using extensions to Parsedown. Extensions should be evaluated on their own to determine their specific safety against XSS. + +### Escaping HTML +> ⚠️  **WARNING:** This method isn't safe from XSS! + +If you wish to escape HTML **in trusted input**, you can use the following: +```php +$parsedown = new Parsedown; +$parsedown->setMarkupEscaped(true); +``` + +Beware that this still allows users to insert unsafe scripting vectors, such as links like `[xss](javascript:alert%281%29)`. ### Questions @@ -54,7 +79,7 @@ It passes most of the CommonMark tests. Most of the tests that don't pass deal w **Who uses it?** -[phpDocumentor](http://www.phpdoc.org/), [October CMS](http://octobercms.com/), [Bolt CMS](http://bolt.cm/), [Kirby CMS](http://getkirby.com/), [Grav CMS](http://getgrav.org/), [Statamic CMS](http://www.statamic.com/), [Herbie CMS](http://www.getherbie.org/), [RaspberryPi.org](http://www.raspberrypi.org/), [Symfony demo](https://github.com/symfony/symfony-demo) and [more](https://packagist.org/packages/erusev/parsedown/dependents). +[Laravel Framework](https://laravel.com/), [Bolt CMS](http://bolt.cm/), [Grav CMS](http://getgrav.org/), [Herbie CMS](http://www.getherbie.org/), [Kirby CMS](http://getkirby.com/), [October CMS](http://octobercms.com/), [Pico CMS](http://picocms.org), [Statamic CMS](http://www.statamic.com/), [phpDocumentor](http://www.phpdoc.org/), [RaspberryPi.org](http://www.raspberrypi.org/), [Symfony demo](https://github.com/symfony/symfony-demo) and [more](https://packagist.org/packages/erusev/parsedown/dependents). **How can I help?** diff --git a/vendor/erusev/parsedown/composer.json b/vendor/erusev/parsedown/composer.json index b7f8aea3..f8b40f8c 100644 --- a/vendor/erusev/parsedown/composer.json +++ b/vendor/erusev/parsedown/composer.json @@ -13,12 +13,21 @@ } ], "require": { - "php": ">=5.3.0" + "php": ">=5.3.0", + "ext-mbstring": "*" }, "require-dev": { "phpunit/phpunit": "^4.8.35" }, "autoload": { "psr-0": {"Parsedown": ""} + }, + "autoload-dev": { + "psr-0": { + "TestParsedown": "test/", + "ParsedownTest": "test/", + "CommonMarkTest": "test/", + "CommonMarkTestWeak": "test/" + } } } diff --git a/vendor/filp/whoops/LICENSE.md b/vendor/filp/whoops/LICENSE.md index 17707b30..80407e71 100644 --- a/vendor/filp/whoops/LICENSE.md +++ b/vendor/filp/whoops/LICENSE.md @@ -1,4 +1,4 @@ -#The MIT License +# The MIT License Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/filp/whoops/composer.json b/vendor/filp/whoops/composer.json index 0a4dca4b..7b2c3a6e 100644 --- a/vendor/filp/whoops/composer.json +++ b/vendor/filp/whoops/composer.json @@ -17,8 +17,8 @@ }, "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7", - "mockery/mockery": "0.9.*", - "symfony/var-dumper": "^2.6 || ^3.0" + "mockery/mockery": "^0.9 || ^1.0", + "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0" }, "suggest": { "symfony/var-dumper": "Pretty print complex values better with var-dumper available", @@ -36,7 +36,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } } } diff --git a/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php b/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php index 1a0fcc83..08197b4d 100644 --- a/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php +++ b/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php @@ -96,6 +96,7 @@ class PrettyPageHandler extends Handler "phpstorm" => "phpstorm://open?file=%file&line=%line", "idea" => "idea://open?file=%file&line=%line", "vscode" => "vscode://file/%file:%line", + "atom" => "atom://core/open/file?filename=%file&line=%line", ]; /** diff --git a/vendor/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php b/vendor/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php index b6f93c57..0d0a577e 100644 --- a/vendor/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php +++ b/vendor/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php @@ -67,7 +67,7 @@ class XmlResponseHandler extends Handler */ private static function addDataToNode(\SimpleXMLElement $node, $data) { - assert('is_array($data) || $node instanceof Traversable'); + assert(is_array($data) || $data instanceof Traversable); foreach ($data as $key => $value) { if (is_numeric($key)) { @@ -98,7 +98,7 @@ class XmlResponseHandler extends Handler */ private static function toXml($data) { - assert('is_array($data) || $node instanceof Traversable'); + assert(is_array($data) || $data instanceof Traversable); $node = simplexml_load_string(""); diff --git a/vendor/filp/whoops/src/Whoops/Resources/css/whoops.base.css b/vendor/filp/whoops/src/Whoops/Resources/css/whoops.base.css index 0289f122..8c08bbc9 100644 --- a/vendor/filp/whoops/src/Whoops/Resources/css/whoops.base.css +++ b/vendor/filp/whoops/src/Whoops/Resources/css/whoops.base.css @@ -459,6 +459,39 @@ kbd { } } +/* Stack panels */ +@media (max-width: 600px) { + .panel { + position: static; + width: 100%; + } +} + +/* Stack details tables */ +@media (max-width: 400px) { + .data-table, + .data-table tbody, + .data-table tbody tr, + .data-table tbody td { + display: block; + width: 100%; + } + + .data-table tbody tr:first-child { + padding-top: 0; + } + + .data-table tbody td:first-child, + .data-table tbody td:last-child { + padding-left: 0; + padding-right: 0; + } + + .data-table tbody td:last-child { + padding-top: 3px; + } +} + .tooltipped { position: relative } diff --git a/vendor/filp/whoops/src/Whoops/Resources/views/frame_list.html.php b/vendor/filp/whoops/src/Whoops/Resources/views/frame_list.html.php index 7e8fa3d4..a4bc338c 100644 --- a/vendor/filp/whoops/src/Whoops/Resources/views/frame_list.html.php +++ b/vendor/filp/whoops/src/Whoops/Resources/views/frame_list.html.php @@ -14,4 +14,4 @@ -->getLine() ?> - + + <?php echo $tpl->escape($page_title) ?> diff --git a/vendor/filp/whoops/src/Whoops/Resources/views/panel_left.html.php b/vendor/filp/whoops/src/Whoops/Resources/views/panel_left.html.php index 3d96546a..7e652e46 100644 --- a/vendor/filp/whoops/src/Whoops/Resources/views/panel_left.html.php +++ b/vendor/filp/whoops/src/Whoops/Resources/views/panel_left.html.php @@ -1,3 +1,4 @@ -render($header_outer) ?> -render($frames_description) ?> -render($frames_container) ?> \ No newline at end of file +render($header_outer); +$tpl->render($frames_description); +$tpl->render($frames_container); diff --git a/vendor/guzzlehttp/guzzle/CHANGELOG.md b/vendor/guzzlehttp/guzzle/CHANGELOG.md index b265cbcd..17badd75 100644 --- a/vendor/guzzlehttp/guzzle/CHANGELOG.md +++ b/vendor/guzzlehttp/guzzle/CHANGELOG.md @@ -1,4 +1,27 @@ -# CHANGELOG +# Change Log + +## 6.3.3 - 2018-04-22 + +* Fix: Default headers when decode_content is specified + + +## 6.3.2 - 2018-03-26 + +* Fix: Release process + + +## 6.3.1 - 2018-03-26 + +* Bug fix: Parsing 0 epoch expiry times in cookies [#2014](https://github.com/guzzle/guzzle/pull/2014) +* Improvement: Better ConnectException detection [#2012](https://github.com/guzzle/guzzle/pull/2012) +* Bug fix: Malformed domain that contains a "/" [#1999](https://github.com/guzzle/guzzle/pull/1999) +* Bug fix: Undefined offset when a cookie has no first key-value pair [#1998](https://github.com/guzzle/guzzle/pull/1998) +* Improvement: Support PHPUnit 6 [#1953](https://github.com/guzzle/guzzle/pull/1953) +* Bug fix: Support empty headers [#1915](https://github.com/guzzle/guzzle/pull/1915) +* Bug fix: Ignore case during header modifications [#1916](https://github.com/guzzle/guzzle/pull/1916) + ++ Minor code cleanups, documentation fixes and clarifications. + ## 6.3.0 - 2017-06-22 diff --git a/vendor/guzzlehttp/guzzle/LICENSE b/vendor/guzzlehttp/guzzle/LICENSE index ea7f07c5..50a177b0 100644 --- a/vendor/guzzlehttp/guzzle/LICENSE +++ b/vendor/guzzlehttp/guzzle/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011-2016 Michael Dowling, https://github.com/mtdowling +Copyright (c) 2011-2018 Michael Dowling, https://github.com/mtdowling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/guzzlehttp/guzzle/README.md b/vendor/guzzlehttp/guzzle/README.md index 2f614d6f..bcd18b8e 100644 --- a/vendor/guzzlehttp/guzzle/README.md +++ b/vendor/guzzlehttp/guzzle/README.md @@ -1,7 +1,9 @@ Guzzle, PHP HTTP client ======================= -[![Build Status](https://travis-ci.org/guzzle/guzzle.svg?branch=master)](https://travis-ci.org/guzzle/guzzle) +[![Latest Version](https://img.shields.io/github/release/guzzle/guzzle.svg?style=flat-square)](https://github.com/guzzle/guzzle/releases) +[![Build Status](https://img.shields.io/travis/guzzle/guzzle.svg?style=flat-square)](https://travis-ci.org/guzzle/guzzle) +[![Total Downloads](https://img.shields.io/packagist/dt/guzzlehttp/guzzle.svg?style=flat-square)](https://packagist.org/packages/guzzlehttp/guzzle) Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and trivial to integrate with web services. diff --git a/vendor/guzzlehttp/guzzle/composer.json b/vendor/guzzlehttp/guzzle/composer.json index 65687a58..1f328e30 100644 --- a/vendor/guzzlehttp/guzzle/composer.json +++ b/vendor/guzzlehttp/guzzle/composer.json @@ -19,7 +19,7 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0 || ^5.0", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", "psr/log": "^1.0" }, "autoload": { @@ -38,7 +38,7 @@ }, "extra": { "branch-alias": { - "dev-master": "6.2-dev" + "dev-master": "6.3-dev" } } } diff --git a/vendor/guzzlehttp/guzzle/src/Client.php b/vendor/guzzlehttp/guzzle/src/Client.php index de4df8a5..80417918 100644 --- a/vendor/guzzlehttp/guzzle/src/Client.php +++ b/vendor/guzzlehttp/guzzle/src/Client.php @@ -290,7 +290,14 @@ class Client implements ClientInterface */ private function applyOptions(RequestInterface $request, array &$options) { - $modify = []; + $modify = [ + 'set_headers' => [], + ]; + + if (isset($options['headers'])) { + $modify['set_headers'] = $options['headers']; + unset($options['headers']); + } if (isset($options['form_params'])) { if (isset($options['multipart'])) { @@ -302,6 +309,8 @@ class Client implements ClientInterface } $options['body'] = http_build_query($options['form_params'], '', '&'); unset($options['form_params']); + // Ensure that we don't have the header in different case and set the new value. + $options['_conditional'] = Psr7\_caseless_remove(['Content-Type'], $options['_conditional']); $options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded'; } @@ -313,24 +322,19 @@ class Client implements ClientInterface if (isset($options['json'])) { $options['body'] = \GuzzleHttp\json_encode($options['json']); unset($options['json']); + // Ensure that we don't have the header in different case and set the new value. + $options['_conditional'] = Psr7\_caseless_remove(['Content-Type'], $options['_conditional']); $options['_conditional']['Content-Type'] = 'application/json'; } if (!empty($options['decode_content']) && $options['decode_content'] !== true ) { + // Ensure that we don't have the header in different case and set the new value. + $options['_conditional'] = Psr7\_caseless_remove(['Accept-Encoding'], $options['_conditional']); $modify['set_headers']['Accept-Encoding'] = $options['decode_content']; } - if (isset($options['headers'])) { - if (isset($modify['set_headers'])) { - $modify['set_headers'] = $options['headers'] + $modify['set_headers']; - } else { - $modify['set_headers'] = $options['headers']; - } - unset($options['headers']); - } - if (isset($options['body'])) { if (is_array($options['body'])) { $this->invalidBody(); @@ -344,6 +348,8 @@ class Client implements ClientInterface $type = isset($value[2]) ? strtolower($value[2]) : 'basic'; switch ($type) { case 'basic': + // Ensure that we don't have the header in different case and set the new value. + $modify['set_headers'] = Psr7\_caseless_remove(['Authorization'], $modify['set_headers']); $modify['set_headers']['Authorization'] = 'Basic ' . base64_encode("$value[0]:$value[1]"); break; @@ -382,6 +388,8 @@ class Client implements ClientInterface $request = Psr7\modify_request($request, $modify); if ($request->getBody() instanceof Psr7\MultipartStream) { // Use a multipart/form-data POST if a Content-Type is not set. + // Ensure that we don't have the header in different case and set the new value. + $options['_conditional'] = Psr7\_caseless_remove(['Content-Type'], $options['_conditional']); $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary=' . $request->getBody()->getBoundary(); } diff --git a/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/vendor/guzzlehttp/guzzle/src/ClientInterface.php index 5a67b66b..2dbcffa4 100644 --- a/vendor/guzzlehttp/guzzle/src/ClientInterface.php +++ b/vendor/guzzlehttp/guzzle/src/ClientInterface.php @@ -12,7 +12,7 @@ use Psr\Http\Message\UriInterface; */ interface ClientInterface { - const VERSION = '6.2.1'; + const VERSION = '6.3.3'; /** * Send an HTTP request. diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php index 1c17b5a4..78f2b79f 100644 --- a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php +++ b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php @@ -95,11 +95,11 @@ class CookieJar implements CookieJarInterface public function getCookieByName($name) { // don't allow a null name - if($name === null) { + if ($name === null) { return null; } - foreach($this->cookies as $cookie) { - if($cookie->getName() !== null && strcasecmp($cookie->getName(), $name) === 0) { + foreach ($this->cookies as $cookie) { + if ($cookie->getName() !== null && strcasecmp($cookie->getName(), $name) === 0) { return $cookie; } } diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php index e4bfafd4..4497bcf0 100644 --- a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php +++ b/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php @@ -15,7 +15,7 @@ class SessionCookieJar extends CookieJar /** * Create a new SessionCookieJar object * - * @param string $sessionKey Session key name to store the cookie + * @param string $sessionKey Session key name to store the cookie * data in session * @param bool $storeSessionCookies Set to true to store session cookies * in the cookie jar. diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php index c911e2a3..f6993943 100644 --- a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php +++ b/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php @@ -35,14 +35,13 @@ class SetCookie $data = self::$defaults; // Explode the cookie string using a series of semicolons $pieces = array_filter(array_map('trim', explode(';', $cookie))); - // The name of the cookie (first kvp) must include an equal sign. - if (empty($pieces) || !strpos($pieces[0], '=')) { + // The name of the cookie (first kvp) must exist and include an equal sign. + if (empty($pieces[0]) || !strpos($pieces[0], '=')) { return new self($data); } // Add the cookie pieces into the parsed data array foreach ($pieces as $part) { - $cookieParts = explode('=', $part, 2); $key = trim($cookieParts[0]); $value = isset($cookieParts[1]) @@ -349,7 +348,7 @@ class SetCookie return false; } - return (bool) preg_match('/\.' . preg_quote($cookieDomain) . '$/', $domain); + return (bool) preg_match('/\.' . preg_quote($cookieDomain, '/') . '$/', $domain); } /** @@ -359,7 +358,7 @@ class SetCookie */ public function isExpired() { - return $this->getExpires() && time() > $this->getExpires(); + return $this->getExpires() !== null && time() > $this->getExpires(); } /** @@ -378,8 +377,8 @@ class SetCookie // Check if any of the invalid characters are present in the cookie name if (preg_match( '/[\x00-\x20\x22\x28-\x29\x2c\x2f\x3a-\x40\x5c\x7b\x7d\x7f]/', - $name) - ) { + $name + )) { return 'Cookie name must not contain invalid characters: ASCII ' . 'Control characters (0-31;127), space, tab and the ' . 'following characters: ()<>@,;:\"/?={}'; diff --git a/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php b/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php index c82998e0..510778f6 100644 --- a/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php +++ b/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php @@ -1,4 +1,13 @@ $values) { foreach ($values as $value) { - $conf[CURLOPT_HTTPHEADER][] = "$name: $value"; + $value = (string) $value; + if ($value === '') { + // cURL requires a special format for empty headers. + // See https://github.com/guzzle/guzzle/issues/1882 for more details. + $conf[CURLOPT_HTTPHEADER][] = "$name;"; + } else { + $conf[CURLOPT_HTTPHEADER][] = "$name: $value"; + } } } @@ -388,7 +394,7 @@ class CurlFactory implements CurlFactoryInterface if (isset($options['force_ip_resolve'])) { if ('v4' === $options['force_ip_resolve']) { $conf[CURLOPT_IPRESOLVE] = CURL_IPRESOLVE_V4; - } else if ('v6' === $options['force_ip_resolve']) { + } elseif ('v6' === $options['force_ip_resolve']) { $conf[CURLOPT_IPRESOLVE] = CURL_IPRESOLVE_V6; } } diff --git a/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php index 945d06ee..2754d8e4 100644 --- a/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php +++ b/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php @@ -65,7 +65,9 @@ class CurlMultiHandler $promise = new Promise( [$this, 'execute'], - function () use ($id) { return $this->cancel($id); } + function () use ($id) { + return $this->cancel($id); + } ); $this->addRequest(['easy' => $easy, 'deferred' => $promise]); diff --git a/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php index b12bfd94..b686545e 100644 --- a/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php +++ b/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php @@ -4,7 +4,6 @@ namespace GuzzleHttp\Handler; use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\ConnectException; use GuzzleHttp\Promise\FulfilledPromise; -use GuzzleHttp\Promise\RejectedPromise; use GuzzleHttp\Promise\PromiseInterface; use GuzzleHttp\Psr7; use GuzzleHttp\TransferStats; @@ -61,6 +60,7 @@ class StreamHandler if (strpos($message, 'getaddrinfo') // DNS lookup failed || strpos($message, 'Connection refused') || strpos($message, "couldn't connect to host") // error on HHVM + || strpos($message, "connection attempt failed") ) { $e = new ConnectException($e->getMessage(), $request, $e); } @@ -103,7 +103,7 @@ class StreamHandler $status = $parts[1]; $reason = isset($parts[2]) ? $parts[2] : null; $headers = \GuzzleHttp\headers_from_lines($hdrs); - list ($stream, $headers) = $this->checkDecode($options, $headers, $stream); + list($stream, $headers) = $this->checkDecode($options, $headers, $stream); $stream = Psr7\stream_for($stream); $sink = $stream; @@ -276,7 +276,7 @@ class StreamHandler } $params = []; - $context = $this->getDefaultContext($request, $options); + $context = $this->getDefaultContext($request); if (isset($options['on_headers']) && !is_callable($options['on_headers'])) { throw new \InvalidArgumentException('on_headers must be callable'); @@ -307,7 +307,6 @@ class StreamHandler && isset($options['auth'][2]) && 'ntlm' == $options['auth'][2] ) { - throw new \InvalidArgumentException('Microsoft NTLM authentication only supported with curl handler'); } diff --git a/vendor/guzzlehttp/guzzle/src/HandlerStack.php b/vendor/guzzlehttp/guzzle/src/HandlerStack.php index a72e38a5..24c46fd9 100644 --- a/vendor/guzzlehttp/guzzle/src/HandlerStack.php +++ b/vendor/guzzlehttp/guzzle/src/HandlerStack.php @@ -22,7 +22,7 @@ class HandlerStack * Creates a default handler stack that can be used by clients. * * The returned handler will wrap the provided handler or use the most - * appropriate default handler for you system. The returned HandlerStack has + * appropriate default handler for your system. The returned HandlerStack has * support for cookies, redirects, HTTP error exceptions, and preparing a body * before sending. * diff --git a/vendor/guzzlehttp/guzzle/src/MessageFormatter.php b/vendor/guzzlehttp/guzzle/src/MessageFormatter.php index 6b090a97..663ac739 100644 --- a/vendor/guzzlehttp/guzzle/src/MessageFormatter.php +++ b/vendor/guzzlehttp/guzzle/src/MessageFormatter.php @@ -19,7 +19,6 @@ use Psr\Http\Message\ResponseInterface; * - {host}: Host of the request * - {method}: Method of the request * - {uri}: URI of the request - * - {host}: Host of the request * - {version}: Protocol version * - {target}: Request target of the request (path + query + fragment) * - {hostname}: Hostname of the machine that sent the request @@ -74,7 +73,6 @@ class MessageFormatter return preg_replace_callback( '/{\s*([A-Za-z_\-\.0-9]+)\s*}/', function (array $matches) use ($request, $response, $error, &$cache) { - if (isset($cache[$matches[1]])) { return $cache[$matches[1]]; } diff --git a/vendor/guzzlehttp/guzzle/src/Middleware.php b/vendor/guzzlehttp/guzzle/src/Middleware.php index 9d79bd26..d4ad75c9 100644 --- a/vendor/guzzlehttp/guzzle/src/Middleware.php +++ b/vendor/guzzlehttp/guzzle/src/Middleware.php @@ -34,10 +34,11 @@ final class Middleware $cookieJar = $options['cookies']; $request = $cookieJar->withCookieHeader($request); return $handler($request, $options) - ->then(function ($response) use ($cookieJar, $request) { - $cookieJar->extractCookies($request, $response); - return $response; - } + ->then( + function ($response) use ($cookieJar, $request) { + $cookieJar->extractCookies($request, $response); + return $response; + } ); }; }; @@ -72,7 +73,7 @@ final class Middleware /** * Middleware that pushes history data to an ArrayAccess container. * - * @param array $container Container to hold the history (by reference). + * @param array|\ArrayAccess $container Container to hold the history (by reference). * * @return callable Returns a function that accepts the next handler. * @throws \InvalidArgumentException if container is not an array or ArrayAccess. diff --git a/vendor/guzzlehttp/guzzle/src/UriTemplate.php b/vendor/guzzlehttp/guzzle/src/UriTemplate.php index 0b1623ec..96dcfd09 100644 --- a/vendor/guzzlehttp/guzzle/src/UriTemplate.php +++ b/vendor/guzzlehttp/guzzle/src/UriTemplate.php @@ -107,7 +107,6 @@ class UriTemplate $useQuery = self::$operatorHash[$parsed['operator']]['query']; foreach ($parsed['values'] as $value) { - if (!isset($this->variables[$value['value']])) { continue; } @@ -117,11 +116,9 @@ class UriTemplate $expanded = ''; if (is_array($variable)) { - $isAssoc = $this->isAssoc($variable); $kvp = []; foreach ($variable as $key => $var) { - if ($isAssoc) { $key = rawurlencode($key); $isNestedArray = is_array($var); @@ -179,7 +176,6 @@ class UriTemplate } $expanded = implode(',', $kvp); } - } else { if ($value['modifier'] === ':') { $variable = substr($variable, 0, $value['position']); diff --git a/vendor/guzzlehttp/guzzle/src/functions.php b/vendor/guzzlehttp/guzzle/src/functions.php index 59e212ed..a3ac450d 100644 --- a/vendor/guzzlehttp/guzzle/src/functions.php +++ b/vendor/guzzlehttp/guzzle/src/functions.php @@ -302,7 +302,8 @@ function json_decode($json, $assoc = false, $depth = 512, $options = 0) $data = \json_decode($json, $assoc, $depth, $options); if (JSON_ERROR_NONE !== json_last_error()) { throw new \InvalidArgumentException( - 'json_decode error: ' . json_last_error_msg()); + 'json_decode error: ' . json_last_error_msg() + ); } return $data; @@ -324,7 +325,8 @@ function json_encode($value, $options = 0, $depth = 512) $json = \json_encode($value, $options, $depth); if (JSON_ERROR_NONE !== json_last_error()) { throw new \InvalidArgumentException( - 'json_encode error: ' . json_last_error_msg()); + 'json_encode error: ' . json_last_error_msg() + ); } return $json; diff --git a/vendor/laravel/framework/composer.json b/vendor/laravel/framework/composer.json index cac60300..f892a85e 100644 --- a/vendor/laravel/framework/composer.json +++ b/vendor/laravel/framework/composer.json @@ -19,11 +19,11 @@ "ext-mbstring": "*", "ext-openssl": "*", "doctrine/inflector": "~1.1", - "erusev/parsedown": "~1.6", - "league/flysystem": "~1.0", + "erusev/parsedown": "~1.7", + "league/flysystem": "^1.0.8", "monolog/monolog": "~1.12", "mtdowling/cron-expression": "~1.0", - "nesbot/carbon": "~1.20", + "nesbot/carbon": "^1.24.1", "psr/container": "~1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "~3.0", @@ -68,7 +68,7 @@ "illuminate/translation": "self.version", "illuminate/validation": "self.version", "illuminate/view": "self.version", - "tightenco/collect": "self.version" + "tightenco/collect": "<5.5.33" }, "require-dev": { "aws/aws-sdk-php": "~3.0", diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub index 8846226f..f97a8a20 100644 --- a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub +++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub @@ -47,7 +47,7 @@
  • Register
    • @else
  • - diff --git a/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php b/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php index 3dd77744..92f97876 100644 --- a/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php +++ b/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php @@ -56,7 +56,7 @@ abstract class GeneratorCommand extends Command // First we will check to see if the class already exists. If it does, we don't want // to create the class and overwrite the user's code. So, we will bail out so the // code is untouched. Otherwise, we will continue generating this class' files. - if ($this->alreadyExists($this->getNameInput())) { + if ((! $this->hasOption('force') || ! $this->option('force')) && $this->alreadyExists($this->getNameInput())) { $this->error($this->type.' already exists!'); return false; diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php index 1efac5fa..8bbc6b56 100644 --- a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php +++ b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php @@ -60,8 +60,12 @@ class CallbackEvent extends Event return; } - register_shutdown_function(function () { - $this->removeMutex(); + $pid = getmypid(); + + register_shutdown_function(function () use ($pid) { + if ($pid === getmypid()) { + $this->removeMutex(); + } }); parent::callBeforeCallbacks($container); diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php b/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php index bdabc08e..b051e3be 100644 --- a/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php +++ b/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php @@ -2,12 +2,14 @@ namespace Illuminate\Contracts\Broadcasting; +use Illuminate\Broadcasting\Channel; + interface ShouldBroadcast { /** * Get the channels the event should broadcast on. * - * @return array + * @return Channel|Channel[] */ public function broadcastOn(); } diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php index 6dab7476..60e21e14 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php @@ -241,6 +241,10 @@ class Builder */ public function orWhere($column, $operator = null, $value = null) { + list($value, $operator) = $this->query->prepareValueAndOperator( + $value, $operator, func_num_args() == 2 + ); + return $this->where($column, $operator, $value, 'or'); } diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php index 4782bc02..5f7323ce 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php @@ -80,7 +80,7 @@ class Pivot extends Model */ public static function fromRawAttributes(Model $parent, $attributes, $table, $exists = false) { - $instance = static::fromAttributes($parent, $attributes, $table, $exists); + $instance = static::fromAttributes($parent, [], $table, $exists); $instance->setRawAttributes($attributes, true); diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php index 80702b6e..82f351b1 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php @@ -583,7 +583,7 @@ class Builder * * @throws \InvalidArgumentException */ - protected function prepareValueAndOperator($value, $operator, $useDefault = false) + public function prepareValueAndOperator($value, $operator, $useDefault = false) { if ($useDefault) { return [$operator, '=']; @@ -631,6 +631,10 @@ class Builder */ public function orWhere($column, $operator = null, $value = null) { + list($value, $operator) = $this->prepareValueAndOperator( + $value, $operator, func_num_args() == 2 + ); + return $this->where($column, $operator, $value, 'or'); } @@ -985,6 +989,10 @@ class Builder */ public function orWhereDate($column, $operator, $value) { + list($value, $operator) = $this->prepareValueAndOperator( + $value, $operator, func_num_args() == 2 + ); + return $this->whereDate($column, $operator, $value, 'or'); } @@ -1012,6 +1020,10 @@ class Builder */ public function orWhereTime($column, $operator, $value) { + list($value, $operator) = $this->prepareValueAndOperator( + $value, $operator, func_num_args() == 2 + ); + return $this->whereTime($column, $operator, $value, 'or'); } diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php index bf1315a8..37e91dd4 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php @@ -34,6 +34,20 @@ class PostgresGrammar extends Grammar return $this->wrap($where['column']).'::date '.$where['operator'].' '.$value; } + /** + * Compile a "where time" clause. + * + * @param \Illuminate\Database\Query\Builder $query + * @param array $where + * @return string + */ + protected function whereTime(Builder $query, $where) + { + $value = $this->parameter($where['value']); + + return $this->wrap($where['column']).'::time '.$where['operator'].' '.$value; + } + /** * Compile a date based where clause. * diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php index 77aa46e9..cd57081d 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php @@ -114,6 +114,18 @@ class SQLiteGrammar extends Grammar return $this->dateBasedWhere('%Y', $query, $where); } + /** + * Compile a "where time" clause. + * + * @param \Illuminate\Database\Query\Builder $query + * @param array $where + * @return string + */ + protected function whereTime(Builder $query, $where) + { + return $this->dateBasedWhere('%H:%M:%S', $query, $where); + } + /** * Compile a date based where clause. * diff --git a/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php b/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php index 61670ea3..df89e48f 100755 --- a/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php +++ b/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php @@ -206,9 +206,8 @@ class Encrypter implements EncrypterContract */ protected function validPayload($payload) { - return is_array($payload) && isset( - $payload['iv'], $payload['value'], $payload['mac'] - ); + return is_array($payload) && isset($payload['iv'], $payload['value'], $payload['mac']) && + strlen(base64_decode($payload['iv'], true)) === openssl_cipher_iv_length($this->cipher); } /** diff --git a/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php b/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php index 37147b3f..04c1bac5 100644 --- a/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php +++ b/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php @@ -252,7 +252,7 @@ class FilesystemManager implements FactoryContract * * @param \League\Flysystem\AdapterInterface $adapter * @param array $config - * @return \League\Flysystem\FlysystemInterface + * @return \League\Flysystem\FilesystemInterface */ protected function createFlysystem(AdapterInterface $adapter, array $config) { diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php index 48084375..bed842c5 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php @@ -29,7 +29,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn * * @var string */ - const VERSION = '5.5.34'; + const VERSION = '5.5.40'; /** * The base path for the Laravel installation. diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php b/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php index cabf0407..bccba0e7 100644 --- a/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php @@ -778,9 +778,9 @@ if (! function_exists('route')) { /** * Generate the URL to a named route. * - * @param string $name - * @param array $parameters - * @param bool $absolute + * @param array|string $name + * @param array $parameters + * @param bool $absolute * @return string */ function route($name, $parameters = [], $absolute = true) diff --git a/vendor/laravel/framework/src/Illuminate/Mail/composer.json b/vendor/laravel/framework/src/Illuminate/Mail/composer.json index 6343a923..ee0f150d 100755 --- a/vendor/laravel/framework/src/Illuminate/Mail/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Mail/composer.json @@ -15,7 +15,7 @@ ], "require": { "php": ">=7.0", - "erusev/parsedown": "~1.6", + "erusev/parsedown": "~1.7", "illuminate/container": "5.5.*", "illuminate/contracts": "5.5.*", "illuminate/support": "5.5.*", diff --git a/vendor/laravel/framework/src/Illuminate/Support/Carbon.php b/vendor/laravel/framework/src/Illuminate/Support/Carbon.php index 6ac3aa0d..db1bdbef 100644 --- a/vendor/laravel/framework/src/Illuminate/Support/Carbon.php +++ b/vendor/laravel/framework/src/Illuminate/Support/Carbon.php @@ -45,15 +45,4 @@ class Carbon extends BaseCarbon implements JsonSerializable { static::$serializer = $callback; } - - /** - * Create a new Carbon instance based on the given state array. - * - * @param array $array - * @return static - */ - public static function __set_state($array) - { - return static::instance(parent::__set_state($array)); - } } diff --git a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/NotificationFake.php b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/NotificationFake.php index 15dc0773..b610932b 100644 --- a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/NotificationFake.php +++ b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/NotificationFake.php @@ -174,7 +174,9 @@ class NotificationFake implements NotificationFactory, NotificationDispatcher } foreach ($notifiables as $notifiable) { - $notification->id = Uuid::uuid4()->toString(); + if (! $notification->id) { + $notification->id = Uuid::uuid4()->toString(); + } $this->notifications[get_class($notifiable)][$notifiable->getKey()][get_class($notification)][] = [ 'notification' => $notification, diff --git a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php index 7428b871..66d191e9 100644 --- a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php +++ b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php @@ -239,8 +239,8 @@ class QueueFake extends QueueManager implements Queue */ public function bulk($jobs, $data = '', $queue = null) { - foreach ($this->jobs as $job) { - $this->push($job); + foreach ($jobs as $job) { + $this->push($job, $data, $queue); } } diff --git a/vendor/laravel/framework/src/Illuminate/Support/composer.json b/vendor/laravel/framework/src/Illuminate/Support/composer.json index 172303dc..35f3ebd2 100644 --- a/vendor/laravel/framework/src/Illuminate/Support/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Support/composer.json @@ -18,10 +18,10 @@ "ext-mbstring": "*", "doctrine/inflector": "~1.1", "illuminate/contracts": "5.5.*", - "nesbot/carbon": "^1.20" + "nesbot/carbon": "^1.24.1" }, "replace": { - "tightenco/collect": "self.version" + "tightenco/collect": "<5.5.33" }, "autoload": { "psr-4": { @@ -37,7 +37,7 @@ } }, "suggest": { - "illuminate/filesystem": "Required to use the composer class (5.2.*).", + "illuminate/filesystem": "Required to use the composer class (5.5.*).", "symfony/process": "Required to use the composer class (~3.3).", "symfony/var-dumper": "Required to use the dd function (~3.3)." }, diff --git a/vendor/laravel/tinker/composer.json b/vendor/laravel/tinker/composer.json index 82a9ebc9..23f6b154 100644 --- a/vendor/laravel/tinker/composer.json +++ b/vendor/laravel/tinker/composer.json @@ -14,7 +14,7 @@ "illuminate/console": "~5.1", "illuminate/contracts": "~5.1", "illuminate/support": "~5.1", - "psy/psysh": "0.7.*|0.8.*", + "psy/psysh": "0.7.*|0.8.*|0.9.*", "symfony/var-dumper": "~3.0|~4.0" }, "require-dev": { diff --git a/vendor/laravel/tinker/config/tinker.php b/vendor/laravel/tinker/config/tinker.php new file mode 100644 index 00000000..1341c1b0 --- /dev/null +++ b/vendor/laravel/tinker/config/tinker.php @@ -0,0 +1,18 @@ + [], + +]; diff --git a/vendor/laravel/tinker/src/ClassAliasAutoloader.php b/vendor/laravel/tinker/src/ClassAliasAutoloader.php index cac8adb1..5afdb4f5 100644 --- a/vendor/laravel/tinker/src/ClassAliasAutoloader.php +++ b/vendor/laravel/tinker/src/ClassAliasAutoloader.php @@ -50,11 +50,19 @@ class ClassAliasAutoloader $classes = require $classMapPath; + $excludedAliases = collect(config('tinker.dont_alias', [])); + foreach ($classes as $class => $path) { if (! Str::contains($class, '\\') || Str::startsWith($path, $vendorPath)) { continue; } + if (! $excludedAliases->filter(function ($alias) use ($class) { + return Str::startsWith($class, $alias); + })->isEmpty()) { + continue; + } + $name = class_basename($class); if (! isset($this->classes[$name])) { diff --git a/vendor/laravel/tinker/src/Console/TinkerCommand.php b/vendor/laravel/tinker/src/Console/TinkerCommand.php index c95f699f..8985e249 100644 --- a/vendor/laravel/tinker/src/Console/TinkerCommand.php +++ b/vendor/laravel/tinker/src/Console/TinkerCommand.php @@ -80,6 +80,10 @@ class TinkerCommand extends Command } } + foreach (config('tinker.commands', []) as $command) { + $commands[] = $this->getApplication()->resolve($command); + } + return $commands; } diff --git a/vendor/laravel/tinker/src/TinkerServiceProvider.php b/vendor/laravel/tinker/src/TinkerServiceProvider.php index c4101b9e..76204fb4 100644 --- a/vendor/laravel/tinker/src/TinkerServiceProvider.php +++ b/vendor/laravel/tinker/src/TinkerServiceProvider.php @@ -2,7 +2,9 @@ namespace Laravel\Tinker; +use Illuminate\Foundation\Application as LaravelApplication; use Illuminate\Support\ServiceProvider; +use Laravel\Lumen\Application as LumenApplication; use Laravel\Tinker\Console\TinkerCommand; class TinkerServiceProvider extends ServiceProvider @@ -14,6 +16,24 @@ class TinkerServiceProvider extends ServiceProvider */ protected $defer = true; + /** + * Boot the service provider. + * + * @return void + */ + public function boot() + { + $source = realpath($raw = __DIR__ . '/../config/tinker.php') ?: $raw; + + if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) { + $this->publishes([$source => config_path('tinker.php')]); + } elseif ($this->app instanceof LumenApplication) { + $this->app->configure('tinker'); + } + + $this->mergeConfigFrom($source, 'tinker'); + } + /** * Register the service provider. * diff --git a/vendor/laravelcollective/html/composer.json b/vendor/laravelcollective/html/composer.json index 71bdd810..9746b163 100755 --- a/vendor/laravelcollective/html/composer.json +++ b/vendor/laravelcollective/html/composer.json @@ -2,7 +2,7 @@ "name": "laravelcollective/html", "description": "HTML and Form Builders for the Laravel Framework", "license": "MIT", - "homepage": "http://laravelcollective.com", + "homepage": "https://laravelcollective.com", "support": { "issues": "https://github.com/LaravelCollective/html/issues", "source": "https://github.com/LaravelCollective/html" @@ -39,6 +39,9 @@ ] }, "extra": { + "branch-alias": { + "dev-master": "5.5-dev" + }, "laravel": { "providers": [ "Collective\\Html\\HtmlServiceProvider" diff --git a/vendor/laravelcollective/html/src/Eloquent/FormAccessible.php b/vendor/laravelcollective/html/src/Eloquent/FormAccessible.php index de1c1916..9b5d6d0a 100644 --- a/vendor/laravelcollective/html/src/Eloquent/FormAccessible.php +++ b/vendor/laravelcollective/html/src/Eloquent/FormAccessible.php @@ -87,7 +87,7 @@ trait FormAccessible $mutator = collect($methods) ->first(function (ReflectionMethod $method) use ($key) { - return $method->getName() == 'form' . Str::studly($key) . 'Attribute'; + return $method->getName() === 'form' . Str::studly($key) . 'Attribute'; }); return (bool) $mutator; diff --git a/vendor/laravelcollective/html/src/FormBuilder.php b/vendor/laravelcollective/html/src/FormBuilder.php index 8d33ce02..00ba728f 100644 --- a/vendor/laravelcollective/html/src/FormBuilder.php +++ b/vendor/laravelcollective/html/src/FormBuilder.php @@ -190,6 +190,16 @@ class FormBuilder { $this->model = $model; } + + /** + * Get the current model instance on the form builder. + * + * @return mixed $model + */ + public function getModel() + { + return $this->model; + } /** * Close the current form. @@ -562,9 +572,10 @@ class FormBuilder * * @param string $name * @param array $list - * @param string $selected + * @param string|bool $selected * @param array $selectAttributes * @param array $optionsAttributes + * @param array $optgroupsAttributes * * @return \Illuminate\Support\HtmlString */ @@ -573,7 +584,8 @@ class FormBuilder $list = [], $selected = null, array $selectAttributes = [], - array $optionsAttributes = [] + array $optionsAttributes = [], + array $optgroupsAttributes = [] ) { $this->type = 'select'; @@ -599,8 +611,9 @@ class FormBuilder } foreach ($list as $value => $display) { - $optionAttributes = isset($optionsAttributes[$value]) ? $optionsAttributes[$value] : []; - $html[] = $this->getSelectOption($display, $value, $selected, $optionAttributes); + $optionAttributes = $optionsAttributes[$value] ?? []; + $optgroupAttributes = $optgroupsAttributes[$value] ?? []; + $html[] = $this->getSelectOption($display, $value, $selected, $optionAttributes, $optgroupAttributes); } // Once we have all of this HTML, we can join this into a single element after @@ -675,13 +688,14 @@ class FormBuilder * @param string $value * @param string $selected * @param array $attributes + * @param array $optgroupAttributes * * @return \Illuminate\Support\HtmlString */ - public function getSelectOption($display, $value, $selected, array $attributes = []) + public function getSelectOption($display, $value, $selected, array $attributes = [], array $optgroupAttributes = []) { if (is_array($display)) { - return $this->optionGroup($display, $value, $selected, $attributes); + return $this->optionGroup($display, $value, $selected, $optgroupAttributes, $attributes); } return $this->option($display, $value, $selected, $attributes); @@ -694,18 +708,21 @@ class FormBuilder * @param string $label * @param string $selected * @param array $attributes + * @param array $optionsAttributes * * @return \Illuminate\Support\HtmlString */ - protected function optionGroup($list, $label, $selected, array $attributes = []) + protected function optionGroup($list, $label, $selected, array $attributes = [], array $optionsAttributes = []) { $html = []; foreach ($list as $value => $display) { - $html[] = $this->option($display, $value, $selected, $attributes); - } + $optionAttributes = $optionsAttributes[$value] ?? []; - return $this->toHtmlString('' . implode('', $html) . ''); + $html[] = $this->option($display, $value, $selected, $optionAttributes); + } + + return $this->toHtmlString('html->attributes($attributes) . '>' . implode('', $html) . ''); } /** @@ -722,9 +739,14 @@ class FormBuilder { $selected = $this->getSelectedValue($value, $selected); - $options = ['value' => $value, 'selected' => $selected] + $attributes; + $options = array_merge(['value' => $value, 'selected' => $selected], $attributes); - return $this->toHtmlString('html->attributes($options) . '>' . e($display) . ''); + $string = 'html->attributes($options) . '>'; + if ($display !== null) { + $string .= e($display) . ''; + } + + return $this->toHtmlString($string); } /** @@ -762,8 +784,10 @@ class FormBuilder } elseif ($selected instanceof Collection) { return $selected->contains($value) ? 'selected' : null; } - - return ((string) $value == (string) $selected) ? 'selected' : null; + if (is_int($value) && is_bool($selected)) { + return (bool)$value === $selected; + } + return ((string) $value === (string) $selected) ? 'selected' : null; } /** @@ -844,7 +868,7 @@ class FormBuilder return $this->getRadioCheckedState($name, $value, $checked); default: - return $this->getValueAttribute($name) == $value; + return $this->getValueAttribute($name) === $value; } } @@ -865,7 +889,7 @@ class FormBuilder return false; } - if ($this->missingOldAndModel($name) && !$request) { + if ($this->missingOldAndModel($name) && is_null($request)) { return $checked; } @@ -897,7 +921,7 @@ class FormBuilder return $checked; } - return $this->getValueAttribute($name) == $value; + return $this->getValueAttribute($name) === $value; } /** @@ -996,7 +1020,7 @@ class FormBuilder { $method = strtoupper($method); - return $method != 'GET' ? 'POST' : $method; + return $method !== 'GET' ? 'POST' : $method; } /** @@ -1055,10 +1079,10 @@ class FormBuilder protected function getRouteAction($options) { if (is_array($options)) { - return $this->url->route($options[0], array_slice($options, 1), false); + return $this->url->route($options[0], array_slice($options, 1)); } - return $this->url->route($options, [], false); + return $this->url->route($options); } /** @@ -1098,7 +1122,7 @@ class FormBuilder // If the method is something other than GET we will go ahead and attach the // CSRF token to the form, as this can't hurt and is convenient to simply // always have available on every form the developers creates for them. - if ($method != 'GET') { + if ($method !== 'GET') { $appendage .= $this->token(); } @@ -1140,7 +1164,7 @@ class FormBuilder $old = $this->old($name); - if (! is_null($old) && $name != '_method') { + if (! is_null($old) && $name !== '_method') { return $old; } @@ -1151,7 +1175,7 @@ class FormBuilder if ($hasNullMiddleware && is_null($old) && is_null($value) - && !is_null($this->view->shared('errors')) + && ! is_null($this->view->shared('errors')) && count($this->view->shared('errors')) > 0 ) { return null; @@ -1159,7 +1183,7 @@ class FormBuilder } $request = $this->request($name); - if (!is_null($request)) { + if (! is_null($request) && $name !== '_method') { return $request; } @@ -1179,7 +1203,7 @@ class FormBuilder */ protected function request($name) { - if (!isset($this->request)) { + if (! isset($this->request)) { return null; } @@ -1217,16 +1241,16 @@ class FormBuilder $key = $this->transformKey($name); $payload = $this->session->getOldInput($key); - if (!is_array($payload)) { + if (! is_array($payload)) { return $payload; } - if (!in_array($this->type, ['select', 'checkbox'])) { - if (!isset($this->payload[$key])) { + if (! in_array($this->type, ['select', 'checkbox'])) { + if (! isset($this->payload[$key])) { $this->payload[$key] = collect($payload); } - if (!empty($this->payload[$key])) { + if (! empty($this->payload[$key])) { $value = $this->payload[$key]->shift(); return $value; } @@ -1243,7 +1267,7 @@ class FormBuilder */ public function oldInputIsEmpty() { - return (isset($this->session) && count($this->session->getOldInput()) == 0); + return (isset($this->session) && count($this->session->getOldInput()) === 0); } /** diff --git a/vendor/laravelcollective/html/src/HtmlBuilder.php b/vendor/laravelcollective/html/src/HtmlBuilder.php index d2ba3cd0..7eb37ae0 100755 --- a/vendor/laravelcollective/html/src/HtmlBuilder.php +++ b/vendor/laravelcollective/html/src/HtmlBuilder.php @@ -78,7 +78,7 @@ class HtmlBuilder { $attributes['src'] = $this->url->asset($url, $secure); - return $this->toHtmlString('attributes($attributes) . '>' . PHP_EOL); + return $this->toHtmlString('attributes($attributes) . '>'); } /** @@ -94,11 +94,11 @@ class HtmlBuilder { $defaults = ['media' => 'all', 'type' => 'text/css', 'rel' => 'stylesheet']; - $attributes = $attributes + $defaults; + $attributes = array_merge($attributes, $defaults); $attributes['href'] = $this->url->asset($url, $secure); - return $this->toHtmlString('attributes($attributes) . '>' . PHP_EOL); + return $this->toHtmlString('attributes($attributes) . '>'); } /** @@ -132,11 +132,11 @@ class HtmlBuilder { $defaults = ['rel' => 'shortcut icon', 'type' => 'image/x-icon']; - $attributes = $attributes + $defaults; + $attributes = array_merge($attributes, $defaults); $attributes['href'] = $this->url->asset($url, $secure); - return $this->toHtmlString('attributes($attributes) . '>' . PHP_EOL); + return $this->toHtmlString('attributes($attributes) . '>'); } /** @@ -162,7 +162,7 @@ class HtmlBuilder $title = $this->entities($title); } - return $this->toHtmlString('attributes($attributes) . '>' . $title . ''); + return $this->toHtmlString('attributes($attributes) . '>' . $title . ''); } /** @@ -357,7 +357,7 @@ class HtmlBuilder { $html = ''; - if (count($list) == 0) { + if (count($list) === 0) { return $html; } @@ -451,7 +451,7 @@ class HtmlBuilder } // Treat boolean attributes as HTML properties - if (is_bool($value) && $key != 'value') { + if (is_bool($value) && $key !== 'value') { return $value ? $key : ''; } @@ -511,7 +511,7 @@ class HtmlBuilder $attributes = array_merge($defaults, $attributes); - return $this->toHtmlString('attributes($attributes) . '>' . PHP_EOL); + return $this->toHtmlString('attributes($attributes) . '>'); } /** @@ -525,8 +525,8 @@ class HtmlBuilder */ public function tag($tag, $content, array $attributes = []) { - $content = is_array($content) ? implode(PHP_EOL, $content) : $content; - return $this->toHtmlString('<' . $tag . $this->attributes($attributes) . '>' . PHP_EOL . $this->toHtmlString($content) . PHP_EOL . '' . PHP_EOL); + $content = is_array($content) ? implode('', $content) : $content; + return $this->toHtmlString('<' . $tag . $this->attributes($attributes) . '>' . $this->toHtmlString($content) . ''); } /** diff --git a/vendor/league/flysystem/docs/.gitignore b/vendor/league/flysystem/docs/.gitignore deleted file mode 100644 index 2ebd62b2..00000000 --- a/vendor/league/flysystem/docs/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -_site -Gemfile -Gemfile.lock \ No newline at end of file diff --git a/vendor/league/flysystem/docs/CNAME b/vendor/league/flysystem/docs/CNAME deleted file mode 100644 index 04aac36c..00000000 --- a/vendor/league/flysystem/docs/CNAME +++ /dev/null @@ -1 +0,0 @@ -flysystem.thephpleague.com \ No newline at end of file diff --git a/vendor/league/flysystem/docs/_data/images.yml b/vendor/league/flysystem/docs/_data/images.yml deleted file mode 100644 index 5583e4b6..00000000 --- a/vendor/league/flysystem/docs/_data/images.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Path to project specific favicon.ico, leave blank to use default -favicon: - -# Path to project specific apple-touch-icon-precomposed.png, leave blank to use default -apple_touch: - -# Path to project logo -logo: diff --git a/vendor/league/flysystem/docs/_data/menu.yml b/vendor/league/flysystem/docs/_data/menu.yml deleted file mode 100644 index 8260f928..00000000 --- a/vendor/league/flysystem/docs/_data/menu.yml +++ /dev/null @@ -1,32 +0,0 @@ -Getting Started: - Introduction: '/' - Installation: '/installation/' - Sponsors: '/sponsors/' - Integrations: '/integrations/' - Core concepts: '/core-concepts/' - The API: '/api/' - Mount Manager: '/mount-manager/' - Caching: '/caching/' - Recipes: '/recipes/' - Plugins: '/plugins/' - Upgrade to 1.0.0: '/upgrade-to-1.0.0/' - Creating an adapter: '/creating-an-adapter/' - Performance: '/performance/' -Adapters: - Local: '/adapter/local/' - Azure: '/adapter/azure/' - AWS S3 V2: '/adapter/aws-s3-v2/' - AWS S3 V3: '/adapter/aws-s3-v3/' - Copy.com: '/adapter/copy/' - DigitalOcean Spaces: '/adapter/digitalocean-spaces/' - Dropbox: '/adapter/dropbox/' - FTP: '/adapter/ftp/' - GridFS: '/adapter/gridfs/' - Memory: '/adapter/memory/' - Null / Test: '/adapter/null-test/' - Rackspace: '/adapter/rackspace/' - ReplicateAdapter: '/adapter/replicate/' - SFTP: '/adapter/sftp/' - WebDAV: '/adapter/webdav/' - PHPCR: '/adapter/phpcr/' - ZipArchive: '/adapter/zip-archive/' diff --git a/vendor/league/flysystem/docs/_data/project.yml b/vendor/league/flysystem/docs/_data/project.yml deleted file mode 100644 index a3aa54ef..00000000 --- a/vendor/league/flysystem/docs/_data/project.yml +++ /dev/null @@ -1,4 +0,0 @@ -title: "Flysystem" -tagline: "Multiple Filesystems, One API" -description: "Filesystem abstraction package allowing you to use the same API for both local, remote and cloud filesystems." -google_analytics_tracking_id: "UA-46050814-3" diff --git a/vendor/league/flysystem/docs/_layouts/default.html b/vendor/league/flysystem/docs/_layouts/default.html deleted file mode 100644 index d18093b3..00000000 --- a/vendor/league/flysystem/docs/_layouts/default.html +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - {% if page.url == '/' %} - {{ site.data.project.title }} - {{ site.data.project.tagline }} - {% else %} - {{ page.title }} - {{ site.data.project.title }} - {% endif %} - {% if site.data.project.description %} - - {% endif %} - {% if site.data.images.favicon %} - - {% else %} - - {% endif %} - {% if site.data.images.apple_touch %} - - {% else %} - - {% endif %} - - - - - -
    - - The League of Extraordinary Packages - -

    Our Packages:

    -
      - -
    -
    - -
    - - - Presented by The League of Extraordinary Packages - -
    - - - - -
    - - {% for section in site.data.menu %} -

    {{ section[0] }}

    -
      - {% for link in section[1] %} -
    • - {{ link[0] }} -
      • - {% endfor %} -
    - {% endfor %} -     -
    - {{ content }} -
    -
    - - - - - - - -{% if site.data.project.google_analytics_tracking_id %} - -{% endif %} - - - diff --git a/vendor/league/flysystem/docs/adapter/aws-s3-v2.md b/vendor/league/flysystem/docs/adapter/aws-s3-v2.md deleted file mode 100644 index 44a73d91..00000000 --- a/vendor/league/flysystem/docs/adapter/aws-s3-v2.md +++ /dev/null @@ -1,55 +0,0 @@ ---- -layout: default -permalink: /adapter/aws-s3-v2/ -title: Aws S3 Adapter V2 ---- - -# Aws S3 Adapter - SDK V2 - -## Installation - -~~~ bash -composer require league/flysystem-aws-s3-v2 -~~~ - -## Usage - -~~~ php -use Aws\S3\S3Client; -use League\Flysystem\AwsS3v2\AwsS3Adapter; -use League\Flysystem\Filesystem; - -$client = S3Client::factory([ - 'key' => '[your key]', - 'secret' => '[your secret]', - 'region' => '[aws-region]', -]); - -$adapter = new AwsS3Adapter($client, 'bucket-name', 'optional/path/prefix'); - -$filesystem = new Filesystem($adapter); -~~~ - -To enable [reduced redunancy storage](http://aws.amazon.com/s3/details/#RRS) set up your adapter like so: - -~~~ php -$adapter = new AwsS3Adapter($client, 'bucket-name', 'optional/path/prefix', [ - 'StorageClass' => 'REDUCED_REDUNDANCY', -]); -~~~ - -### Compatible storage protocols - -If you're using a storage service which implements the S3 protocols, you can set the `base_url` configuration option when constructing the client. - -~~~ php -$client = S3Client::factory([ - 'base_url' => 'http://some.other.endpoint', - // ... other settings -]); -~~~ - -Known compliant storage providers are: - -* [Google Cloud Storage](https://cloud.google.com/storage/docs/migrating#migration-simple) -* Know more? Please submit a PR! diff --git a/vendor/league/flysystem/docs/adapter/aws-s3-v3.md b/vendor/league/flysystem/docs/adapter/aws-s3-v3.md deleted file mode 100644 index 9f8ce8c2..00000000 --- a/vendor/league/flysystem/docs/adapter/aws-s3-v3.md +++ /dev/null @@ -1,61 +0,0 @@ ---- -layout: default -permalink: /adapter/aws-s3-v3/ -title: Aws S3 Adapter V3 ---- - -# Aws S3 Adapter - SDK V3 - -## Installation - -~~~ bash -composer require league/flysystem-aws-s3-v3 -~~~ - -## Usage - -~~~ php -use Aws\S3\S3Client; -use League\Flysystem\AwsS3v3\AwsS3Adapter; -use League\Flysystem\Filesystem; - -$client = S3Client::factory([ - 'credentials' => [ - 'key' => 'your-key', - 'secret' => 'your-secret', - ], - 'region' => 'your-region', - 'version' => 'latest|version', -]); - -$adapter = new AwsS3Adapter($client, 'your-bucket-name', 'optional/path/prefix'); - -$filesystem = new Filesystem($adapter); -~~~ - -The required IAM permissions are: - -~~~ json -{ - "Version": "2012-10-17", - "Statement": [ - { - "Sid": "Stmt1420044805001", - "Effect": "Allow", - "Action": [ - "s3:ListBucket", - "s3:GetObject", - "s3:GetObjectAcl", - "s3:PutObject", - "s3:PutObjectAcl", - "s3:ReplicateObject", - "s3:DeleteObject" - ], - "Resource": [ - "arn:aws:s3:::your-bucket-name", - "arn:aws:s3:::your-bucket-name/*" - ] - } - ] -} -~~~ diff --git a/vendor/league/flysystem/docs/adapter/azure.md b/vendor/league/flysystem/docs/adapter/azure.md deleted file mode 100644 index 06a11749..00000000 --- a/vendor/league/flysystem/docs/adapter/azure.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -layout: default -permalink: /adapter/azure/ -title: Azure Blob Storage ---- - -# Azure Blob Storage - -## Installation - -~~~ bash -composer require league/flysystem-azure -~~~ - -## Usage - -~~~ php -use MicrosoftAzure\Storage\Common\ServicesBuilder; -use League\Flysystem\Filesystem; -use League\Flysystem\Azure\AzureAdapter; - -$endpoint = sprintf( - 'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s', - 'account-name', - 'api-key' -); - -$blobRestProxy = ServicesBuilder::getInstance()->createBlobService($endpoint); - -$filesystem = new Filesystem(new AzureAdapter($blobRestProxy, 'my-container')); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/copy.md b/vendor/league/flysystem/docs/adapter/copy.md deleted file mode 100644 index b94b73ff..00000000 --- a/vendor/league/flysystem/docs/adapter/copy.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -layout: default -permalink: /adapter/copy/ -title: Copy.com Adapter ---- - -# Copy.com Adapter - -## Installation - -~~~ bash -composer require league/flysystem-copy -~~~ - -## Usage - -~~~ php -use Barracuda\Copy\API; -use League\Flysystem\Filesystem; -use League\Flysystem\Copy\CopyAdapter; - -$client = new API($consumerKey, $consumerSecret, $accessToken, $tokenSecret); -$filesystem = new Filesystem(new CopyAdapter($client, 'optional/path/prefix')); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/digitalocean-spaces.md b/vendor/league/flysystem/docs/adapter/digitalocean-spaces.md deleted file mode 100644 index 47afb540..00000000 --- a/vendor/league/flysystem/docs/adapter/digitalocean-spaces.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: default -permalink: /adapter/digitalocean-spaces/ -title: DigitalOcean Spaces ---- - -# DigitalOcean Spaces - S3 Compliant storage - -The DO Spaces api are compatible with those of S3, from Flysystem's perspective this means you can use the -`league/flysystem-aws-s3-v3` adapter. diff --git a/vendor/league/flysystem/docs/adapter/dropbox.md b/vendor/league/flysystem/docs/adapter/dropbox.md deleted file mode 100644 index 9121c2eb..00000000 --- a/vendor/league/flysystem/docs/adapter/dropbox.md +++ /dev/null @@ -1,29 +0,0 @@ ---- -layout: default -permalink: /adapter/dropbox/ -title: Dropbox Adapter ---- - -# Dropbox Adapter - -## Installation - -~~~ bash -composer require spatie/flysystem-dropbox -~~~ - -## Usage - -A token can be generated in the [App Console](https://www.dropbox.com/developers/apps) for any Dropbox API app. You'll find more info at [the Dropbox Developer Blog](https://blogs.dropbox.com/developers/2014/05/generate-an-access-token-for-your-own-account/). - -~~~ php -use League\Flysystem\Filesystem; -use Spatie\Dropbox\Client; -use Spatie\FlysystemDropbox\DropboxAdapter; - -$client = new Client($authorizationToken); - -$adapter = new DropboxAdapter($client); - -$filesystem = new Filesystem($adapter); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/ftp.md b/vendor/league/flysystem/docs/adapter/ftp.md deleted file mode 100644 index 26836d94..00000000 --- a/vendor/league/flysystem/docs/adapter/ftp.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -layout: default -permalink: /adapter/ftp/ -title: FTP Adapter ---- - -# FTP Adapter - -## Installation - -Comes with the main Flysystem package. - -## Usage - -~~~ php -use League\Flysystem\Filesystem; -use League\Flysystem\Adapter\Ftp as Adapter; - -$filesystem = new Filesystem(new Adapter([ - 'host' => 'ftp.example.com', - 'username' => 'username', - 'password' => 'password', - - /** optional config settings */ - 'port' => 21, - 'root' => '/path/to/root', - 'passive' => true, - 'ssl' => true, - 'timeout' => 30, -])); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/gridfs.md b/vendor/league/flysystem/docs/adapter/gridfs.md deleted file mode 100644 index cff8b55d..00000000 --- a/vendor/league/flysystem/docs/adapter/gridfs.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -layout: default -permalink: /adapter/gridfs/ -title: GridFS Adapter ---- - -# GridFS Adapter - -## Installation - -~~~ bash -composer require league/flysystem-gridfs -~~~ - -## Usage - -~~~ php -use League\Flysystem\GridFS\GridFSAdapter; -use League\Flysystem\Filesystem; - -$mongoClient = new MongoClient(); -$gridFs = $mongoClient->selectDB('db_name')->getGridFS(); - -$adapter = new GridFSAdapter($gridFs); -$filesystem = new Filesystem($adapter); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/local.md b/vendor/league/flysystem/docs/adapter/local.md deleted file mode 100644 index 296f3692..00000000 --- a/vendor/league/flysystem/docs/adapter/local.md +++ /dev/null @@ -1,62 +0,0 @@ ---- -layout: default -permalink: /adapter/local/ -title: Local Adapter ---- - -# Local Adapter - -## Installation - -Comes with the main Flysystem package. - -## Usage - -~~~ php -use League\Flysystem\Filesystem; -use League\Flysystem\Adapter\Local; - -$adapter = new Local(__DIR__.'/path/to/root'); -$filesystem = new Filesystem($adapter); -~~~ - -## Locks - -By default this adapter uses a lock during writes -and updates. This behaviour can be altered using the -second constructor argument. - -~~~ php -$adapter = new Local(__DIR__.'/path/to/too', 0); -~~~ - -## Links [added in 1.0.8] - -The Local adapter doesn't support links, this violates -the root path constraint which is enforced throughout -Flysystem. By default, when links are encountered an -exception is thrown. This behaviour can be altered -using the third constructor argument. - -~~~ php -// Skip links -$adapter = new Local(__DIR__.'/path/to/too', LOCK_EX, Local::SKIP_LINKS); - -// Throw exceptions (default) -$adapter = new Local(__DIR__.'/path/to/too', LOCK_EX, Local::DISALLOW_LINKS); -~~~ - -## File and directory permission settings [added in 1.0.14] - -~~~ php -$adapter = new Local(__DIR__.'/path/to/too', LOCK_EX, Local::DISALLOW_LINKS, [ - 'file' => [ - 'public' => 0744, - 'private' => 0700, - ], - 'dir' => [ - 'public' => 0755, - 'private' => 0700, - ] -]); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/memory.md b/vendor/league/flysystem/docs/adapter/memory.md deleted file mode 100644 index 8bf32729..00000000 --- a/vendor/league/flysystem/docs/adapter/memory.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -layout: default -permalink: /adapter/memory/ -title: Memory Adapter ---- - -# Memory Adapter - -This adapter keeps the filesystem completely in memory. This is useful when you need a filesystem, but don't want it persisted. - -## Installation - -~~~ bash -composer require league/flysystem-memory -~~~ - -## Usage - -~~~ php -use League\Flysystem\Filesystem; -use League\Flysystem\Memory\MemoryAdapter; - -$filesystem = new Filesystem(new MemoryAdapter()); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/null-test.md b/vendor/league/flysystem/docs/adapter/null-test.md deleted file mode 100644 index 08a41213..00000000 --- a/vendor/league/flysystem/docs/adapter/null-test.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -layout: default -permalink: /adapter/null-test/ -title: Null Adapter ---- - -# Null Adapter - -## Installation - -Comes with the main Flysystem package. - -## Usage - -Acts like `/dev/null` - -~~~ php -$adapter = new League\Flysystem\Adapter\NullAdapter; -$filesystem = new League\Flysystem\Filesystem($adapter); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/phpcr.md b/vendor/league/flysystem/docs/adapter/phpcr.md deleted file mode 100644 index 482ca654..00000000 --- a/vendor/league/flysystem/docs/adapter/phpcr.md +++ /dev/null @@ -1,48 +0,0 @@ ---- -layout: default -permalink: /adapter/phpcr/ -title: PHPCR Adapter ---- - -# PHPCR Adapter - -This adapter works with any [PHPCR](http://phpcr.github.io) implementation. -Choose the one that fits your needs and add it to your project, or composer -will complain that you miss `phpcr/phpcr-implementation`. See -[this article](http://symfony.com/doc/master/cmf/cookbook/database/choosing_phpcr_implementation.html) -for more on choosing your implementation. - -## Installation - -Assuming you go with jackalope-doctrine-dbal, do: - -~~~bash -composer require jackalope/jackalope-doctrine-dbal league/flysystem-phpcr -~~~ - -## Usage - -Bootstrap your PHPCR implementation. If you chose jackalope-doctrine-dbal with sqlite, -this will look like this for example: - -~~~php -use League\Flysystem\Filesystem; -use League\Flysystem\Phpcr\PhpcrAdapter; -use Jackalope\RepositoryFactoryDoctrineDBAL; -use Doctrine\DBAL\Driver\Connection; -use Doctrine\DBAL\DriverManager; - -$connection = DriverManager::getConnection([ - 'driver' => 'pdo_sqlite', - 'path' => '/path/to/sqlite.db', -]); -$factory = new RepositoryFactoryDoctrineDBAL(); -$repository = $factory->getRepository([ - 'jackalope.doctrine_dbal_connection' => $connection, -]); -$session = $repository->login(new SimpleCredentials('', '')); - -// this part looks the same regardless of your phpcr implementation. -$root = '/flysystem_tests'; -$filesystem = new Filesystem(new PhpcrAdapter($session, $root)); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/rackspace.md b/vendor/league/flysystem/docs/adapter/rackspace.md deleted file mode 100644 index 65cebf4a..00000000 --- a/vendor/league/flysystem/docs/adapter/rackspace.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -layout: default -permalink: /adapter/rackspace/ -title: Rackspace Adapter ---- - -# Rackspace Adapter - -## Installation - -~~~ bash -composer require league/flysystem-rackspace -~~~ - -## Usage - -~~~ php -use OpenCloud\OpenStack; -use OpenCloud\Rackspace; -use League\Flysystem\Filesystem; -use League\Flysystem\Rackspace\RackspaceAdapter; - -$client = new OpenStack(Rackspace::UK_IDENTITY_ENDPOINT, [ - 'username' => ':username', - 'password' => ':password', -]); - -$store = $client->objectStoreService('cloudFiles', 'LON'); -$container = $store->getContainer('flysystem'); - -$filesystem = new Filesystem(new RackspaceAdapter($container, 'optional/path/prefix')); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/replicate.md b/vendor/league/flysystem/docs/adapter/replicate.md deleted file mode 100644 index 34b10731..00000000 --- a/vendor/league/flysystem/docs/adapter/replicate.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -layout: default -permalink: /adapter/replicate/ -title: Replicate Adapter ---- - -# Replicate Adapter - -## Installation - -~~~ bash -composer require league/flysystem-replicate-adapter -~~~ - -## Usage - -The `ReplicateAdapter` facilitates smooth transitions between adapters, allowing an application to stay functional and migrate its files from one adapter to another. The adapter takes two other adapters, a source and a replica. Every change is delegated to both adapters, while all the read operations are passed onto the source only. - -~~~ php -$source = new League\Flysystem\AwsS3V3\AwsS3Adapter(...); -$replica = new League\Flysystem\Adapter\Local(...); -$adapter = new League\Flysystem\Replicate\ReplicateAdapter($source, $replica); -$filesystem = new Filesystem($adapter); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/sftp.md b/vendor/league/flysystem/docs/adapter/sftp.md deleted file mode 100644 index 6cd03855..00000000 --- a/vendor/league/flysystem/docs/adapter/sftp.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -layout: default -permalink: /adapter/sftp/ -title: SFTP Adapter ---- - -# SFTP Adapter - -## Installation - -~~~ bash -composer require league/flysystem-sftp -~~~ - -## Usage - -~~~ php -use League\Flysystem\Filesystem; -use League\Flysystem\Sftp\SftpAdapter; - -$filesystem = new Filesystem(new SftpAdapter([ - 'host' => 'example.com', - 'port' => 21, - 'username' => 'username', - 'password' => 'password', - 'privateKey' => 'path/to/or/contents/of/privatekey', - 'root' => '/path/to/root', - 'timeout' => 10, -])); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/webdav.md b/vendor/league/flysystem/docs/adapter/webdav.md deleted file mode 100644 index 3cad9109..00000000 --- a/vendor/league/flysystem/docs/adapter/webdav.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -layout: default -permalink: /adapter/webdav/ -title: WebDAV Adapter ---- - -# WebDAV Adapter - -## Installation - -~~~ bash -composer require league/flysystem-webdav -~~~ - -## Usage - -~~~ php -$client = new Sabre\DAV\Client($settings); -$adapter = new League\Flysystem\WebDAV\WebDAVAdapter($client, 'optional/path/prefix'); -$flysystem = new League\Flysystem\Filesystem($adapter); -~~~ diff --git a/vendor/league/flysystem/docs/adapter/zip-archive.md b/vendor/league/flysystem/docs/adapter/zip-archive.md deleted file mode 100644 index 8d2017e3..00000000 --- a/vendor/league/flysystem/docs/adapter/zip-archive.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -layout: default -permalink: /adapter/zip-archive/ -title: ZipArchive Adapter ---- - -# ZipArchive Adapter - -## Installation - -~~~ bash -composer require league/flysystem-ziparchive -~~~ - -## Usage - -~~~ php -use League\Flysystem\Filesystem; -use League\Flysystem\ZipArchive\ZipArchiveAdapter; - -$filesystem = new Filesystem(new ZipArchiveAdapter(__DIR__.'/path/to/archive.zip')); -~~~ - -### Force Save - -When creating a new zip file it will only be saved at the end of the PHP request because the ZipArchive library relies on an internal `__destruct` method to be called. You can force the saving of the zip file before the end of the request by calling the `close` method on the archive through the adapter. - -~~~ php -$filesystem->getAdapter()->getArchive()->close(); -~~~ diff --git a/vendor/league/flysystem/docs/api.md b/vendor/league/flysystem/docs/api.md deleted file mode 100644 index 5d15e25a..00000000 --- a/vendor/league/flysystem/docs/api.md +++ /dev/null @@ -1,231 +0,0 @@ ---- -layout: default -permalink: /api/ -title: API ---- - -# API - -## General Usage - -__Write Files__ - -~~~ php -$filesystem->write('path/to/file.txt', 'contents'); -~~~ - -__Update Files__ - -~~~ php -$filesystem->update('path/to/file.txt', 'new contents'); -~~~ - -__Write or Update Files__ - -~~~ php -$filesystem->put('path/to/file.txt', 'contents'); -~~~ - -__Read Files__ - -~~~ php -$contents = $filesystem->read('path/to/file.txt'); -~~~ - -__Check if a file exists__ - -~~~ php -$exists = $filesystem->has('path/to/file.txt'); -~~~ - -__NOTE__: This only has consistent behaviour for files, not directories. Directories -are less important in Flysystem, they're created implicitly and often ignored because -not every adapter (filesystem type) supports directories. - -__Delete Files__ - -~~~ php -$filesystem->delete('path/to/file.txt'); -~~~ - -__Read and Delete__ - -~~~ php -$contents = $filesystem->readAndDelete('path/to/file.txt'); -~~~ - -__Rename Files__ - -~~~ php -$filesystem->rename('filename.txt', 'newname.txt'); -~~~ - -__Copy Files__ - -~~~ php -$filesystem->copy('filename.txt', 'duplicate.txt'); -~~~ - -__Get Mimetypes__ - -~~~ php -$mimetype = $filesystem->getMimetype('path/to/file.txt'); -~~~ - -__Get Timestamps__ - -~~~ php -$timestamp = $filesystem->getTimestamp('path/to/file.txt'); -~~~ - -__Get File Sizes__ - -~~~ php -$size = $filesystem->getSize('path/to/file.txt'); -~~~ - -__Create Directories__ - -~~~ php -$filesystem->createDir('path/to/nested/directory'); -~~~ -Directories are also made implicitly when writing to a deeper path - -~~~ php -$filesystem->write('path/to/file.txt', 'contents'); -~~~ - -__Delete Directories__ - -~~~ php -$filesystem->deleteDir('path/to/directory'); -~~~ -The above method will delete directories recursively - -__NOTE__: All paths used by Flysystem API are relative to the adapter root directory. - -__Manage Visibility__ - -Visibility is the abstraction of file permissions across multiple platforms. Visibility can be either public or private. - -~~~ php -use League\Flysystem\AdapterInterface; - -$filesystem->write('db.backup', $backup, [ - 'visibility' => AdapterInterface::VISIBILITY_PRIVATE -]); - -// or simply - -$filesystem->write('db.backup', $backup, ['visibility' => 'private']); -~~~ - -You can also change and check visibility of existing files - -~~~ php -if ($filesystem->getVisibility('secret.txt') === 'private') { - $filesystem->setVisibility('secret.txt', 'public'); -} -~~~ - -## Global visibility setting - -You can set the visibility as a default, which prevents you from setting it all over the place. - -~~~ php -$filesystem = new League\Flysystem\Filesystem($adapter, [ - 'visibility' => AdapterInterface::VISIBILITY_PRIVATE -]); -~~~ - -__List Contents__ - -~~~ php -$contents = $filesystem->listContents(); -~~~ - -The result of a contents listing is a collection of arrays containing all the metadata the file manager knows at that time. By default you'll receive path info and file type. Additional info could be supplied by default depending on the adapter used. - -Example: - -~~~ php -foreach ($contents as $object) { - echo $object['basename'].' is located at'.$object['path'].' and is a '.$object['type']; -} -~~~ - -By default Flysystem lists the top directory non-recursively. You can supply a directory name and recursive boolean to get more precise results - -~~~ php -$contents = $filesystem->listContents('some/dir', true); -~~~ - -__List paths__ - -~~~ php -$filesystem->addPlugin(new ListPaths()); - -$paths = $filesystem->listPaths(); - -foreach ($paths as $path) { - echo $path; -} -~~~ - -__List with ensured presence of specific metadata__ - -~~~ php -$listing = $filesystem->listWith(['mimetype', 'size', 'timestamp'], 'optional/path/to/dir', true); - -foreach ($listing as $object) { - echo $object['path'].' has mimetype: '.$object['mimetype']; -} -~~~ - -__Get file into with explicit metadata__ - -~~~ php -$info = $filesystem->getWithMetadata('path/to/file.txt', ['timestamp', 'mimetype']); -echo $info['mimetype']; -echo $info['timestamp']; -~~~ - -__NOTE__: This requires the `League\Flysystem\Plugin\GetWithMetadata` plugin. - -## Using streams for reads and writes - -

    -Some SDK's close streams after consuming them, therefore, before calling fclose on the resource, check if it's still valid using is_resource. -

    - -~~~ php -$stream = fopen('/path/to/database.backup', 'r+'); -$filesystem->writeStream('backups/'.strftime('%G-%m-%d').'.backup', $stream); - -// Using write you can also directly set the visibility -$filesystem->writeStream('backups/'.strftime('%G-%m-%d').'.backup', $stream, [ - 'visibility' => AdapterInterface::VISIBILITY_PRIVATE -]); - -if (is_resource($stream)) { - fclose($stream); -} - -// Or update a file with stream contents -$filesystem->updateStream('backups/'.strftime('%G-%m-%d').'.backup', $stream); - -// Retrieve a read-stream -$stream = $filesystem->readStream('something/is/here.ext'); -$contents = stream_get_contents($stream); -fclose($stream); - -// Create or overwrite using a stream. -$putStream = tmpfile(); -fwrite($putStream, $contents); -rewind($putStream); -$filesystem->putStream('somewhere/here.txt', $putStream); - -if (is_resource($putStream)) { - fclose($putStream); -} -~~~ diff --git a/vendor/league/flysystem/docs/caching.md b/vendor/league/flysystem/docs/caching.md deleted file mode 100644 index 55531cc1..00000000 --- a/vendor/league/flysystem/docs/caching.md +++ /dev/null @@ -1,126 +0,0 @@ ---- -layout: default -permalink: /caching/ -title: Caching ---- - -# Caching - -File system I/O is slow, so Flysystem uses cached file system meta-data to boost performance. When your application needs to scale you can also choose to use a (shared) persistent caching solution for this. -Or enable a per request caching (recommended). - -## Installing the adapter cache decorator - -~~~bash -composer require league/flysystem-cached-adapter -~~~ - -This package supplies an Adapter decorator which acts as a caching proxy. - -The CachedAdapter (the decorator) caches anything but the file contents. This keeps the cache small enough to be beneficial and covers all the file system inspection operations. - -## Memory Caching - -The easiest way to boost the performance of Flysystem is to add Memory caching. -This type of caching will cache everything in the lifetime of the current process (cli-job or http-request). -Setting it up is easy: - -~~~ php -use League\Flysystem\Filesystem; -use League\Flysystem\Adapter\Local as Adapter; -use League\Flysystem\Cached\CachedAdapter; -use League\Flysystem\Cached\Storage\Memory as MemoryStore; - -// Create the adapter -$localAdapter = new Local('/path/to/root'); - -// Create the cache store -$cacheStore = new MemoryStore(); - -// Decorate the adapter -$adapter = new CachedAdapter($localAdapter, $cacheStore); - -// And use that to create the file system -$filesystem = new Filesystem($adapter); -~~~ - -You can now use the file system as you would have before, but caching will be done for you on the fly. - -## Persistent Caching - -The following examples demonstrate how you can setup persistent meta-data caching: - -## Predis Caching Setup - -~~~ php -use League\Flysystem\Filesystem; -use League\Flysystem\Adapter\Local as Adapter; -use League\Flysystem\Cached\CachedAdapter; -use League\Flysystem\Cached\Storage\Predis as PredisStore; - -$adapter = new CachedAdapter(new Adapter(__DIR__.'/path/to/root'), new PredisStore); -$filesystem = new Filesystem($adapter); - -// Or supply a client -$client = new Predis\Client; -$adapter = new CachedAdapter(new Adapter(__DIR__.'/path/to/root'), new PredisStore($client)); -$filesystem = new Filesystem($adapter); -~~~ - -## Memcached Caching Setup - -~~~ php -use League\Flysystem\Filesystem; -use League\Flysystem\Adapter\Local as Adapter; -use League\Flysystem\Cached\CachedAdapter; -use League\Flysystem\Cached\Storage\Memcached as MemcachedStore; - -$memcached = new Memcached; -$memcached->addServer('localhost', 11211); - -$adapter = new CachedAdapter( - new Adapter(__DIR__.'/path/to/root'), - new MemcachedStore($memcached, 'storageKey', 300) -); -$filesystem = new Filesystem($adapter); -// Storage Key and expire time are optional -~~~ - -## Adapter Caching Setup - -~~~ php -use Dropbox\Client; -use League\Flysystem\Filesystem; -use League\Flysystem\Adapter\Dropbox; -use League\Flysystem\Adapter\Local; -use League\Flysystem\Cached\CachedAdapter; -use League\Flysystem\Cached\Storage\Adapter; - -$client = new Client('token', 'app'); -$dropbox = new Dropbox($client, 'prefix'); - -$local = new Local('path'); -$cache = new Adapter($local, 'file', 300); -$adapter = new CachedAdapter($dropbox, $cache); -$filesystem = new Filesystem($adapter); -~~~ - -## Stash Caching Setup - -~~~ php -use Stash\Pool; -use League\Flysystem\Adapter\Local as Adapter; -use League\Flysystem\Cached\CachedAdapter; -use League\Flysystem\Cached\Storage\Stash as StashStore; - -$pool = new Pool(); -// you can optionally pass a driver (recommended, default: in-memory driver) - -$cache = new StashStore($pool, 'storageKey', 300); -// Storage Key and expire time are optional - -$adapter = new CachedAdapter(new Adapter(__DIR__.'/path/to/root'), $cache); -$filesystem = new Filesystem($adapter); -~~~ - -For list of drivers and configuration options check their [documentation](http://www.stashphp.com/Drivers.html). diff --git a/vendor/league/flysystem/docs/core-concepts.md b/vendor/league/flysystem/docs/core-concepts.md deleted file mode 100644 index 1d171de6..00000000 --- a/vendor/league/flysystem/docs/core-concepts.md +++ /dev/null @@ -1,71 +0,0 @@ ---- -layout: default -permalink: /core-concepts/ -title: Core Concepts ---- - -# Core concepts - -In order to better understand how and why Flysystem works -the way it does, several concepts require some explanation. - -## Overview - -* [Focus/Goal](#focus) -* [Adapters](#adapters) -* [Relative Paths](#relative-paths) -* [Files first](#files-first) - -## Focus - -Flysystem's focus is to provide a standardized interface to working -with filesystems. We've searched for common ground across various -filesystems and implemented that in a cross-filesystem-compatible way. -This also means that we often don't support filesystem specific things. -This limitation is by design. - -## Adapters - -The main entry point for the file system API is the -FilesystemInterface. When working with file systems, this is -the class you'll want to be talking to. - -Flysystem works the way it does because of its use of the -adapter pattern. The inconsistencies of the different -filesystems are eliminated in these adapters. - -While adapters have a public interface (publicly accessible -methods), they should be considered __internal__. - -Every adapter should always be wrapped in a `League\Flysystem\Filesystem` -class: - -```php -$filesystem = new League\Flysystem\Filesystem($yourAdapter) -``` - -## Relative paths - -Portability is a very important concept within Flysystem. In order -to roll out this aspect to the fullest, all paths in Flysystem are -relative. File system root paths, whether remote or local, are viewed -as endpoints. Because of this, file systems are movable independently. -This allows parts of the application file handling to move to other -storage types, while the majority is in a centralized location. - -Like the storage type, root paths are an implementation detail. When -root paths are defined as configuration, the stability of your code -improves. - -## Files first, directories second. - -Flysystem has a files first approach. Storage systems like AWS S3 -are linear file systems, this means the path to a file is used as an -identifier, rather than a representation of all the directories it's -nested in. - -This means directories are second class citizens. Because of this, -directories will be automatically created on file systems that require -them when writing files. Not only does this make handling writes a lot -easier, it also ensures a consistent behaviors across all file system -types. diff --git a/vendor/league/flysystem/docs/creating-an-adapter.md b/vendor/league/flysystem/docs/creating-an-adapter.md deleted file mode 100644 index 592b71a3..00000000 --- a/vendor/league/flysystem/docs/creating-an-adapter.md +++ /dev/null @@ -1,59 +0,0 @@ ---- -layout: default -permalink: /creating-an-adapter/ -title: Creating an adapter ---- - -# Creating an adapter - -If you want to address a file system, and there's no -adapter available, you'll need to create your own. - -## What is an adapter - -An adapter can be seen as a plug - it bridges the gap -between initially incompatible API's. The job of the adapter -is to translate requests into calls the file system -understands and re-format responses to comply with -the interface of the generic file system. - -An adapter should __NEVER__ be used directly. It should -__ONLY__ be used to create a `League\Flysystem\FilesystemInterface` -implementation instance. - -## The main interface to implement - -An adapter is required to be an implementation of -`League\Flysystem\AdapterInterface`. This interface -dictates all the methods that need to be implemented. -The interface of an adapter is similar to the -`League\Flysystem\FilesystemInterface`, the method -names are the same, but the response is often different. - -Responses from adapters are often arrays containing the -requested value. This is done because many calls to -file systems return more values than initially requested -by the client. In order to be able to optimize file system -handling, all metadata is returned. For instance, when a -`listContents` call not only returns the paths, but also -timestamps or other related metadata, this information is -not lost. This information is returned through metadata, allowing -caching decorators to pick it up, and store for further use. - -### Response values - -key | description | type ------------ | ------------------------ | ----------- -type | `file` or `dir` | `string` -path | path to the file or dir | `string` -contents | file contents | `string` -stream | file contents | `resource` -visibility | `public` or `private` | `string` -timestamp | modified time | `integer` - -## Sharing the wealth - -Have you created an adapter? Be sure to let us know! -Either create an issue on the GitHub repository, or -send a PR adding a link to the README. Contributions -are always very welcome. diff --git a/vendor/league/flysystem/docs/index.md b/vendor/league/flysystem/docs/index.md deleted file mode 100644 index ccb810f8..00000000 --- a/vendor/league/flysystem/docs/index.md +++ /dev/null @@ -1,49 +0,0 @@ ---- -layout: default -permalink: / -title: Introduction ---- - -# Introduction - -[![Author](//img.shields.io/badge/author-@frankdejonge-blue.svg?style=flat-square)](//twitter.com/frankdejonge) -[![Source Code](//img.shields.io/badge/source-thephpleague/flysystem-blue.svg?style=flat-square)](//github.com/thephpleague/flysystem) -[![Latest Version](//img.shields.io/github/tag/thephpleague/flysystem.svg?style=flat-square)](//github.com/thephpleague/flysystem/releases) -[![Software License](//img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](//github.com/thephpleague/flysystem/blob/master/LICENSE) -[![Build Status](//img.shields.io/travis/thephpleague/flysystem/master.svg?style=flat-square)](//travis-ci.org/thephpleague/flysystem) -[![Coverage Status](//img.shields.io/scrutinizer/coverage/g/thephpleague/flysystem.svg?style=flat-square)](//scrutinizer-ci.com/g/thephpleague/flysystem/code-structure) -[![Quality Score](//img.shields.io/scrutinizer/g/thephpleague/flysystem.svg?style=flat-square)](//scrutinizer-ci.com/g/thephpleague/flysystem) -[![Total Downloads](//img.shields.io/packagist/dt/league/flysystem.svg?style=flat-square)](//packagist.org/packages/league/flysystem) -![php 5.5.9+](//img.shields.io/badge/php-min%205.5.9-red.svg?style=flat-square) - -Flysystem is a filesystem abstraction which allows you to easily swap out a local filesystem for a remote one. Technical debt is reduced as is the chance of vendor lock-in. - -### Gold Sponsors - -Laravel.com - -View all the [sponsors](/sponsors/). - -## Goals - -* Have a generic API for handling common tasks across multiple file storage engines. -* Have consistent output which you can rely on. -* Integrate well with other packages/frameworks. -* Be cacheable. -* Emulate directories in systems that support none, like AwsS3. -* Support third party plugins. -* Make it easy to test your filesystem interactions. -* Support streams for big file handling - -## Development Sponsors - -In order to free up more time to work on maintenance of this package I'm looking for sponsors. -If you (or your company), want to sponsor my efforts, consider becoming a sponsor via Patreon - -Become a Patron! - -## Questions? - -Flysystem was created by Frank de Jonge, follow him on Twitter for updates: [@frankdejonge](//twitter.com/frankdejonge). - -Please submit issues on [Github](//github.com/thephpleague/flysystem). diff --git a/vendor/league/flysystem/docs/installation.md b/vendor/league/flysystem/docs/installation.md deleted file mode 100644 index f5ee8de8..00000000 --- a/vendor/league/flysystem/docs/installation.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -layout: default -permalink: /installation/ -title: Installation ---- - -# Installation - -Through Composer, obviously: - -~~~ bash -composer require league/flysystem -~~~ - -You can also use Flysystem without using Composer by registering an autoloader function: - -~~~ php -spl_autoload_register(function($class) { - $prefix = 'League\\Flysystem\\'; - - if ( ! substr($class, 0, 17) === $prefix) { - return; - } - - $class = substr($class, strlen($prefix)); - $location = __DIR__ . 'path/to/flysystem/src/' . str_replace('\\', '/', $class) . '.php'; - - if (is_file($location)) { - require_once($location); - } -}); -~~~ diff --git a/vendor/league/flysystem/docs/integrations.md b/vendor/league/flysystem/docs/integrations.md deleted file mode 100644 index 6ae1a268..00000000 --- a/vendor/league/flysystem/docs/integrations.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -layout: default -permalink: /integrations/ -title: Integrations ---- - -# Integrations - -Want to get started quickly? Check out some of these bridging packages: - -* [Laravel integration](https://github.com/GrahamCampbell/Laravel-Flysystem) -* [Symfony integration](https://github.com/1up-lab/OneupFlysystemBundle) -* [Zend Framework integration](https://github.com/bushbaby/BsbFlysystem) -* [CakePHP integration](https://github.com/WyriHaximus/FlyPie) -* [Silex integration](https://github.com/WyriHaximus/SliFly) -* [Yii 2 integration](https://github.com/creocoder/yii2-flysystem) -* [Backup manager](https://github.com/heybigname/backup-manager) - -### Other integrations - -Laravel 5 will ship with Flysystem as the underlying engine for local and remote file handling. - -### Additional Plugin/Framework Driver Integrations - - * Laravel - * [Laravel SFTP Integration](https://github.com/ragingdave/flysystem-sftp-laravel) diff --git a/vendor/league/flysystem/docs/logo/become_a_patron_button.png b/vendor/league/flysystem/docs/logo/become_a_patron_button.png deleted file mode 100644 index 291b7bcf265521a3d062024bc4f7df927ae60e8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3086 zcmcJR`9BkmAIFWY+(*dL+?r^e|W!M&&TtZ_ph&XNBavRg0g}h8!V|ABcxX=$*BNsqWDp)O|xVUNVE)p8xLXC7BeceId{rb$T*Lc!)1_sszypm3r>!FVcU zec~f=pNYeThfj`$O^(TZrE=YjUOvxZMz#HB9t3E-8;$C|cypNlCQ!+|JuS28232B^ zUlm9vEhLpnq=5mN{t|rD(SU!&+5f+wdMc{Ahp79W*_i>KYNLCsLZoDoDUq9w;AIrA zvPgWRP7gO~s_qKtZ|kcChVFcgkZi(La|N7Y({~`$z6_lAQR0WMaH~M4ZW79qKMfV; zN53Ox=nq|DFq6h#Di77!$R;S6DL91=LC_NH&1+|b0wVW}Gc7<%I}-R8hX zZXevyG~tBm%Y0f+)0=rnw3BAtZ`t%EIkwnLR@EC}D>hd(zy-Pvzm!G?&P9_rZTZ3b z4dMoSdV^I0HFk08)jr!D?hV5I8%?e1UCD;g8kweDiZ$ezlPZz3;uK4*E-%JM+IsAw zUb3E_lEq%Xxb8#iivkQTGuWHL$A~ESlCv*Db3=*tR*s8M?6+UC`yx6Z#F)X!;=j;w zu}RwaZqm>PQ0R7_cF^jURWT~PvBVA-c#eVXC9ky()mvpd)Z`-!kEV*YbBTPEcQjs= zY|!!oTU^uQwElIgK`pPRe>z_Kdg?vnP?DvyPbKc{xEk2p?B_;FYSg4LTUSBN(Z)0W z!g8R1k=wtj{}^|sZ)v+_SdlN4n(N|S7ydcnRY(2vXq9K;Zsbk$Y(tlL!!7Yi2AExc zrvCREt#P~jifiV%Qz-|&1(94~J{I36BWwZCwgoZ!1?OB;<sV{nsRP^4<>(nvJ0Bfl7 zf%a0D5h|!0J1}Kf#4A+E`DK77@+BfP$;pcPb7xAe`h4%!g#t5YK<{(^O4G#>se(wePzsPT+c$c($J)a+Q0Z4?l(rvZgY_dpa<*Y7YJJMtdb^%{5z84w^WM*6O*oTW7@&5nW%CsH`#pGZ#sKp; zyb1LkLinklXAi5Dd;aw_^QaIi0JbM~mU}B6XlT1dai5?NLmne11VdN(Q>sUU#3{(* z&L`rElLk@^cf$=fN<bsJb=nym(~ z-=}!Z){b@KBum|ogtIsOJzke=>dA7#!+)>T?K&v<-r_tI30{~wvnE2RX&CXFd%5Ms zgEFb{@qF&^1884F6W&mXs0_Y!A3FI1zC2NmM5!0=ZNuwnN?6J()#X{(5A~#-jFHzK4c9)e}=4+xt2t z9jOE%u8!p~A6{kkiUcUA@pQCFk=KnlfPJlV9KQ@9sGG|Ox*9R!)=*kBuH2zRYq7sg zZ(7Et9lxz$GvH+6ckS*&!W@0k;k5q|%P99!1916AbC%$F3MGVG}XU&$n>j&E3$|g!q-#F-yBF$$sR--Xj z`+SNFRy6Hu$gd;rRrQH;ON zYpK@!D=c%%poObFW00o{&GU^5ws*m|QB}tW9Aa6E`KR{{ww1?U$t3V8u(N(lwG~Cf z-dGd%kg|&9dLgP4%Oi4D8!Y$QLHF%4K>^%nLobzVaBPFuKkKxq0Y+UbAkld4n5Ncq z-_8bKXc3+8skFGljZM;xO;UrQ7Tp?fa*^_IZF$Blu_sQ z_&fKawrraxR~b@8TKbl093E2;rN-4V{aW^KWmT7MsE3nHKXcOAB`~%IYA66vRlP=B zc|qq%{XXh>4M2V!Zh}80+W{*aIzTy<7cRd zi)Mi!nPa7&U?}ZJM&r@QbK63!iSm+r-8KE82=){QO0EhAxU0RYBJ^*cl^O2rUyO6* z0ONv5xC~ozbyzO`DtZmx7)DF6j;sj&o!Ms|?)*fVb{$vgzcCYLBOXObJVq?-yz$t^ z!|u+c;Na~=NtMDb2BNND_UNdCk>KAa$my;5mC*$$QkDLX6PVqqQ6#OIwlUnK9zAe9 zs>Aaw41IBW{#*T>BA_8#G=FL{#>qZ&jB*4cIZgZ$N8-P@vg7wn(M?#`) z&W0#lh#|@SYJcFAggA}HxfTY;rezHSFAXT7$EXNhZ`$x1e|7?b=DGGWEVOa5B1dsM z>RU9HZdU2K(&^Ra%vHk`GCN<{C@us5Hl?jjO=4p3rm+%|KdB~u(FL|FaGSt>!NEj|Pl&pbwwueHytK=mhtOkjx5l6CPWu>72F zEu)h4e0#^Z*o%Ru2tM9S;nXVZZi@WbI`qgTl6+Sr92T+M>v-R7b}B)~4d18!MLHw) z;UcAS#`EK}!?K3Ql$T&~z8-}+CO``%onI5zIZRtN3B-L#&~xF^nw+_yhX zu#ewq*OncOD9gi*O3r`%qfvd-I@@@DF)7nR0=WemeUrDRD)!?jMn`lwE7H7_XD!E@ zJSWn+(UX=09cAwu;9G7Twa`{VJNaxflS9K3twVn0cQp6AS*?Kt%D9 z+u5=T{7cz{855I$#+k1dxW_@6@y8o^Cm^l#Lnq`OvQ!>>pV#V;072Q_9w7>)DO7{4 zOH50^=|hS~UeKyF5Fa#ih3r*Lmc>gPQhQN(fh&anrXoB$W+doR`@b~RH)I1BJ$x?R zZT#z%s_(zF%AT)~KFaISlW|Rc^NN)AAqn0M{WF}wcQ}*ZHRSAS3W5_30E*6&<7r2l S8x99PkF}+}MV*;%;{O2Ee#b2U diff --git a/vendor/league/flysystem/docs/logo/become_a_patron_button@2x.png b/vendor/league/flysystem/docs/logo/become_a_patron_button@2x.png deleted file mode 100644 index 5443ec96319d128bc1f2c8cf348f97c4565c5cc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6579 zcmeI1XHZjLwD#dIC`D9yk*-Jw>AgztK?qeq2q2*;h!8*`AiWBNra_uW4TO%A0Mc6k zAv6h{P>l56Uer(T{dT|KnKkE}nKNrW&)R#Ry=Q(W%E&;If{clbfPjEPTT9KDfPk>_ z`q_!(=Jgd(Li6GJM&zubuR=h8OdvmhPE0_+2-a3pG4UhB!*7kvcEGx~w6^jl?es*r z_TvdZVgv4K7jitT;NWQGAfl6WzHy)Ac@=5EWLV;-s)rxDgoq~Jzq|3?fTw^_Z*A62 zRjSh@6v;c6?6d{n`Vo-#VSoB4dLIiNLVgw(V;Vfy_>5Q`g3E3ESh_Rvp5QM%;rY%?_K9ZzM`L;4~|JGJ=(2@J7p_0x5 z^<7HAW1fSSNTPqUb0;{9yfQ4fb+o8s)Zu9rRh(7GIhsukYY_0k(rpJ+u%nx3`390( zgW;YAYmPowKHZ5Z3_SRv<~gLjs(JhG%qeq_>{}<+geKMXD=u$A8H!#l-4`-|C>H70 z7336I8Tp~zY4jQ+UmRD3muqVLSrY`of%kZ7*&QTup~rQ-a~>0^F44++zSAGaHa3k; zCY-4U1Ikw_Uvm5_e?%%ScVqm5$!YcjvC;Z_wpi`RDfNJoGW924FS$oX`=>{wZ~kqj zM<%$PO!TV4p=ZWU$7(0~xz@Ve9JeKCq&79C{oe|b)yz&TR`;BF)-(4C9dEP)e3pD( z&Z6JeiQ3RQd27W}0&!^{&F@e(x$T1W4_*6VIQ_%=bH5FEQERHj(El<*jcv%)_5@$V zr9&7zbgy;KHqCX1Xlj^qneC`zIc90%)%(Uy~OF~J7%Z?jiQ@a4%t1c+_lRZIf`;} z%nho3E|f{}2EM!*Cg$NtNZ&QO3HO`X(!j3H#HHY4lO)o<*h1O_@<==z5iLd~-#P0q z{6`HHEUR?D$z=n9U|_-S=OJ!?Tp8F49sm?8U>jfg9Av=>)Spc{haYKoJiTXha_$|~ zw*s=P649?Vh3<2#HdfpTNIcRtPQ#|ok(lGTlq{u$D}xh= z-|@UnY#5zF{6a<%4Vo8W|z^u=lZI2ZW^urJnwS#ig% ztDR&B`E%Dqc2{i|gJti_I;J%(JKw{=_52fr0Vl%HhZj9>qXMHyc+Vo2daXS3)Qo9z zo5+RT5;Ys0BSc7c$n2e?-4&R=TV1v zXDlkaQPJwA`GlrCfuF@s8rJewM=sj6@HS%@1w6<@pJSCSKh-uWJpO_ea>l&&sB=hx zRp$1^wzEW-`LF*J0sVTpqe>V2CGQhlAVEJ!cqG~TZkJ*K?peu$O=fb`$BaM;MUr#( zH!ir@Od(y3olESk;bB8RlUCvFfyBKxAk2);wj}nG&eyAyrm{Dc_Dd1XewPZD!yFb4 zR`W(YDg}yle7)qz`zjiatR+d&RLknW@IK1jC7U}DYU`WbUxZ~n=YKmj&xNl)F!cNg zFY3^c2aj}$>W<33&1hm&@Aq#nXN5uB%ZO@@{eaI6h6ZvmQ`sw$&UDjZM4p>)Esb&u zl_ipKJ-#Q*M$Ls$rj?=5sVNk-c?aJh zNZ6vso=h0f+SdKtUcnWe&pDg!?U37)RaBmY=s#^dk^f4A_41K`b^%Vnz@43QOW%e_Q_(+fYf)fp>AdCX=R_YAQz{dy9+n(Q|tgdXG9dMo`rC<(_Pon`9ayQ3G z#=zMB8*la%coLVKdNRQy#^39$VV#LH9nYubn=*BYY!ZBvy^R=>$E_$`BBtqCkH$y) zGe&A-<$ubUddB&jIJha1U7e=sT;zrVr*q~4B0|=s)YLnI6oP`>?j-TJ#cqBx9~z-H zD534cU43fDWiburYU!ItkM)&Q)#Ze0msRWhGCp~cR1`BGa#h@QbbNADJKwOjzG-?^ zY+0qsOskuSMAVi9n*tRm2o2k3gaZ^)dzW^_42{;St9q9pHRg#U#SH3!hb{us3L^sS z2c_M!Yu|8}^r&`dHZ}E0NTX-Y{OHw!l*)Me6V#z-*xkY9mD^XU*kyhDiO5@Yo*O`o zc{S3@AX|OmkGLz4jmmom8jz44QGC#j%q|M@AL<@`R8s6qN?L~#C4;!}uSspP!=5cp z=dUyXyI$l47mBiR7txkHbjOxnHb%&OChoG`asUXN6sYG{+F9}BNo|R zO;GyzV)|~BiCamf%*NXceyL?(;8=f?o}J2<22XuZ^VDBe+ViDRU-x9;zU#@V8Z~z;^@3u$${xV-s@{7k?K$oY9tu!0-GA z+w{+x9(2}z8D2|h<lya-6V)>5kG8G62R`MS>kYd-GhPwq zwEGeAI(7$c$CEdZelj}{6Aa!C!z3$Z>gJ+#*lkWYy&%p3IR$v7QHW8opxsx7OK`U0 zRH9zhp&7DvKHej$IYb$yx*Om`^*YGyQabIbz>O4tt$T&EN@?slb8q|IqLQ^XEoK1|;;@Owhk3YB5?7gZvJXNdIY6Q+ph*y3| zU;$+fP++@0cII}(X8PD8>zm+(z2^%YRty$xvA50D?^l8iW2UFc?Da?l)oQgMB5qQ_EfC6>WEL9BI`VTRQlsAUx zLAPxT2_w1E1cneqB8T$|n2xHbM$Hr#g z>7PB|XgYe61hr5p1^3d9Ij{9)nQ+ax#V1Qi$7%nh=uA zRhPjOIq4`NaSJA5%LOhjj*5Kde;^&WL79am=YO;zislJyN6os3_A&`LLTE+WXAZFd z!QzEH;IWi-J!ttZtJ&~I!fJBX1?UR{B^c2+HuJ`rtYf1ZuA!t2rIeJR3|)s(&FeR|gX zc}XeH2&Z#5V1P$whOeK9Ic}DIkoBy!l!|P8m?dSL8bOu89YbWHTGkUHywx_)VBT)F z;kw$Xp-C{(pm;vX5a79o=dF(|J7=z0GM|=veeObGD`XkAU0YntZ-_6PAc0QgbC_Tx z+6Lsblw`pKqno(T{EXP32QE{Ila_g#?x-^@c`GkE4jOQLtfECaSbCUr*xtbE#|nVk zV_G%C9w9)UqC2Nl;+^WevhW`8-o#XblV_u5y$U^9sVL(CE^wPkk$=-j`j)6 zmj29-#21<EgGyrmr}VCJOF3(J{vJfz%lD|XX&j}87!o! z7(X^4UvNT7WJ`;b(e8hJ<*LYdzzc*;ssvWV$@IjyE@(d3GX_4d9QwMD2umAxi6hG3 ze$ZbPJfIX!4H9ueqKq9GgM&PP57aROKgg~!iKnA@5uXOU2;X1@(D5woDD2xu$(zvdJAp)}AQr&P6I* zmDNf!s@LbZHP*Z-fT~i$u8KT2?sSwA)Ro>YD378+KsVHGaXGa zf6=F9r6@FgPZju<8odMz+3%0osyYggTwO@W+dgrQ@{0<;zl*t37xWu)GOdKH`$Vr_ z9k>ni3r4YYe0XQSlvfQ|$x^z?qZKqfQ#g}RkSg#<4VzxL@SV}`U3s-Ylwl;^3NiRz zD&rysgb=0*ui&MPF^_6afDU{@AWx=D?iaHsT%8_4h4JjJ>s`FS_lp*4moGLO8mY>6 z7N1*%Otps+TOLzgEeXFmA(P@0($p$8#jslj>t8xHCRhefcz=02#;{peig!2eqc+^L z*JmIWJFRZA)oL0TSyjllIFWejyi^J9$4~v}9vrkz%`l^@mO2}G7`9Tzl0m_&e@|Ep zAm=E@K1d$Z**|75DUU3Da3hrK9u`Pg--bLXX@$P-`;&GKVA;?OcZ=vM&foeRZ0mUZQe9v zRMc8c{^=J;4O~Tg3jQgmtq?VFIpUasT8v^JzsL1uU_e!xL&UHv#57QLT4mt(9<$mp z_s`TCqXi_{2RaYN#{6x(ozL@^H%fHi>{()?dOLgD=bEMzlcyE})_6N%L*&xlYwI4$ z3<8=XNkYRrXPTD|0~1*D`93u_zaKCM-dxuSCeL4PJIgmSCf3#NEwHwnaz>qT%k>mw zW;PEw%a}>Vhr)%QHYk3A+`5tyMV4EPuW#VE5}J&j0P>tjxq#!xXDoac4k{XNeH7w5 z5Q#V!Iv3WqqR#FN8VfUr@-k9eht0C1IUhvdgi9s?6|5r2!C)}DuYddyvbN(dnkQ)h zxG^D6s2_DP9KYQbpal(vJISG2-1aR}2f<~KU-I%-FvOBXcw0?c#xtH=X|ql0PTYE3 zMTj1I_+2!J`bd9~ee_lfg)tXd5%v5XK4 zl#kfV+8)yvg$tlIhw}u4!diSdOVYU2rub29rqCBb@e$3j?|-d)pR+&HkvUY!^wgDW z#&s|D@pc;8oakVCLz)gpIPTK&V_F--3v0jlR=ATe{VtQa4 z5r~GlQvGA&B+%=uF%Ww$7IfEQKGH0y^q#eM(bT0vsu1;+o85yMo9nIeacYZKe#Tw# z)KoWpUaQHOm=yfEy%CkH>Zn1vPig0Er6-9s-a)0Nmo*!RM~2$<`J%wocydIw=)mF& zR~Gp42LM2r$O2XUguyAk&pd|RMdW)9v;38@GqoDY9)b|-3#I8?zN}041_=RcE0VNV z7TDk~2K?ffdIlZf{p3pNulOlGd&|P0-$OVfRP~Dag6o{9=eer< zw)_2S)$4PV!fYywvQ-7wyBgIFBwEX~yLZw3@T-|{{%NteP|4&ov$Q9u>hE^_>HJTd zK8AFYC(aIU;^q(ur8$GAR@HkeEA`tCDjBr0zTb18NP@a037)zvN&9F6m5}^&3R?$mkJ$ zw^kUnQZ_#oTn1eOAQh@Ag%<%bC8Cbv^cAGyu%)4wuFul69K>E-$OoLfd=o8+d68-s z+u_q3{}}P9_@)HFXOze!h3?F8?jDXf1n{<|I+?5>U5<$%CZPEp7((tyk z(mXmnsoM~Y*fn6ZhkhCaH+-`H<~3~_GN93Qc?4ns;J>sT5_ihbT}3-l**@BJw2Eh} z>l~+ndqk7m$x<5mMT}Ki{+RElR8sA3p3kJwvn@-549~qu0RYYF^w_>vETI`RXt8+k z7!lzlb~%q0=x{t*lOz)Pe#ESTF{rV>U!2azIDK-vF6%y-9 zaYqPM;fe;Lsvm?)IUw{fu--d3moCTVz)J@o=d;kn=B2YUW`>xdrKr>W`X~OU2;0Rh z;tXr-l!v?^hOG}hAbF@BVt!mEmf_p>EOk7ZT1&&$iLi#ma))Q+oj-qa=rP1PVmxZG z*QPe%NC)(0ZUs&nn-+Jc#8_-IjOgClO+xuA3P3o!D+#q|@Lw{$3?t~0gWws*$p2t# z>3>&ULM`_xY@AUHfzPzCQbtmWC2BAuS;e4i2%3vb+us z&fTcn=k)t{w^t>nw-vWHTsv8HSsa|IIHF67zi@Ea^Htx~Lr0@O5P~$E~l!mbNzrXpfcRus%KlqQKIKgKg$>I1re{eD0f)M&I zh<~lGcYxtMEPm1}Pd zkHc5?`WD4H_ud{ujA0VBuBP^mx4)Qd{C3#|9+s3RpzL_nZVYqp1<$xkHt%-JGN9N5h+HB&tj$C zaYS1BlINCtL3^Ixa4b#N?gg~&vu|NA<;H6#HiH1R1ez;W*|54G{u~VV5;2%VRT%-GJ zHd_qSZIDl{(eK7-LOhbX>tPhzp7FTNRW?bi24GK5-1cx*K%0G1M)EWjELmiwUSEZr zxaJ`ICh_owVYEZ3reis*RFzxv%5;9xMHl<*ragncI5a34GOL8I1SDhM50t-a2=22P zUuaQrTP-JpUzMv_fS{OpF(x}>c5yZ94>;J9$FJJF~5>u<@)>s-MnZ2`hxyjVi zTz6KPRbl<(viy^N@u&|+KUttM=U*bO3*w|X`eHhUZiHWitmmzBIP@^cmu=XcU2L9lzXcyrIlP&wO&_>*mM*=}nVhuz z_QIsi3QZK~zxLbgyHDG5%8eYJdh>N2)y96)^1Oue=;MGW)=6VN%bSGNDqK<3+I>f| zHFyNtuQ>mL0m{j}cQ*g1>hZJ{<2R#ClmiXw9A&UGcKF8kV9F~Ibj7`3g5@gm~zf()V-#a7KzZ%<;bX`!Uq81K6X_SF!-($pf3qS|W z8npxHf^$12RV&~29uA*3RCiQw0zX~xro6cc6z=dU$)|l)SAw$B0~#8feYHg$4&GJ# z2y^@e->#yX9>6~MWISCl+z#TO$UOf5j3DPUg>6iV6N2gz^8#1ym zQOQ5v{}uJ{u-kg3JJ(VDiGQZB%qaoEgmH_G*G5kXS!Q=Am`A8Sfh#um`a?gmF&a=W z_R`e&TT%hf2XDQK%PhDZ{qBxNBW7Y&g~d~PV;crGsP}LT0sfvEu)WZE0SEXTETq3m z9*95oOF>7bSGP_ErE|Wri(OR)o5TQ@BJ#R7NOfM#z8x1o#!aBqV_0^maSyEo8LVew z_5%Q-)yWm2459aq79WtyLCc zRXX}}bp4y&$>(%|!3C+wYwGwCl5%cQxA_(H{)BO zR~nh+2M-9S4hikP1+MVV_)Q1R_okQAnnv>GiOwMgvDN+5rnNg|gm+dbz5p3OFZTMx zV*%*|Q^?ZuX5fXiGu6?f`=Ywj(T}KMOoU<>9WZsEW8ePud@vayAOa&=Cp7N)q-69>Avr7MwZ)vf7# zZywd$c_23X8oF6grURZp77j}Du3I&G7nlTVwcRh{$PH9j3IP(Om?|>YjmF&c9yp`# z>1{_K{RW=~#!Oc0)(neYr=%4(*i0`w*5wRhev4Kt#erWs7iD=LbZGL0RHxWzQ61HX zZ@P$6i2;Uw@Cl-kxy@F4oYddACzIEBT}Lk#;IcJtZOT5Qo+FpY5BT@4s=$}y^UA{` z?j?M$7i%;Vmse9Gq;HJv4)hH;rxh4ns!Z&BCKEWvV_4!+u+*AcNJBq+uy;#ccZYd= zNomCC;SF?|T7TJ9ZP@y0mX@GRwcFTz6*x9iu@+Vs#ue;+ z(%$B}P%owGH`g%U@_lK$Z*<-+1nAdy2A#>5sv%-MfWr>9>Pxx-l1d}^yRP(-0I-!N z<#R8C_C0-%%LvH4=JyxJM_e&M=qX!rYBA$+@3ZGm1D!94-%txs+x}3ydu^7SzOrib z`pe}SuM;+iBn8CD?>(1aaB`!Vfyj(+LhX5S4H@ztXp0kCstTs>%4=Hb07+no%S2Xc zxR|bXty;<>?pI$ItrYpM-swLnBlRiW4p zKjT?j<6S9Wik;MvZ-V@;XSVef_d8cGo}lIk{{A3LAJSfsKC%iuMMibcpqEw5={}=& zSBs+1)&(7{iq8N?Oe#Aq{nJLUphJxJAYSQVwiIjAapd<76ucO5gq18sd0P)%Uml)C z3`z<4CL9X$_g7OUxX>W>5G~u~OKZRKjLgoqm_Jn8zjXd&^~72&X{ueT#P{gbIXycp09LBqoTFEn#jh`$xSZL8ZbYjjSOXsZbuGNDBp~)Zp0AX$UV+|4GXU$# z)^@X#TWIZ)kzsaT)-`!E1De>8`?5YUC)kwk2#se?cS<755zRv8p0AY^{M5;{I!GO; zFWlIgwN2S)6?&&FCTYbYsXBjo&I#?QYUs;xLilAFcoVGHWfbeWxdsWghqZrc=x>Yx zY=d1dT%L(9=vBI^E;#**sCdERDK19wiYucjOq-1Boum{Hp(sBc14jtaN1_IJb-}*z zv-U$j&QbUTr*p9+?{D_>)txRsEai)*dj-_C8iSxouFJ9X-qXy{@p8*WUfT6)AW$X1 zH}0S{l+S~QIaV%5?P(*zQ5UOlre)RF0%=DacUC3@LqRTYkLxyUNmoCGC0oQc1)jv; zIL4}cn5x>>MGo+0yL*~ zxg3%hHzR<>+POW*cl@Q;ld~@8d)!jK35hp_#8~(HLI*jLl%P?Dx zM3X3D&5Bil-@@>5f9CaA0+0mHRp)$}e9li>Y7;_p3zZJ`6bVlfxXH`GV|pohoA=6; z?!E0*;DNXjv;G{~wU-!=xSPkAvlD!*;x=w$IAdp)-rCx#Oi&*sdA8j~wn?Ua86tEv z;FX(K;#61;e~=h<(&Eqye=9^3rS3B9ri-^NT~3=CwW=jHivry^s8|CX}JrgE1DW{x&u%iR+^6 zhM2+i#AezA7F#L$?F(uNi6eE|7~TSR6ad)aiG?{W7uY+Pk4c#i%a1jfhpz=rsjZLD zw__Q9rbPI)k3oqBE1m$}pZjchh`d2mw<(LN7KI)05=Rs~KJ4R$rP>~aR1_eN-E5|YOy}AW%@2~Yyt;wSHLUJA?g?|7e0>3F zZp=w(r1G$LBu{oMnl(nJ7jWS4Iof!$e#EjTclf6!Da>yC40+x6n}TLKuQ4_OFKk?aNA~hF-s}rnN53m%Qo-v4T`+0i>28+vr}36?bXmcvPa|6 zQOcTXk`|*&Pb2c;rC}|dtM0~MuElx3{Tk>BF{9b4CFW(bOQt&k&EC19_;+T{jvpm_o zqpw)p7GfVotacodS|mk385SXHjM$fm{62yqQVtsILQZ-BA1i{?3=fqng$_RPDXelu zNos}Dm4@t;@@+SkY~DDSq<(ILiM-*Y0Ftz@)nOD;tBYzb_GruoV$j3>*@hCahf2nB z#{&wAXTGA#>*@mK8;C0QR+6@1}Oj59{exSLD_<-}tP8E%DCRSxC<#iC9;u3gYI~;5dJm_HiyP&TI>T5^?qrw!o!3_Z?r@8bp!b658>VNyfj-P}+xp5zqz1(6BX zuejZ>Yc+dL+at60>85fC-4YZOP|S~jc^#H|4vGKfNFP%M(hur#*C@iB-&VoOWBn4z z7Lu|1P0Fq}<1=mBgBHD=F`~(zyqfo7 zMU=p*Z8~Fk`Zm+%wu6vZTslYVgdXS##=KK~EcF+3NiX@0*BN$zux@{K6Txqtb%aU! zF0JB8HL#jDBnC?NYS&hc0y|Xo&yts&cc`u}#UYnF0(8{ns64aF)^4sj;s8;;Bhs66 z8_R72sG{=ldU^WxfWi7Cp8)zr{we!=5aP1DkqvFvd1rURF>fC^;sd(fvovKOJfLQ{ z(GI?sE%F0XyHGx)WNY;BnA^Z%Mdr5P9Tx?>FZfK{-aK1xQ(kQ-oO+bnsO`otTiTyV z8>v|=WHXfXD)qD{@s|ip0~6KE75CPsY~gru^x9pK$U@|v$~vw)@~N4BlbYjwt>FQ$ zS;3tp&55TqD{WihvnDW^*kkX0)Ij=Z)6uEmfk+#}Rrau|ua@9#0nI1E;#xtDx_;Jl zjBIjIoS)Pbe(8Ie_XO@w)jqgoqcjTbci?IvksR&T~2cot~}fFc>+IQA(Ij zIR6jcm!|6Gy(#6K!XiI_Y>xz|>0`aWc#HO_B~} z|Efsa&ABu5Y>de5dqY7Y|Bo-mZ4VC5(uYSK33Qn@XF3}cnjBg$SmqL^qP4SwU6P%j zxr`-u^E@axzlh?ORDzcBySs3NjE`BxcaP{zpO9z^k%H>>UZbBC$L=r5T-Qn-T)I2P z6?Xu_J4%yp$-87S?35kw7>)a~H(6=v>x-#q#fz}1NE8Ap^H4^gLJk~n%G0z;q5^vK zILv>qsWH3Rz&_w;-g@ygF-xOz8=r5+D)2e}xI0@rTe}|Y_Oxvd7ARLo8a;O$#8X(? zeI$bTDbpYzTB^e;>JB^3~PE+T-#&X8wHMS9s@W&P?z`Ldj!xWeurZJd!2BX0SOXgFnBN|T!YZKE*YpaJcd zj=wbMvFf1~({bQQ066`$o`1~0K+@vSI4(4m=y>2?n4kr2&YsskK#XnEGIlI)A$kx2 zDkJzi=~qNCzbHqPW_r#hW?pt~4-~JFywsiXgDQ}(=VX2B0eNJK!cCIm-7~uwNn0OTl*rxIlO{pQT=zMXBWkqba7t)6SE)9 z(u!?`XSrF2K4^={5a9DYdGJv+o4=BFloSI6uI}TLJw)4Pz0olJSy3{)DP;R zqfO=R;*~2ZP=)!5%ITucEPxqRq;*oE_6ppiqo+Yh;NZT!fk{)_`VRIDct5-7Z3FFNQ1cs0=9Q+a|VhE3K_M{-S6*S2SY8*1$gHKdOQfZCxYRDE&0?bl927Ip;;9U>hCaGE zy%+_apIJhpyvf?R0{iM>Ya+2pt!rmLtbRHfiL%T(tw>bhm+p%(!b}cNRclif>H3WY zpZ36G+t<02_7e{zp&J1o268tE1TMM*0V;t!aq;#i{w4)@87``K_9PIh`%6zw1n;$t z*uzmN(#CU#AYNBe>-pDo=ZGnuXC*&ZLrb0Nx-*rPTyN-z3+ggh0hgxS5+_144ugx0 zWhIR4RETEK7Dl_E{M`?!X7|FlkW?PF7%RycQ&*-!QSp0)ZsI&&y$(|V?on8cG(bbzMcJ`tI{c$+jq!g(43&9rW|3||A)rsFP!lC8 zH2L#J>tB+D&}?T~oQlbWz2C3*4o}X}-wj)rC65}`(+1Q6DulA?<;GaBYt4J@aVqxw zFG&JZu-|PL^Vq4lA|dHP=nqb~q1BOy=bF1a;Lce5L3_J(HP^;&2wHUN8G?tQniFDk z<5A2@$Q6` z8B-s*qZwd>>Zxm_9ZfyuIPY?4)annZL*%?Z&Nq`dY-+ zth?jEoTRH?-(S$V%npwkF5M#`_nal|2%}Zial^Me50py3^7x^V2fDYE@{EY>H!ks) z#~W=CGzS-3hC=Wt?;1>-v9q$LIgs9?7}MQGk|f{BiEaOa4%tJ%jE<*WD?FYQ3e2vo z9y~`{Vp>YCdos+f%g_(X`EB*7Do!%0MY2|$X?SH;K~R~)4>c%1q`(Qc0-pi$a1v6A zAdMptqLWUXbirmFIqaqmOq?3;)TV;{8}4%^nn`Qtf2C>M&W;;AFGTA!r{;lHYt>(U z>wz_paQi>o=wa7m`7IlTVVWXJ>NoV*^zk$f=9|JymsZ?jC1O3IE%r5&6{*MOx8mIl_^FD=J=^T)i_^qOcJ~7ECl{I;&%8ac zRRE#q43vy z3@)Xx|+eoK?bs@`Z6jFJAG%DXAXYkE>265Gwm;wIme5av-Z*Ws9HN?rB z;d@h}M+V$g@tzFbGX9RkV`LuuTF%DJeOFty3pc_KR)5|v^Jxc`V-)5I1nI5|QXo_` zn|tgCeJnF?6Bcn>+rGB6t?Io1)A3kFWxkthP!M);p?aPp;%*B+hjT`ymOfI^xgwu! zgU$H2M6`cn87Hugtk1aDHBW!(tamiAJSGsj(;>q?4DV1EYu!rL{oIg$C{btg;t0Sx zt}Fv&eGYnUQtz^c&G@CjU!gM&5}lA0a?i-LTiz)*lo>T%I~AQ^6(#R@Pjg!k_qJF! zzV#K+e@i;qr{0XajTtZ+yI2l$>dO4l(j^+jnrga+WGMD9IP#Kmo*0s9DdJ`srkmd~ zF?_tb#~zoB;R}Pg3Jp~W?@H!nVj27uo5u4dMC(M|>K%_gaO9na56kVm~! z%sW4IN)%q)zb(t{oQr$js`E*hEk0dGzps0@rNBdSvP|$aMHx)q87f7^w|!obkU`UP za^uC3!!ATE>A0}~t#zr1B+Rw9tK{^(QubNpg>IC&e6DfxhKAk<;U6fx3qIf?l_1u; zx+8{vh9&H65R!~aEL%!c4{o$J?uE}>^PGot0i>m-i_&0bA@WJxv@^@^)-9>lOvR$} z;~Y*UvnW-0uS?O)Hd4~P1>{rcH&^aPX#m}!@7s_R^B2Ua2#uNK8jSBrA0mZ2JSr_&3OxEjODC=82R;F)!<#plX{mz4zaA>Ml4ArHH{rEzKr$ zU`M;kqN*x?yyL><^ylPtt156JTg>aYYV1LEc5TN2aYiMQWvh&W?8 zM&4=yu_QJ%1yVcDzP&D$e2v;&{-vq(G&9znI<bSP7+2F@osgnCMLeQ!CypkuII_^}jh8Ae;w7`P;FK!jnBG;trp~&>dT#Nj!)zh8b zb^4T&zVckyKce_4Zcl*iyVDEB=P58&|v&=2R zP4~)m&VS6*aBQjs1-bs|UO0bvYc<$bi1^1$@YXf*N73JcKMwAO+^v<&Nk;aozvcHJ vXV-|E|#gUwi1+&7E+-k?ni)&8^%1JscGU4f%>!=E461^v2wq diff --git a/vendor/league/flysystem/docs/logo/laravel.svg b/vendor/league/flysystem/docs/logo/laravel.svg deleted file mode 100644 index 089a52f3..00000000 --- a/vendor/league/flysystem/docs/logo/laravel.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/vendor/league/flysystem/docs/mount-manager.md b/vendor/league/flysystem/docs/mount-manager.md deleted file mode 100644 index a49da8c9..00000000 --- a/vendor/league/flysystem/docs/mount-manager.md +++ /dev/null @@ -1,80 +0,0 @@ ---- -layout: default -permalink: /mount-manager/ -title: Mount Manager ---- - -# Mount Manager - -Flysystem comes with a wrapper class to easily work with multiple file system instances -from a single object. The `League\Flysystem\MountManager` is an easy to use container allowing -you to simplify more complex cross file system interactions. - -Setting up a Mount Manager is easy: - -~~~ php -$ftp = new League\Flysystem\Filesystem($ftpAdapter); -$s3 = new League\Flysystem\Filesystem($s3Adapter); -$local = new League\Flysystem\Filesystem($localAdapter); - -// Add them in the constructor -$manager = new League\Flysystem\MountManager([ - 'ftp' => $ftp, - 's3' => $s3, -]); - -// Or mount them later -$manager->mountFilesystem('local', $local); -~~~ - -Now we do all the file operations we'd normally do on a `Flysystem\Filesystem` instance. - -~~~ php -// Read from FTP -$contents = $manager->read('ftp://some/file.txt'); - -// And write to local -$manager->write('local://put/it/here.txt', $contents); -~~~ - -This makes it easy to code up simple sync strategies. - -~~~ php -$contents = $manager->listContents('local://uploads', true); - -foreach ($contents as $entry) { - $update = false; - - if ( ! $manager->has('storage://'.$entry['path'])) { - $update = true; - } elseif ($manager->getTimestamp('local://'.$entry['path']) > $manager->getTimestamp('storage://'.$entry['path'])) { - $update = true; - } - - if ($update) { - $manager->put('storage://'.$entry['path'], $manager->read('local://'.$entry['path'])); - } -} -~~~ - -## Specialized calls - -### Copy - -The copy method provided by the Mount Manager takes the origin of the file into account. -When it detects the source and destination are located on a different file systems it'll -use a streamed upload instead, transparently. - -~~~ php -$mountManager->copy('local://some/file.ext', 'backup://storage/location.ext'); -~~~ - -### Move - -The `move` call is the multi-file system counterpart to `rename`. Where rename must be used on -the same file system, the `move` call provides the same conceptual behavior, but then on two -different file systems. - -~~~ php -$mountManager->move('local://some/upload.jpeg', 'cdn://users/1/profile-picture.jpeg'); -~~~ diff --git a/vendor/league/flysystem/docs/performance.md b/vendor/league/flysystem/docs/performance.md deleted file mode 100644 index 2cfcc73b..00000000 --- a/vendor/league/flysystem/docs/performance.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -layout: default -permalink: /performance/ -title: API ---- - -# Performance - -Flysystem aims to be as reliable as possible. In some cases this means doing extra -checks to make sure the outcome will be as expected. For some adapter this means Flysystem -will make extra calls to assert whether or not a file exists. This improves the reliability -but also impacts performance. You can opt out of this behaviour. - -~~~ php -use League\Flysystem\Config; -use League\Flysystem\Filesystem; - -$local = new Filesystem($localAdapter, new Config([ - 'disable_asserts' => true, -])); -~~~ - -This will disable the asserts which happen before the following calls: write, writeStream, update, -updateStream, copy (2x), and delete. - -This functionality is available since `1.0.26`. diff --git a/vendor/league/flysystem/docs/plugins.md b/vendor/league/flysystem/docs/plugins.md deleted file mode 100644 index 896ec24b..00000000 --- a/vendor/league/flysystem/docs/plugins.md +++ /dev/null @@ -1,46 +0,0 @@ ---- -layout: default -permalink: /plugins/ -title: Plugins ---- - -# Plugins -Need a feature which is not included in Flysystem's bag of tricks? Write a plugin! - -~~~ php -use League\Flysystem\FilesystemInterface; -use League\Flysystem\PluginInterface; - -class MaximusAwesomeness implements PluginInterface -{ - protected $filesystem; - - public function setFilesystem(FilesystemInterface $filesystem) - { - $this->filesystem = $filesystem; - } - - public function getMethod() - { - return 'getDown'; - } - - public function handle($path = null) - { - $contents = $this->filesystem->read($path); - - return sha1($contents); - } -} -~~~ - -Now we're ready to use the plugin - -~~~ php -use League\Flysystem\Filesystem; -use League\Flysystem\Adapter; - -$filesystem = new Filesystem(new Adapter\Local(__DIR__.'/path/to/files/')); -$filesystem->addPlugin(new MaximusAwesomeness); -$sha1 = $filesystem->getDown('path/to/file'); -~~~ diff --git a/vendor/league/flysystem/docs/recipes.md b/vendor/league/flysystem/docs/recipes.md deleted file mode 100644 index 0d120258..00000000 --- a/vendor/league/flysystem/docs/recipes.md +++ /dev/null @@ -1,99 +0,0 @@ ---- -layout: default -permalink: /recipes/ -title: Recipes ---- - -# Recipes - -Flysystem Recipes describe common tasks and/or describe prefered ways to deal with -a problem. Please consider contributing a recipe. Contributions are very welcome! - -## Handling uploads - -### Plain PHP Upload - -~~~ php -$stream = fopen($_FILES[$uploadname]['tmp_name'], 'r+'); -$filesystem->writeStream('uploads/'.$_FILES[$uploadname]['name'], $stream); -fclose($stream); -~~~ - -### Symfony Upload - -~~~ php -/** @var Symfony\Component\HttpFoundation\Request $request */ -/** @var Symfony\Component\HttpFoundation\File\UploadedFile $file */ -$file = $request->files->get($uploadname); - -if ($file->isValid()) { - $stream = fopen($file->getRealPath(), 'r+'); - $filesystem->writeStream('uploads/'.$file->getClientOriginalName(), $stream); - fclose($stream); -} -~~~ - -### Laravel 5 - DI - -~~~ php -file('upload'); - $stream = fopen($file->getRealPath(), 'r+'); - $filesystem->writeStream('uploads/'.$file->getClientOriginalName(), $stream); - fclose($stream); - } -} -~~~ - -### Laravel 4/5 - Static-Access Proxy - -~~~ php -$file = Request::file($uploadname); - -if ($file->isValid()) { - $stream = fopen($file->getRealPath(), 'r+'); - $filesystem->writeStream('uploads/'.$file->getClientOriginalName(), $stream); - fclose($stream); -} -~~~ - -### Yii 2 Upload - -~~~ php -error === UPLOAD_ERR_OK) { - $stream = fopen($file->tempName, 'r+'); - $filesystem->writeStream('uploads/'.$file->name, $stream); - fclose($stream); - } - } -} -~~~ diff --git a/vendor/league/flysystem/docs/sponsors.md b/vendor/league/flysystem/docs/sponsors.md deleted file mode 100644 index cc9f7ee9..00000000 --- a/vendor/league/flysystem/docs/sponsors.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -layout: default -permalink: /sponsors/ -title: Sponsors ---- - -# Sponsors - -Development efforts are supported by the sponsors. I'm very grateful for their donations, please check them out! - -Become a Patron! - -## Gold Sponsors - - -

    Laravel.com
    Laravel.com

    - -### Silver Sponsors - -None - -### Bronze Sponsors - -None diff --git a/vendor/league/flysystem/docs/upgrade-to-1.0.0.md b/vendor/league/flysystem/docs/upgrade-to-1.0.0.md deleted file mode 100644 index be9d63de..00000000 --- a/vendor/league/flysystem/docs/upgrade-to-1.0.0.md +++ /dev/null @@ -1,66 +0,0 @@ ---- -layout: default -permalink: /upgrade-to-1.0.0/ -title: Upgrade to 1.0.0 ---- - -# Upgrade to 1.0.0 - -While version 1.0.0 is largely backwards compatible from earlier versions in every -day usage, some parts require a different boostrapping. - -## Relocated Adapters - -In order to have better dependency management, and to remove some of the -version contstraints, some of the adapters have been moved out of the main -repository. These adapters are: - -* [AwsS3: AWS SDK V2 Adapter](/adapter/aws-s3-v2/) -* [AwsS3V3: AWS SDK V3 Adapter](/adapter/aws-s3-v3/) -* [Dropbox](/adapter/dropbox/) -* [Rackspace](/adapter/rackspace/) -* [GridFS](/adapter/gridfs/) -* [Sftp](/adapter/sftp/) -* [WebDAV](/adapter/webdav/) -* [ZipArchive](/adapter/zip-archive/) - -## Caching - -Caching has been removed from the main Filesystem class and is now implemented -as an adapter decorator. - -### Version 0.x - -~~~ php -$filesystem = new Filesystem($adapter, $cacheAdapter); -~~~ - -### Version 1.0.0 - -Install the required adapter decorator: - -~~~ bash -composer require league/flysystem-cached-adapter -~~~ - -And convert the bootstrapping to: - -~~~ php -use League\Flysystem\Adapter\Local; -use League\Flysystem\Cached\CachedAdapter; - -$decoratedAdapter = new CachedAdapter($adapter, $cacheAdapter); -$filesystem = new Filesystem($decoratedAdapter); -~~~ - -## Helper Methods - -In order to clean up the Filsystem class, some helper functions have been moved to plugins. - -* ListWith -* ListPaths -* ListFiles -* GetWithMetadata -* EmptyDir (new) - - diff --git a/vendor/league/flysystem/src/Adapter/Local.php b/vendor/league/flysystem/src/Adapter/Local.php index 07adb66a..3e3c8276 100644 --- a/vendor/league/flysystem/src/Adapter/Local.php +++ b/vendor/league/flysystem/src/Adapter/Local.php @@ -160,13 +160,16 @@ class Local extends AbstractAdapter return false; } - if ($visibility = $config->get('visibility')) { - $this->setVisibility($path, $visibility); - } - $type = 'file'; - return compact('type', 'path', 'visibility'); + $result = compact('type', 'path'); + + if ($visibility = $config->get('visibility')) { + $this->setVisibility($path, $visibility); + $result['visibility'] = $visibility; + } + + return $result; } /** @@ -194,7 +197,6 @@ class Local extends AbstractAdapter public function update($path, $contents, Config $config) { $location = $this->applyPathPrefix($path); - $mimetype = Util::guessMimeType($path, $contents); $size = file_put_contents($location, $contents, $this->writeFlags); if ($size === false) { @@ -203,7 +205,13 @@ class Local extends AbstractAdapter $type = 'file'; - return compact('type', 'path', 'size', 'contents', 'mimetype'); + $result = compact('type', 'path', 'size', 'contents'); + + if ($mimetype = Util::guessMimeType($path, $contents)) { + $result['mimetype'] = $mimetype; + } + + return $result; } /** diff --git a/vendor/league/flysystem/src/Directory.php b/vendor/league/flysystem/src/Directory.php index 6ba744ba..d4f90a88 100644 --- a/vendor/league/flysystem/src/Directory.php +++ b/vendor/league/flysystem/src/Directory.php @@ -2,6 +2,9 @@ namespace League\Flysystem; +/** + * @deprecated + */ class Directory extends Handler { /** diff --git a/vendor/league/flysystem/src/File.php b/vendor/league/flysystem/src/File.php index 988fc342..4a4b7a02 100644 --- a/vendor/league/flysystem/src/File.php +++ b/vendor/league/flysystem/src/File.php @@ -2,6 +2,9 @@ namespace League\Flysystem; +/** + * @deprecated + */ class File extends Handler { /** diff --git a/vendor/league/flysystem/src/Filesystem.php b/vendor/league/flysystem/src/Filesystem.php index 568510c2..7e9881fb 100644 --- a/vendor/league/flysystem/src/Filesystem.php +++ b/vendor/league/flysystem/src/Filesystem.php @@ -324,6 +324,7 @@ class Filesystem implements FilesystemInterface public function getSize($path) { $path = Util::normalizePath($path); + $this->assertPresent($path); if (( ! $object = $this->getAdapter()->getSize($path)) || ! array_key_exists('size', $object)) { return false; @@ -338,6 +339,7 @@ class Filesystem implements FilesystemInterface public function setVisibility($path, $visibility) { $path = Util::normalizePath($path); + $this->assertPresent($path); return (bool) $this->getAdapter()->setVisibility($path, $visibility); } diff --git a/vendor/league/flysystem/src/FilesystemInterface.php b/vendor/league/flysystem/src/FilesystemInterface.php index 4baec7cc..09b811b1 100644 --- a/vendor/league/flysystem/src/FilesystemInterface.php +++ b/vendor/league/flysystem/src/FilesystemInterface.php @@ -2,6 +2,8 @@ namespace League\Flysystem; +use InvalidArgumentException; + interface FilesystemInterface { /** @@ -61,6 +63,8 @@ interface FilesystemInterface * * @param string $path The path to the file. * + * @throws FileNotFoundException + * * @return int|false The file size or false on failure. */ public function getSize($path); @@ -118,7 +122,7 @@ interface FilesystemInterface * @param resource $resource The file handle. * @param array $config An optional configuration array. * - * @throws \InvalidArgumentException If $resource is not a file handle. + * @throws InvalidArgumentException If $resource is not a file handle. * @throws FileExistsException * * @return bool True on success, false on failure. @@ -145,7 +149,7 @@ interface FilesystemInterface * @param resource $resource The file handle. * @param array $config An optional configuration array. * - * @throws \InvalidArgumentException If $resource is not a file handle. + * @throws InvalidArgumentException If $resource is not a file handle. * @throws FileNotFoundException * * @return bool True on success, false on failure. @@ -216,6 +220,8 @@ interface FilesystemInterface * @param string $path The path to the file. * @param string $visibility One of 'public' or 'private'. * + * @throws FileNotFoundException + * * @return bool True on success, false on failure. */ public function setVisibility($path, $visibility); @@ -238,7 +244,7 @@ interface FilesystemInterface * @param resource $resource The file handle. * @param array $config An optional configuration array. * - * @throws \InvalidArgumentException Thrown if $resource is not a resource. + * @throws InvalidArgumentException Thrown if $resource is not a resource. * * @return bool True on success, false on failure. */ @@ -258,6 +264,8 @@ interface FilesystemInterface /** * Get a file/directory handler. * + * @deprecated + * * @param string $path The path to the file. * @param Handler $handler An optional existing handler to populate. * diff --git a/vendor/league/flysystem/src/Handler.php b/vendor/league/flysystem/src/Handler.php index 021dd26a..5609372e 100644 --- a/vendor/league/flysystem/src/Handler.php +++ b/vendor/league/flysystem/src/Handler.php @@ -4,6 +4,9 @@ namespace League\Flysystem; use BadMethodCallException; +/** + * @deprecated + */ abstract class Handler { /** diff --git a/vendor/league/flysystem/src/MountManager.php b/vendor/league/flysystem/src/MountManager.php index 706afd6f..6dea2001 100644 --- a/vendor/league/flysystem/src/MountManager.php +++ b/vendor/league/flysystem/src/MountManager.php @@ -32,7 +32,7 @@ use League\Flysystem\Plugin\PluginNotFoundException; * @method array listPaths($directory = '', $recursive = false) * @method array getWithMetadata($path, array $metadata) * @method string|false getMimetype($path) - * @method string|false getTimestamp($path) + * @method int|false getTimestamp($path) * @method string|false getVisibility($path) * @method int|false getSize($path); * @method bool setVisibility($path, $visibility) diff --git a/vendor/league/flysystem/src/Plugin/ForcedCopy.php b/vendor/league/flysystem/src/Plugin/ForcedCopy.php index d2fc3795..a41e9f3a 100644 --- a/vendor/league/flysystem/src/Plugin/ForcedCopy.php +++ b/vendor/league/flysystem/src/Plugin/ForcedCopy.php @@ -2,6 +2,7 @@ namespace League\Flysystem\Plugin; +use League\Flysystem\FileExistsException; use League\Flysystem\FileNotFoundException; class ForcedCopy extends AbstractPlugin @@ -20,6 +21,7 @@ class ForcedCopy extends AbstractPlugin * @param string $path Path to the existing file. * @param string $newpath The new path of the file. * + * @throws FileExistsException * @throws FileNotFoundException Thrown if $path does not exist. * * @return bool True on success, false on failure. diff --git a/vendor/league/flysystem/src/Plugin/ForcedRename.php b/vendor/league/flysystem/src/Plugin/ForcedRename.php index 7c081b6c..3f51cd60 100644 --- a/vendor/league/flysystem/src/Plugin/ForcedRename.php +++ b/vendor/league/flysystem/src/Plugin/ForcedRename.php @@ -2,6 +2,7 @@ namespace League\Flysystem\Plugin; +use League\Flysystem\FileExistsException; use League\Flysystem\FileNotFoundException; class ForcedRename extends AbstractPlugin @@ -21,6 +22,7 @@ class ForcedRename extends AbstractPlugin * @param string $newpath The new path of the file. * * @throws FileNotFoundException Thrown if $path does not exist. + * @throws FileExistsException * * @return bool True on success, false on failure. */ diff --git a/vendor/league/flysystem/src/Plugin/GetWithMetadata.php b/vendor/league/flysystem/src/Plugin/GetWithMetadata.php index bc39ef81..6fe4f056 100644 --- a/vendor/league/flysystem/src/Plugin/GetWithMetadata.php +++ b/vendor/league/flysystem/src/Plugin/GetWithMetadata.php @@ -3,6 +3,7 @@ namespace League\Flysystem\Plugin; use InvalidArgumentException; +use League\Flysystem\FileNotFoundException; class GetWithMetadata extends AbstractPlugin { @@ -23,6 +24,7 @@ class GetWithMetadata extends AbstractPlugin * @param array $metadata metadata keys * * @throws InvalidArgumentException + * @throws FileNotFoundException * * @return array|false metadata */ diff --git a/vendor/league/flysystem/src/ReadInterface.php b/vendor/league/flysystem/src/ReadInterface.php index 99b8550c..898a8d5c 100644 --- a/vendor/league/flysystem/src/ReadInterface.php +++ b/vendor/league/flysystem/src/ReadInterface.php @@ -69,7 +69,7 @@ interface ReadInterface public function getMimetype($path); /** - * Get the timestamp of a file. + * Get the last modified time of a file as a timestamp. * * @param string $path * diff --git a/vendor/league/flysystem/src/Util.php b/vendor/league/flysystem/src/Util.php index 1a74292e..46dad86f 100644 --- a/vendor/league/flysystem/src/Util.php +++ b/vendor/league/flysystem/src/Util.php @@ -26,7 +26,7 @@ class Util $pathinfo += pathinfo($pathinfo['basename']); - return $pathinfo; + return $pathinfo + ['dirname' => '']; } /** diff --git a/vendor/league/flysystem/src/Util/MimeType.php b/vendor/league/flysystem/src/Util/MimeType.php index 7e536862..69e35e72 100644 --- a/vendor/league/flysystem/src/Util/MimeType.php +++ b/vendor/league/flysystem/src/Util/MimeType.php @@ -154,6 +154,8 @@ class MimeType 'rtf' => 'text/rtf', 'xml' => 'application/xml', 'xsl' => 'application/xml', + 'dmn' => 'application/octet-stream', + 'bpmn' => 'application/octet-stream', 'mpeg' => 'video/mpeg', 'mpg' => 'video/mpeg', 'mpe' => 'video/mpeg', @@ -163,6 +165,7 @@ class MimeType 'movie' => 'video/x-sgi-movie', 'doc' => 'application/msword', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'docm' => 'application/vnd.ms-word.template.macroEnabled.12', 'dot' => 'application/msword', 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', @@ -212,6 +215,18 @@ class MimeType 'cdr' => 'application/cdr', 'wma' => 'audio/x-ms-wma', 'jar' => 'application/java-archive', + 'tex' => 'application/x-tex', + 'latex' => 'application/x-latex', + 'odt' => 'application/vnd.oasis.opendocument.text', + 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'odc' => 'application/vnd.oasis.opendocument.chart', + 'odf' => 'application/vnd.oasis.opendocument.formula', + 'odi' => 'application/vnd.oasis.opendocument.image', + 'odm' => 'application/vnd.oasis.opendocument.text-master', + 'odb' => 'application/vnd.oasis.opendocument.database', + 'ott' => 'application/vnd.oasis.opendocument.text-template', ]; } } diff --git a/vendor/league/flysystem/wait_for_ftp_service.php b/vendor/league/flysystem/wait_for_ftp_service.php deleted file mode 100644 index 4f126726..00000000 --- a/vendor/league/flysystem/wait_for_ftp_service.php +++ /dev/null @@ -1,20 +0,0 @@ - 10) { - fwrite(STDOUT, "Failed to connect.\n"); - exit(1); -} - -sleep(1); -fwrite(STDOUT, "Waiting for a connection...\n"); -goto start; \ No newline at end of file diff --git a/vendor/mockery/mockery/.gitignore b/vendor/mockery/mockery/.gitignore index 5b2beb3e..cef6c54e 100644 --- a/vendor/mockery/mockery/.gitignore +++ b/vendor/mockery/mockery/.gitignore @@ -11,3 +11,4 @@ phpunit.xml *.DS_store .idea/* .php_cs.cache +docs/api diff --git a/vendor/mockery/mockery/.travis.yml b/vendor/mockery/mockery/.travis.yml index 62a1ddf0..f2ed8f80 100644 --- a/vendor/mockery/mockery/.travis.yml +++ b/vendor/mockery/mockery/.travis.yml @@ -30,6 +30,12 @@ matrix: - php: 7.1 env: - DEPS=latest + - php: 7.2 + env: + - DEPS=lowest + - php: 7.2 + env: + - DEPS=latest - php: nightly env: - DEPS=lowest @@ -73,6 +79,7 @@ after_success: - vendor/bin/coveralls -v - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover "$clover" + - make apidocs notifications: email: @@ -80,3 +87,15 @@ notifications: - dave@atstsolutions.co.uk irc: irc.freenode.org#mockery +deploy: + overwrite: true + provider: pages + file_glob: true + file: docs/api/* + local_dir: docs/api + skip_cleanup: true + github_token: $GITHUB_TOKEN + on: + branch: master + php: '7.1' + condition: $DEPS = latest diff --git a/vendor/mockery/mockery/CHANGELOG.md b/vendor/mockery/mockery/CHANGELOG.md index 43ed7a70..3e742e5a 100644 --- a/vendor/mockery/mockery/CHANGELOG.md +++ b/vendor/mockery/mockery/CHANGELOG.md @@ -1,5 +1,29 @@ # Change Log +## x.y.z. (unreleased) + +## 1.1.0 (2018-05-08) + +* Allows use of string method names in allows and expects (#794) +* Finalises allows and expects syntax in API (#799) +* Search for handlers in a case instensitive way (#801) +* Deprecate allowMockingMethodsUnnecessarily (#808) +* Fix risky tests (#769) +* Fix namespace in TestListener (#812) +* Fixed conflicting mock names (#813) +* Clean elses (#819) +* Updated protected method mocking exception message (#826) +* Map of constants to mock (#829) +* Simplify foreach with `in_array` function (#830) +* Typehinted return value on Expectation#verify. (#832) +* Fix shouldNotHaveReceived with HigherOrderMessage (#842) +* Deprecates shouldDeferMissing (#839) +* Adds support for return type hints in Demeter chains (#848) +* Adds shouldNotReceive to composite expectation (#847) +* Fix internal error when using --static-backup (#845) +* Adds `andAnyOtherArgs` as an optional argument matcher (#860) +* Fixes namespace qualifying with namespaced named mocks (#872) + ## 1.0.0 (2017-09-06) * Destructors (`__destruct`) are stubbed out where it makes sense @@ -17,7 +41,7 @@ * Adds ability to create objects using traits * `Mockery\Matcher\MustBe` was deprecated * Marked `Mockery\MockInterface` as internal -* Subset matcher matches recusively +* Subset matcher matches recursively * BC BREAK - Spies return `null` by default from ignored (non-mocked) methods with nullable return type * Removed extracting getter methods of object instances * BC BREAK - Remove implicit regex matching when trying to match string arguments, introduce `\Mockery::pattern()` when regex matching is needed @@ -47,7 +71,7 @@ ## 0.9.2 (2014-09-03) -* Some workarounds for the serilisation problems created by changes to PHP in 5.5.13, 5.4.29, +* Some workarounds for the serialisation problems created by changes to PHP in 5.5.13, 5.4.29, 5.6. * Demeter chains attempt to reuse doubles as they see fit, so for foo->bar and foo->baz, we'll attempt to use the same foo diff --git a/vendor/mockery/mockery/LICENSE b/vendor/mockery/mockery/LICENSE index 2ca3b064..2e127a65 100644 --- a/vendor/mockery/mockery/LICENSE +++ b/vendor/mockery/mockery/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2010-2014, Pádraic Brady +Copyright (c) 2010, Pádraic Brady All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/vendor/mockery/mockery/Makefile b/vendor/mockery/mockery/Makefile new file mode 100644 index 00000000..db8dcd91 --- /dev/null +++ b/vendor/mockery/mockery/Makefile @@ -0,0 +1,48 @@ +vendor/composer/installed.json: composer.json + composer install + +.PHONY: deps +deps: vendor/composer/installed.json + +.PHONY: test +test: deps + php vendor/bin/phpunit + +.PHONY: apidocs +apidocs: docs/api/index.html + +library_files=$(shell find library -name '*.php') +docs/api/index.html: vendor/composer/installed.json $(library_files) + vendor/bin/phpdoc -d library -t docs/api + +.PHONY: test-all +test-all: test-72 test-71 test-70 test-56 + +.PHONY: test-all-7 +test-all-7: test-72 test-71 test-70 + +.PHONY: test-72 +test-72: deps + docker run -it --rm -v "$$PWD":/opt/mockery -w /opt/mockery php:7.2-cli php vendor/bin/phpunit + +.PHONY: test-71 +test-71: deps + docker run -it --rm -v "$$PWD":/opt/mockery -w /opt/mockery php:7.1-cli php vendor/bin/phpunit + +.PHONY: test-70 +test-70: deps + docker run -it --rm -v "$$PWD":/opt/mockery -w /opt/mockery php:7.0-cli php vendor/bin/phpunit + +.PHONY: test-56 +test-56: build56 + docker run -it --rm \ + -v "$$PWD/library":/opt/mockery/library \ + -v "$$PWD/tests":/opt/mockery/tests \ + -v "$$PWD/phpunit.xml.dist":/opt/mockery/phpunit.xml \ + -w /opt/mockery \ + mockery_php56 \ + php vendor/bin/phpunit + +.PHONY: build56 +build56: + docker build -t mockery_php56 -f "$$PWD/docker/php56/Dockerfile" . diff --git a/vendor/mockery/mockery/README.md b/vendor/mockery/mockery/README.md index c0944661..ab33107f 100644 --- a/vendor/mockery/mockery/README.md +++ b/vendor/mockery/mockery/README.md @@ -1,10 +1,10 @@ Mockery ======= -[![Build Status](https://travis-ci.org/mockery/mockery.png?branch=master)](https://travis-ci.org/mockery/mockery) -[![Latest Stable Version](https://poser.pugx.org/mockery/mockery/v/stable.png)](https://packagist.org/packages/mockery/mockery) +[![Build Status](https://travis-ci.org/mockery/mockery.svg?branch=master)](https://travis-ci.org/mockery/mockery) +[![Latest Stable Version](https://poser.pugx.org/mockery/mockery/v/stable.svg)](https://packagist.org/packages/mockery/mockery) [![Coverage Status](https://coveralls.io/repos/github/mockery/mockery/badge.svg)](https://coveralls.io/github/mockery/mockery) -[![Total Downloads](https://poser.pugx.org/mockery/mockery/downloads.png)](https://packagist.org/packages/mockery/mockery) +[![Total Downloads](https://poser.pugx.org/mockery/mockery/downloads.svg)](https://packagist.org/packages/mockery/mockery) Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a diff --git a/vendor/mockery/mockery/composer.json b/vendor/mockery/mockery/composer.json index 59619259..12f23f6d 100644 --- a/vendor/mockery/mockery/composer.json +++ b/vendor/mockery/mockery/composer.json @@ -1,6 +1,9 @@ { "name": "mockery/mockery", - "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.", + "description": "Mockery is a simple yet flexible PHP mock object framework", + "scripts": { + "docs": "phpdoc -d library -t docs/api" + }, "keywords": [ "bdd", "library", @@ -13,7 +16,7 @@ "test double", "testing" ], - "homepage": "http://github.com/mockery/mockery", + "homepage": "https://github.com/mockery/mockery", "license": "BSD-3-Clause", "authors": [ { @@ -33,13 +36,19 @@ "hamcrest/hamcrest-php": "~2.0" }, "require-dev": { - "phpunit/phpunit": "~5.7|~6.1" + "phpunit/phpunit": "~5.7.10|~6.5", + "phpdocumentor/phpdocumentor": "^2.9" }, "autoload": { "psr-0": { "Mockery": "library/" } }, + "autoload-dev": { + "psr-4": { + "test\\": "tests/" + } + }, "extra": { "branch-alias": { "dev-master": "1.0.x-dev" diff --git a/vendor/mockery/mockery/docker/php56/Dockerfile b/vendor/mockery/mockery/docker/php56/Dockerfile new file mode 100644 index 00000000..264c5c03 --- /dev/null +++ b/vendor/mockery/mockery/docker/php56/Dockerfile @@ -0,0 +1,14 @@ +FROM php:5.6-cli + +RUN apt-get update && \ + apt-get install -y git zip unzip && \ + apt-get -y autoremove && \ + apt-get clean && \ + curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +WORKDIR /opt/mockery + +COPY composer.json ./ + +RUN composer install diff --git a/vendor/mockery/mockery/docs/conf.py b/vendor/mockery/mockery/docs/conf.py index dd0433f1..901f0405 100644 --- a/vendor/mockery/mockery/docs/conf.py +++ b/vendor/mockery/mockery/docs/conf.py @@ -187,7 +187,7 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index2', 'MockeryDocs.tex', u'Mockery Docs Documentation', + ('index', 'MockeryDocs.tex', u'Mockery Docs Documentation', u'Pádraic Brady, Dave Marshall, Wouter, Graham Campbell', 'manual'), ] @@ -217,7 +217,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index2', 'mockerydocs', u'Mockery Docs Documentation', + ('index', 'mockerydocs', u'Mockery Docs Documentation', [u'Pádraic Brady, Dave Marshall, Wouter, Graham Campbell'], 1) ] @@ -231,7 +231,7 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index2', 'MockeryDocs', u'Mockery Docs Documentation', + ('index', 'MockeryDocs', u'Mockery Docs Documentation', u'Pádraic Brady, Dave Marshall, Wouter, Graham Campbell', 'MockeryDocs', 'One line description of project.', 'Miscellaneous'), ] diff --git a/vendor/mockery/mockery/docs/cookbook/class_constants.rst b/vendor/mockery/mockery/docs/cookbook/class_constants.rst index 2ba38566..f1489531 100644 --- a/vendor/mockery/mockery/docs/cookbook/class_constants.rst +++ b/vendor/mockery/mockery/docs/cookbook/class_constants.rst @@ -5,14 +5,17 @@ Class Constants =============== When creating a test double for a class, Mockery does not create stubs out of -any class contants defined in the class we are mocking. Sometimes though, the +any class constants defined in the class we are mocking. Sometimes though, the non-existence of these class constants, setup of the test, and the application code itself, it can lead to undesired behavior, and even a PHP error: ``PHP Fatal error: Uncaught Error: Undefined class constant 'FOO' in ...``` -While supporting class contants in Mockery would be possible, it does require +While supporting class constants in Mockery would be possible, it does require an awful lot of work, for a small number of use cases. +Named Mocks +----------- + We can, however, deal with these constants in a way supported by Mockery - by using :ref:`creating-test-doubles-named-mocks`. @@ -142,3 +145,39 @@ And the test will have something like this: $myClass = new MyClass(); $myClass->doFetching($mock); + +Constants Map +------------- + +Another way of mocking class constants can be with the use of the constants map configuration. + +Given a class with constants: + +.. code-block:: php + + class Fetcher + { + const SUCCESS = 0; + const FAILURE = 1; + + public function fetch() + { + // Fetcher gets something for us from somewhere... + return self::SUCCESS; + } + } + +It can be mocked with: + +.. code-block:: php + + \Mockery()->getConfiguration->setConstantsMap([ + 'Fetcher' => [ + 'SUCCESS' => 'success', + 'FAILURE' => 'fail', + ] + ]); + + $mock = \Mockery::mock('Fetcher'); + var_dump($mock::SUCCESS); // (string) 'success' + var_dump($mock::FAILURE); // (string) 'fail' diff --git a/vendor/mockery/mockery/docs/cookbook/mockery_on.rst b/vendor/mockery/mockery/docs/cookbook/mockery_on.rst index 5c395ccd..631f1241 100644 --- a/vendor/mockery/mockery/docs/cookbook/mockery_on.rst +++ b/vendor/mockery/mockery/docs/cookbook/mockery_on.rst @@ -11,7 +11,7 @@ when called. If the closure returns ``true``, Mockery will consider that the argument has passed the expectation. If the closure returns ``false``, or a "falsey" value, the expectation will not pass. -The ``\Mockery::on()`` matcher can be used in various scenarios — validating +The ``\Mockery::on()`` matcher can be used in various scenarios — validating an array argument based on multiple keys and values, complex string matching... Say, for example, we have the following code. It doesn't do much; publishes a diff --git a/vendor/mockery/mockery/docs/cookbook/not_calling_the_constructor.rst b/vendor/mockery/mockery/docs/cookbook/not_calling_the_constructor.rst index 6f24ff91..b8157ae3 100644 --- a/vendor/mockery/mockery/docs/cookbook/not_calling_the_constructor.rst +++ b/vendor/mockery/mockery/docs/cookbook/not_calling_the_constructor.rst @@ -42,7 +42,7 @@ A better approach is to use runtime partial doubles: } } - // This will print "Original constructor called." + // This will not print anything $mock = \Mockery::mock('MyClass')->makePartial(); $mock->shouldReceive('foo'); diff --git a/vendor/mockery/mockery/docs/getting_started/upgrading.rst b/vendor/mockery/mockery/docs/getting_started/upgrading.rst index 35313cd8..7201e597 100644 --- a/vendor/mockery/mockery/docs/getting_started/upgrading.rst +++ b/vendor/mockery/mockery/docs/getting_started/upgrading.rst @@ -7,7 +7,58 @@ Upgrading Upgrading to 1.0.0 ------------------ -To be written. +Minimum PHP version ++++++++++++++++++++ + +As of Mockery 1.0.0 the minimum PHP version required is 5.6. + +Using Mockery with PHPUnit +++++++++++++++++++++++++++ + +In the "old days", 0.9.x and older, the way Mockery was integrated with PHPUnit was +through a PHPUnit listener. That listener would in turn call the ``\Mockery::close()`` +method for us. + +As of 1.0.0, PHPUnit test cases where we want to use Mockery, should either use the +``\Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration`` trait, or extend the +``\Mockery\Adapter\Phpunit\MockeryTestCase`` test case. This will in turn call the +``\Mockery::close()`` method for us. + +Read the documentation for a detailed overview of ":doc:`/reference/phpunit_integration`". + +``\Mockery\Matcher\MustBe`` is deprecated ++++++++++++++++++++++++++++++++++++++++++ + +As of 1.0.0 the ``\Mockery\Matcher\MustBe`` matcher is deprecated and will be removed in +Mockery 2.0.0. We recommend instead to use the PHPUnit or Hamcrest equivalents of the +MustBe matcher. + +``allows`` and ``expects`` +++++++++++++++++++++++++++ + +As of 1.0.0, Mockery has two new methods to set up expectations: ``allows`` and ``expects``. +This means that these methods names are now "reserved" for Mockery, or in other words +classes you want to mock with Mockery, can't have methods called ``allows`` or ``expects``. + +Read more in the documentation about this ":doc:`/reference/alternative_should_receive_syntax`". + +No more implicit regex matching for string arguments +++++++++++++++++++++++++++++++++++++++++++++++++++++ + +When setting up string arguments in method expectations, Mockery 0.9.x and older, would try +to match arguments using a regular expression in a "last attempt" scenario. + +As of 1.0.0, Mockery will no longer attempt to do this regex matching, but will only try +first the identical operator ``===``, and failing that, the equals operator ``==``. + +If you want to match an argument using regular expressions, please use the new +``\Mockery\Matcher\Pattern`` matcher. Read more in the documentation about this +pattern matcher in the ":doc:`/reference/argument_validation`" section. + +``andThrow`` ``\Throwable`` ++++++++++++++++++++++++++++ + +As of 1.0.0, the ``andThrow`` can now throw any ``\Throwable``. Upgrading to 0.9 ---------------- @@ -23,7 +74,7 @@ Since the release of 0.8.0 the following behaviours were altered: 1. The ``shouldIgnoreMissing()`` behaviour optionally applied to mock objects returned an instance of ``\Mockery\Undefined`` when methods called did not match a known expectation. Since 0.8.0, this behaviour was switched to - returning ``null`` instead. You can restore the 0.7.2 behavour by using the + returning ``null`` instead. You can restore the 0.7.2 behaviour by using the following: .. code-block:: php diff --git a/vendor/mockery/mockery/docs/mockery/configuration.rst b/vendor/mockery/mockery/docs/mockery/configuration.rst index 9f8db744..67ab36a5 100644 --- a/vendor/mockery/mockery/docs/mockery/configuration.rst +++ b/vendor/mockery/mockery/docs/mockery/configuration.rst @@ -5,36 +5,32 @@ Mockery Global Configuration ============================ To allow for a degree of fine-tuning, Mockery utilises a singleton -configuration object to store a small subset of core behaviours. The three +configuration object to store a small subset of core behaviours. The two currently present include: * Option to allow/disallow the mocking of methods which do not actually exist -* Option to allow/disallow the existence of expectations which are never fulfilled (i.e. unused) * Setter/Getter for added a parameter map for internal PHP class methods (``Reflection`` cannot detect these automatically) -By default, the first two behaviours are enabled. Of course, there are +By default, the first behaviour is enabled. Of course, there are situations where this can lead to unintended consequences. The mocking of non-existent methods may allow mocks based on real classes/objects to fall out of sync with the actual implementations, especially when some degree of integration testing (testing of object wiring) is not being performed. -Allowing unfulfilled expectations means unnecessary mock expectations go -unnoticed, cluttering up test code, and potentially confusing test readers. -You may allow or disallow these behaviours (whether for whole test suites or -just select tests) by using one or both of the following two calls: +You may allow or disallow this behaviour (whether for whole test suites or +just select tests) by using the following call: .. code-block:: php \Mockery::getConfiguration()->allowMockingNonExistentMethods(bool); - \Mockery::getConfiguration()->allowMockingMethodsUnnecessarily(bool); -Passing a true allows the behaviour, false disallows it. Both take effect -immediately until switched back. In both cases, if either behaviour is -detected when not allowed, it will result in an Exception being thrown at that -point. Note that disallowing these behaviours should be carefully considered -since they necessarily remove at least some of Mockery's flexibility. +Passing a true allows the behaviour, false disallows it. It takes effect +immediately until switched back. If the behaviour is detected when not allowed, +it will result in an Exception being thrown at that point. Note that disallowing +ths behaviour should be carefully considered since it necessarily removes at +least some of Mockery's flexibility. The other two methods are: @@ -50,3 +46,32 @@ classes. Most of the time, you never need to do this. It's mainly needed where a internal class method uses pass-by-reference for a parameter - you MUST in such cases ensure the parameter signature includes the ``&`` symbol correctly as Mockery won't correctly add it automatically for internal classes. + +Disabling reflection caching +---------------------------- + +Mockery heavily uses `"reflection" `_ +to do it's job. To speed up things, Mockery caches internally the information it +gathers via reflection. In some cases, this caching can cause problems. + +The **only** known situation when this occurs is when PHPUnit's ``--static-backup`` option +is used. If you use ``--static-backup`` and you get an error that looks like the +following: + +.. code-block:: php + + Error: Internal error: Failed to retrieve the reflection object + +We suggest turning off the reflection cache as so: + +.. code-block:: php + + \Mockery::getConfiguration()->disableReflectionCache(); + +Turning it back on can be done like so: + +.. code-block:: php + + \Mockery::getConfiguration()->enableReflectionCache(); + +In no other situation should you be required turn this reflection cache off. diff --git a/vendor/mockery/mockery/docs/reference/expectations.rst b/vendor/mockery/mockery/docs/reference/expectations.rst index 73cc9c10..fb1d736d 100644 --- a/vendor/mockery/mockery/docs/reference/expectations.rst +++ b/vendor/mockery/mockery/docs/reference/expectations.rst @@ -234,7 +234,7 @@ method which accepts one or more closure: $mock->shouldReceive('name_of_method') ->andReturnUsing(closure, ...); -Closures can queued by passing them as extra parameters as for ``andReturn()``. +Closures can be queued by passing them as extra parameters as for ``andReturn()``. .. note:: diff --git a/vendor/mockery/mockery/docs/reference/final_methods_classes.rst b/vendor/mockery/mockery/docs/reference/final_methods_classes.rst index b78f49d0..3b2c443f 100644 --- a/vendor/mockery/mockery/docs/reference/final_methods_classes.rst +++ b/vendor/mockery/mockery/docs/reference/final_methods_classes.rst @@ -7,15 +7,17 @@ Dealing with Final Classes/Methods One of the primary restrictions of mock objects in PHP, is that mocking classes or methods marked final is hard. The final keyword prevents methods so marked from being replaced in subclasses (subclassing is how mock objects can -inherit the type of the class or object being mocked. +inherit the type of the class or object being mocked). -The simplest solution is not to mark classes or methods as final! +The simplest solution is to not mark classes or methods as final! However, in a compromise between mocking functionality and type safety, Mockery does allow creating "proxy mocks" from classes marked final, or from classes with methods marked final. This offers all the usual mock object goodness but the resulting mock will not inherit the class type of the object -being mocked, i.e. it will not pass any instanceof comparison. +being mocked, i.e. it will not pass any instanceof comparison. Methods marked +as final will be proxied to the original method, i.e., final methods can't be +mocked. We can create a proxy mock by passing the instantiated object we wish to mock into ``\Mockery::mock()``, i.e. Mockery will then generate a Proxy to the diff --git a/vendor/mockery/mockery/docs/reference/partial_mocks.rst b/vendor/mockery/mockery/docs/reference/partial_mocks.rst index 3fb91c72..d5f2af56 100644 --- a/vendor/mockery/mockery/docs/reference/partial_mocks.rst +++ b/vendor/mockery/mockery/docs/reference/partial_mocks.rst @@ -38,13 +38,6 @@ define, there is no need to define which methods to mock in advance. See the cookbook entry on :doc:`../cookbook/big_parent_class` for an example usage of runtime partial test doubles. -.. note:: - - The ``makePartial()`` method is identical to the original ``shouldDeferMissing()`` - method which first introduced this Partial Mock type. To know more about - ``shouldDeferMissing()`` method - see the chapter on - :ref:`creating-test-doubles-behavior-modifiers`. - Generated Partial Test Doubles ------------------------------ diff --git a/vendor/mockery/mockery/docs/reference/pass_by_reference_behaviours.rst b/vendor/mockery/mockery/docs/reference/pass_by_reference_behaviours.rst index 8844e3f9..5e2e457f 100644 --- a/vendor/mockery/mockery/docs/reference/pass_by_reference_behaviours.rst +++ b/vendor/mockery/mockery/docs/reference/pass_by_reference_behaviours.rst @@ -26,7 +26,7 @@ method) are reflected in the original variable. An example: echo $baz; // will echo the integer 2 -In the example above, the variable $baz is passed by reference to +In the example above, the variable ``$baz`` is passed by reference to ``Foo::bar()`` (notice the ``&`` symbol in front of the parameter?). Any change ``bar()`` makes to the parameter reference is reflected in the original variable, ``$baz``. diff --git a/vendor/mockery/mockery/docs/reference/spies.rst b/vendor/mockery/mockery/docs/reference/spies.rst index 507c4aa6..c0f1546c 100644 --- a/vendor/mockery/mockery/docs/reference/spies.rst +++ b/vendor/mockery/mockery/docs/reference/spies.rst @@ -150,5 +150,5 @@ We can set expectation on number of calls as well: ->foo('bar') ->twice(); -Unfortunatelly, due to limitations we can't support the same syntax for the +Unfortunately, due to limitations we can't support the same syntax for the ``shouldNotHaveReceived()`` method. diff --git a/vendor/mockery/mockery/library/Mockery.php b/vendor/mockery/mockery/library/Mockery.php index 3d3011ca..9914b9b8 100644 --- a/vendor/mockery/mockery/library/Mockery.php +++ b/vendor/mockery/mockery/library/Mockery.php @@ -34,7 +34,7 @@ class Mockery /** * Global container to hold all mocks for the current unit test running. * - * @var \Mockery\Container + * @var \Mockery\Container|null */ protected static $_container = null; @@ -70,10 +70,44 @@ class Mockery require_once __DIR__.'/helpers.php'; } + /** + * @return array + */ + public static function builtInTypes() + { + $builtInTypes = array( + 'self', + 'array', + 'callable', + // Up to php 7 + 'bool', + 'float', + 'int', + 'string', + 'iterable', + 'void', + ); + + if (version_compare(PHP_VERSION, '7.2.0-dev') >= 0) { + $builtInTypes[] = 'object'; + } + + return $builtInTypes; + } + + /** + * @param string $type + * @return bool + */ + public static function isBuiltInType($type) + { + return in_array($type, \Mockery::builtInTypes()); + } + /** * Static shortcut to \Mockery\Container::mock(). * - * @param array $args + * @param array ...$args * * @return \Mockery\MockInterface */ @@ -86,7 +120,7 @@ class Mockery * Static and semantic shortcut for getting a mock from the container * and applying the spy's expected behavior into it. * - * @param array $args + * @param array ...$args * * @return \Mockery\MockInterface */ @@ -98,7 +132,7 @@ class Mockery /** * Static and Semantic shortcut to \Mockery\Container::mock(). * - * @param array $args + * @param array ...$args * * @return \Mockery\MockInterface */ @@ -110,7 +144,7 @@ class Mockery /** * Static shortcut to \Mockery\Container::mock(), first argument names the mock. * - * @param array $args + * @param array ...$args * * @return \Mockery\MockInterface */ @@ -169,7 +203,7 @@ class Mockery /** * Static fetching of a mock associated with a name or explicit class poser. * - * @param $name + * @param string $name * * @return \Mockery\Mock */ @@ -296,10 +330,33 @@ class Mockery return new \Mockery\Matcher\Any(); } + /** + * Return instance of AndAnyOtherArgs matcher. + * + * An alternative name to `andAnyOtherArgs` so + * the API stays closer to `any` as well. + * + * @return \Mockery\Matcher\AndAnyOtherArgs + */ + public static function andAnyOthers() + { + return new \Mockery\Matcher\AndAnyOtherArgs(); + } + + /** + * Return instance of AndAnyOtherArgs matcher. + * + * @return \Mockery\Matcher\AndAnyOtherArgs + */ + public static function andAnyOtherArgs() + { + return new \Mockery\Matcher\AndAnyOtherArgs(); + } + /** * Return instance of TYPE matcher. * - * @param $expected + * @param mixed $expected * * @return \Mockery\Matcher\Type */ @@ -311,7 +368,7 @@ class Mockery /** * Return instance of DUCKTYPE matcher. * - * @param array $args + * @param array ...$args * * @return \Mockery\Matcher\Ducktype */ @@ -336,7 +393,7 @@ class Mockery /** * Return instance of CONTAINS matcher. * - * @param array $args + * @param array ...$args * * @return \Mockery\Matcher\Contains */ @@ -348,7 +405,7 @@ class Mockery /** * Return instance of HASKEY matcher. * - * @param $key + * @param mixed $key * * @return \Mockery\Matcher\HasKey */ @@ -360,7 +417,7 @@ class Mockery /** * Return instance of HASVALUE matcher. * - * @param $val + * @param mixed $val * * @return \Mockery\Matcher\HasValue */ @@ -372,7 +429,7 @@ class Mockery /** * Return instance of CLOSURE matcher. * - * @param $closure + * @param mixed $closure * * @return \Mockery\Matcher\Closure */ @@ -384,7 +441,7 @@ class Mockery /** * Return instance of MUSTBE matcher. * - * @param $expected + * @param mixed $expected * * @return \Mockery\Matcher\MustBe */ @@ -396,7 +453,7 @@ class Mockery /** * Return instance of NOT matcher. * - * @param $expected + * @param mixed $expected * * @return \Mockery\Matcher\Not */ @@ -408,7 +465,7 @@ class Mockery /** * Return instance of ANYOF matcher. * - * @param array $args + * @param array ...$args * * @return \Mockery\Matcher\AnyOf */ @@ -420,7 +477,7 @@ class Mockery /** * Return instance of NOTANYOF matcher. * - * @param array $args + * @param array ...$args * * @return \Mockery\Matcher\NotAnyOf */ @@ -432,7 +489,7 @@ class Mockery /** * Return instance of PATTERN matcher. * - * @param $expected + * @param mixed $expected * * @return \Mockery\Matcher\Pattern */ @@ -482,10 +539,10 @@ class Mockery * Gets the string representation * of any passed argument. * - * @param $argument - * @param $depth + * @param mixed $argument + * @param int $depth * - * @return string + * @return mixed */ private static function formatArgument($argument, $depth = 0) { @@ -572,7 +629,7 @@ class Mockery /** * Utility function to turn public properties and public get* and is* method values into an array. * - * @param $object + * @param object $object * @param int $nesting * * @return array @@ -592,8 +649,8 @@ class Mockery /** * Returns all public instance properties. * - * @param $object - * @param $nesting + * @param mixed $object + * @param int $nesting * * @return array */ @@ -617,8 +674,8 @@ class Mockery * Utility method used for recursively generating * an object or array representation. * - * @param $argument - * @param $nesting + * @param mixed $argument + * @param int $nesting * * @return mixed */ @@ -670,7 +727,7 @@ class Mockery * expectations from such as needed. * * @param Mockery\MockInterface $mock - * @param array $args + * @param array ...$args * @param callable $add * @return \Mockery\CompositeExpectation */ @@ -729,6 +786,8 @@ class Mockery return $add($method); }; + $parent = get_class($mock); + while (true) { $method = array_shift($methodNames); $expectations = $mock->mockery_getExpectationsFor($method); @@ -739,14 +798,16 @@ class Mockery break; } - $mock = self::getNewDemeterMock($container, $method, $expectations); + $mock = self::getNewDemeterMock($container, $parent, $method, $expectations); } else { - $demeterMockKey = $container->getKeyOfDemeterMockFor($method); + $demeterMockKey = $container->getKeyOfDemeterMockFor($method, $parent); if ($demeterMockKey) { $mock = self::getExistingDemeterMock($container, $demeterMockKey); } } + $parent .= '->' . $method; + $nextExp = function ($n) use ($mock) { return $mock->shouldReceive($n); }; @@ -760,6 +821,7 @@ class Mockery * mock from the container. * * @param \Mockery\Container $container + * @param string $parent * @param string $method * @param Mockery\ExpectationInterface $exp * @@ -767,10 +829,36 @@ class Mockery */ private static function getNewDemeterMock( Mockery\Container $container, + $parent, $method, Mockery\ExpectationInterface $exp ) { - $mock = $container->mock('demeter_' . $method); + $newMockName = 'demeter_' . md5($parent) . '_' . $method; + + if (version_compare(PHP_VERSION, '7.0.0') >= 0) { + $parRef = null; + $parRefMethod = null; + $parRefMethodRetType = null; + + $parentMock = $exp->getMock(); + if ($parentMock !== null) { + $parRef = new ReflectionObject($parentMock); + } + + if ($parRef !== null && $parRef->hasMethod($method)) { + $parRefMethod = $parRef->getMethod($method); + $parRefMethodRetType = $parRefMethod->getReturnType(); + + if ($parRefMethodRetType !== null) { + $mock = self::namedMock($newMockName, (string) $parRefMethodRetType); + $exp->andReturn($mock); + + return $mock; + } + } + } + + $mock = $container->mock($newMockName); $exp->andReturn($mock); return $mock; diff --git a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php index 1873a2bd..9d342935 100644 --- a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php +++ b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php @@ -56,7 +56,7 @@ trait MockeryPHPUnitIntegration foreach (Mockery::getContainer()->mockery_thrownExceptions() as $e) { if (!$e->dismissed()) { - $this->markAsRisky('Mockery found an exception that appears to have been swallowed: '.$e->getMessage()); + $this->markAsRisky(); } } } diff --git a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php index 71226815..858e1d17 100644 --- a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php +++ b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php @@ -69,4 +69,11 @@ class TestListener extends BaseTestListener $result = $test->getTestResultObject(); $result->addFailure($test, $e, $time); } + + public function startTestSuite(\PHPUnit\Framework\TestSuite $suite) + { + \PHPUnit\Util\Blacklist::$blacklistedClassNames[\Mockery::class] = 1; + + parent::startTestSuite($suite); + } } diff --git a/vendor/mockery/mockery/library/Mockery/CompositeExpectation.php b/vendor/mockery/mockery/library/Mockery/CompositeExpectation.php index 4035032e..86e39045 100644 --- a/vendor/mockery/mockery/library/Mockery/CompositeExpectation.php +++ b/vendor/mockery/mockery/library/Mockery/CompositeExpectation.php @@ -41,7 +41,7 @@ class CompositeExpectation implements ExpectationInterface } /** - * @param mixed ... + * @param mixed ...$args */ public function andReturn(...$args) { @@ -51,7 +51,7 @@ class CompositeExpectation implements ExpectationInterface /** * Set a return value, or sequential queue of return values * - * @param mixed ... + * @param mixed ...$args * @return self */ public function andReturns(...$args) @@ -112,7 +112,7 @@ class CompositeExpectation implements ExpectationInterface * Starts a new expectation addition on the first mock which is the primary * target outside of a demeter chain * - * @param mixed ... + * @param mixed ...$args * @return \Mockery\Expectation */ public function shouldReceive(...$args) @@ -122,6 +122,20 @@ class CompositeExpectation implements ExpectationInterface return call_user_func_array(array($first->getMock(), 'shouldReceive'), $args); } + /** + * Starts a new expectation addition on the first mock which is the primary + * target outside of a demeter chain + * + * @param mixed ...$args + * @return \Mockery\Expectation + */ + public function shouldNotReceive(...$args) + { + reset($this->_expectations); + $first = current($this->_expectations); + return call_user_func_array(array($first->getMock(), 'shouldNotReceive'), $args); + } + /** * Return the string summary of this composite expectation * diff --git a/vendor/mockery/mockery/library/Mockery/Configuration.php b/vendor/mockery/mockery/library/Mockery/Configuration.php index 2f050f25..eaf7ffe4 100644 --- a/vendor/mockery/mockery/library/Mockery/Configuration.php +++ b/vendor/mockery/mockery/library/Mockery/Configuration.php @@ -47,10 +47,20 @@ class Configuration */ protected $_internalClassParamMap = array(); + protected $_constantsMap = array(); + + /** + * Boolean assertion is reflection caching enabled or not. It should be + * always enabled, except when using PHPUnit's --static-backup option. + * + * @see https://github.com/mockery/mockery/issues/268 + */ + protected $_reflectionCacheEnabled = true; + /** * Set boolean to allow/prevent mocking of non-existent methods * - * @param bool + * @param bool $flag */ public function allowMockingNonExistentMethods($flag = true) { @@ -68,12 +78,16 @@ class Configuration } /** + * @deprecated + * * Set boolean to allow/prevent unnecessary mocking of methods * - * @param bool + * @param bool $flag */ public function allowMockingMethodsUnnecessarily($flag = true) { + trigger_error(sprintf("The %s method is deprecated and will be removed in a future version of Mockery", __METHOD__), E_USER_DEPRECATED); + $this->_allowMockingMethodsUnnecessarily = (bool) $flag; } @@ -84,6 +98,8 @@ class Configuration */ public function mockingMethodsUnnecessarilyAllowed() { + trigger_error(sprintf("The %s method is deprecated and will be removed in a future version of Mockery", __METHOD__), E_USER_DEPRECATED); + return $this->_allowMockingMethodsUnnecessarily; } @@ -127,4 +143,48 @@ class Configuration { return $this->_internalClassParamMap; } + + public function setConstantsMap(array $map) + { + $this->_constantsMap = $map; + } + + public function getConstantsMap() + { + return $this->_constantsMap; + } + + /** + * Disable reflection caching + * + * It should be always enabled, except when using + * PHPUnit's --static-backup option. + * + * @see https://github.com/mockery/mockery/issues/268 + */ + public function disableReflectionCache() + { + $this->_reflectionCacheEnabled = false; + } + + /** + * Enable reflection caching + * + * It should be always enabled, except when using + * PHPUnit's --static-backup option. + * + * @see https://github.com/mockery/mockery/issues/268 + */ + public function enableReflectionCache() + { + $this->_reflectionCacheEnabled = true; + } + + /** + * Is reflection cache enabled? + */ + public function reflectionCacheEnabled() + { + return $this->_reflectionCacheEnabled; + } } diff --git a/vendor/mockery/mockery/library/Mockery/Container.php b/vendor/mockery/mockery/library/Mockery/Container.php index 81c9d627..5287ac4f 100644 --- a/vendor/mockery/mockery/library/Mockery/Container.php +++ b/vendor/mockery/mockery/library/Mockery/Container.php @@ -85,7 +85,7 @@ class Container * names or partials - just so long as it's something that can be mocked. * I'll refactor it one day so it's easier to follow. * - * @param array $args + * @param array ...$args * * @return Mock * @throws Exception\RuntimeException @@ -96,6 +96,7 @@ class Container $quickdefs = array(); $constructorArgs = null; $blocks = array(); + $class = null; if (count($args) > 1) { $finalArg = end($args); @@ -116,6 +117,7 @@ class Container reset($args); $builder->setParameterOverrides(\Mockery::getConfiguration()->getInternalClassMethodParamMaps()); + $builder->setConstantsMap(\Mockery::getConfiguration()->getConstantsMap()); while (count($args) > 0) { $arg = current($args); @@ -191,7 +193,6 @@ class Container $builder->addBlackListedMethods($blocks); if (defined('HHVM_VERSION') - && isset($class) && ($class === 'Exception' || is_subclass_of($class, 'Exception'))) { $builder->addBlackListedMethod("setTraceOptions"); $builder->addBlackListedMethod("getTraceOptions"); @@ -251,12 +252,13 @@ class Container /** * @param string $method + * @param string $parent * @return string|null */ - public function getKeyOfDemeterMockFor($method) + public function getKeyOfDemeterMockFor($method, $parent) { $keys = array_keys($this->_mocks); - $match = preg_grep("/__demeter_{$method}$/", $keys); + $match = preg_grep("/__demeter_" . md5($parent) . "_{$method}$/", $keys); if (count($match) == 1) { $res = array_values($match); if (count($res) > 0) { @@ -426,7 +428,7 @@ class Container /** * Store a mock and set its container reference * - * @param \Mockery\Mock + * @param \Mockery\Mock $mock * @return \Mockery\MockInterface */ public function rememberMock(\Mockery\MockInterface $mock) diff --git a/vendor/mockery/mockery/library/Mockery/Expectation.php b/vendor/mockery/mockery/library/Mockery/Expectation.php index 5536b289..05bc1711 100644 --- a/vendor/mockery/mockery/library/Mockery/Expectation.php +++ b/vendor/mockery/mockery/library/Mockery/Expectation.php @@ -21,17 +21,18 @@ namespace Mockery; use Closure; -use Mockery\Matcher\MultiArgumentClosure; -use Mockery\Matcher\ArgumentListMatcher; -use Mockery\Matcher\AnyArgs; use Mockery\Matcher\NoArgs; +use Mockery\Matcher\AnyArgs; +use Mockery\Matcher\AndAnyOtherArgs; +use Mockery\Matcher\ArgumentListMatcher; +use Mockery\Matcher\MultiArgumentClosure; class Expectation implements ExpectationInterface { /** * Mock object to which this expectation belongs * - * @var object + * @var \Mockery\MockInterface */ protected $_mock = null; @@ -45,7 +46,7 @@ class Expectation implements ExpectationInterface /** * Exception message * - * @var null + * @var string|null */ protected $_because = null; @@ -301,7 +302,7 @@ class Expectation implements ExpectationInterface /** * Verify this expectation * - * @return bool + * @return void */ public function verify() { @@ -319,6 +320,11 @@ class Expectation implements ExpectationInterface return (count($this->_expectedArgs) === 1 && ($this->_expectedArgs[0] instanceof ArgumentListMatcher)); } + private function isAndAnyOtherArgumentsMatcher($expectedArg) + { + return $expectedArg instanceof AndAnyOtherArgs; + } + /** * Check if passed arguments match an argument expectation * @@ -332,15 +338,36 @@ class Expectation implements ExpectationInterface } $argCount = count($args); if ($argCount !== count((array) $this->_expectedArgs)) { + $lastExpectedArgument = end($this->_expectedArgs); + reset($this->_expectedArgs); + + if ($this->isAndAnyOtherArgumentsMatcher($lastExpectedArgument)) { + $argCountToSkipMatching = $argCount - count($this->_expectedArgs); + $args = array_slice($args, 0, $argCountToSkipMatching); + return $this->_matchArgs($args); + } + return false; } + + return $this->_matchArgs($args); + } + + /** + * Check if the passed arguments match the expectations, one by one. + * + * @param array $args + * @return bool + */ + protected function _matchArgs($args) + { + $argCount = count($args); for ($i=0; $i<$argCount; $i++) { $param =& $args[$i]; if (!$this->_matchArg($this->_expectedArgs[$i], $param)) { return false; } } - return true; } @@ -348,7 +375,7 @@ class Expectation implements ExpectationInterface * Check if passed argument matches an argument expectation * * @param mixed $expected - * @param mixed &$actual + * @param mixed $actual * @return bool */ protected function _matchArg($expected, &$actual) @@ -377,7 +404,7 @@ class Expectation implements ExpectationInterface /** * Expected argument setter for the expectation * - * @param mixed[] ... + * @param mixed[] ...$args * @return self */ public function with(...$args) @@ -457,7 +484,7 @@ class Expectation implements ExpectationInterface /** * Set a return value, or sequential queue of return values * - * @param mixed[] ... + * @param mixed[] ...$args * @return self */ public function andReturn(...$args) @@ -469,7 +496,7 @@ class Expectation implements ExpectationInterface /** * Set a return value, or sequential queue of return values * - * @param mixed[] ... + * @param mixed[] ...$args * @return self */ public function andReturns(...$args) @@ -504,7 +531,7 @@ class Expectation implements ExpectationInterface * values. The arguments passed to the expected method are passed to the * closures as parameters. * - * @param callable[] $args + * @param callable[] ...$args * @return self */ public function andReturnUsing(...$args) @@ -590,7 +617,7 @@ class Expectation implements ExpectationInterface * Register values to be set to a public property each time this expectation occurs * * @param string $name - * @param array $values + * @param array ...$values * @return self */ public function andSet($name, ...$values) diff --git a/vendor/mockery/mockery/library/Mockery/ExpectationDirector.php b/vendor/mockery/mockery/library/Mockery/ExpectationDirector.php index 41f01f0f..97368454 100644 --- a/vendor/mockery/mockery/library/Mockery/ExpectationDirector.php +++ b/vendor/mockery/mockery/library/Mockery/ExpectationDirector.php @@ -150,7 +150,7 @@ class ExpectationDirector * Make the given expectation a default for all others assuming it was * correctly created last * - * @param \Mockery\Expectation + * @param \Mockery\Expectation $expectation */ public function makeExpectationDefault(\Mockery\Expectation $expectation) { diff --git a/vendor/mockery/mockery/library/Mockery/ExpectationInterface.php b/vendor/mockery/mockery/library/Mockery/ExpectationInterface.php index 7cd9d8f2..7d0b5368 100644 --- a/vendor/mockery/mockery/library/Mockery/ExpectationInterface.php +++ b/vendor/mockery/mockery/library/Mockery/ExpectationInterface.php @@ -21,17 +21,6 @@ namespace Mockery; -/** - * @method Expectation once() - * @method Expectation zeroOrMoreTimes() - * @method Expectation twice() - * @method Expectation times(int $limit) - * @method Expectation never() - * @method Expectation atLeast() - * @method Expectation atMost() - * @method Expectation between() - * @method Expectation because(string $message) - */ interface ExpectationInterface { /** @@ -45,7 +34,7 @@ interface ExpectationInterface public function getMock(); /** - * @param array $args + * @param array ...$args * @return self */ public function andReturn(...$args); diff --git a/vendor/mockery/mockery/library/Mockery/ExpectsHigherOrderMessage.php b/vendor/mockery/mockery/library/Mockery/ExpectsHigherOrderMessage.php index 7c7b57ad..6255cb08 100644 --- a/vendor/mockery/mockery/library/Mockery/ExpectsHigherOrderMessage.php +++ b/vendor/mockery/mockery/library/Mockery/ExpectsHigherOrderMessage.php @@ -24,7 +24,7 @@ class ExpectsHigherOrderMessage extends HigherOrderMessage { public function __construct(MockInterface $mock) { - return parent::__construct($mock, "shouldReceive"); + parent::__construct($mock, "shouldReceive"); } /** * @return \Mockery\Expectation diff --git a/vendor/mockery/mockery/library/Mockery/Generator/Method.php b/vendor/mockery/mockery/library/Mockery/Generator/Method.php index 27439ea9..467683d8 100644 --- a/vendor/mockery/mockery/library/Mockery/Generator/Method.php +++ b/vendor/mockery/mockery/library/Mockery/Generator/Method.php @@ -48,6 +48,8 @@ class Method if ('self' === $returnType) { $returnType = "\\".$this->method->getDeclaringClass()->getName(); + } elseif (!\Mockery::isBuiltInType($returnType)) { + $returnType = '\\'.$returnType; } if (version_compare(PHP_VERSION, '7.1.0-dev') >= 0 && $this->method->getReturnType()->allowsNull()) { diff --git a/vendor/mockery/mockery/library/Mockery/Generator/MockConfiguration.php b/vendor/mockery/mockery/library/Mockery/Generator/MockConfiguration.php index 35479348..35ce0fea 100644 --- a/vendor/mockery/mockery/library/Mockery/Generator/MockConfiguration.php +++ b/vendor/mockery/mockery/library/Mockery/Generator/MockConfiguration.php @@ -92,6 +92,8 @@ class MockConfiguration */ protected $mockOriginalDestructor = false; + protected $constantsMap = array(); + public function __construct( array $targets = array(), array $blackListedMethods = array(), @@ -99,7 +101,8 @@ class MockConfiguration $name = null, $instanceMock = false, array $parameterOverrides = array(), - $mockOriginalDestructor = false + $mockOriginalDestructor = false, + array $constantsMap = array() ) { $this->addTargets($targets); $this->blackListedMethods = $blackListedMethods; @@ -108,6 +111,7 @@ class MockConfiguration $this->instanceMock = $instanceMock; $this->parameterOverrides = $parameterOverrides; $this->mockOriginalDestructor = $mockOriginalDestructor; + $this->constantsMap = $constantsMap; } /** @@ -247,7 +251,8 @@ class MockConfiguration $className, $this->instanceMock, $this->parameterOverrides, - $this->mockOriginalDestructor + $this->mockOriginalDestructor, + $this->constantsMap ); } @@ -538,4 +543,9 @@ class MockConfiguration { $this->targetObject = $object; } + + public function getConstantsMap() + { + return $this->constantsMap; + } } diff --git a/vendor/mockery/mockery/library/Mockery/Generator/MockConfigurationBuilder.php b/vendor/mockery/mockery/library/Mockery/Generator/MockConfigurationBuilder.php index 29a90d55..81704929 100644 --- a/vendor/mockery/mockery/library/Mockery/Generator/MockConfigurationBuilder.php +++ b/vendor/mockery/mockery/library/Mockery/Generator/MockConfigurationBuilder.php @@ -68,6 +68,7 @@ class MockConfigurationBuilder protected $mockOriginalDestructor = false; protected $targets = array(); + protected $constantsMap = array(); public function __construct() { @@ -154,6 +155,11 @@ class MockConfigurationBuilder return $this; } + public function setConstantsMap(array $map) + { + $this->constantsMap = $map; + } + public function getMockConfiguration() { return new MockConfiguration( @@ -163,7 +169,8 @@ class MockConfigurationBuilder $this->name, $this->instanceMock, $this->parameterOverrides, - $this->mockOriginalDestructor + $this->mockOriginalDestructor, + $this->constantsMap ); } } diff --git a/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ConstantsPass.php b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ConstantsPass.php new file mode 100644 index 00000000..28f5cdff --- /dev/null +++ b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/ConstantsPass.php @@ -0,0 +1,33 @@ +getConstantsMap(); + if (empty($cm)) { + return $code; + } + + if (!isset($cm[$config->getName()])) { + return $code; + } + + $cm = $cm[$config->getName()]; + + $constantsCode = ''; + foreach ($cm as $constant => $value) { + $constantsCode .= sprintf("\n const %s = '%s';\n", $constant, $value); + } + + $i = strrpos($code, '}'); + $code = substr_replace($code, $constantsCode, $i); + $code .= "}\n"; + + return $code; + } +} diff --git a/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPass.php b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPass.php index 92b143fe..4a457b34 100644 --- a/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPass.php +++ b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPass.php @@ -50,7 +50,7 @@ class MagicMethodTypeHintsPass implements Pass /** * Apply implementation. * - * @param $code + * @param string $code * @param MockConfiguration $config * @return string */ @@ -90,7 +90,7 @@ class MagicMethodTypeHintsPass implements Pass * Applies type hints of magic methods from * class to the passed code. * - * @param $code + * @param int $code * @param Method $method * @return string */ @@ -113,7 +113,7 @@ class MagicMethodTypeHintsPass implements Pass /** * Checks if the method is declared withing code. * - * @param $code + * @param int $code * @param Method $method * @return boolean */ @@ -129,13 +129,12 @@ class MagicMethodTypeHintsPass implements Pass * Returns the method original parameters, as they're * described in the $code string. * - * @param $code + * @param int $code * @param Method $method * @return array */ private function getOriginalParameters($code, Method $method) { - $methodName = $method->getName(); $matches = []; $parameterMatches = []; @@ -204,7 +203,6 @@ class MagicMethodTypeHintsPass implements Pass */ private function getDeclarationRegex($methodName) { - $method = strtolower($methodName); return "/public\s+(?:static\s+)?function\s+$methodName\s*\(.*\)\s*(?=\{)/i"; } } diff --git a/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php index f133adde..c83ecf8c 100644 --- a/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php +++ b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php @@ -101,26 +101,10 @@ class MethodDefinitionPass implements Pass protected function renderTypeHint(Parameter $param) { - $languageTypeHints = array( - 'self', - 'array', - 'callable', - // Up to php 7 - 'bool', - 'float', - 'int', - 'string', - 'iterable', - ); - - if (version_compare(PHP_VERSION, '7.2.0-dev') >= 0) { - $languageTypeHints[] = 'object'; - } - $typeHint = trim($param->getTypeHintAsString()); if (!empty($typeHint)) { - if (!in_array($typeHint, $languageTypeHints)) { + if (!\Mockery::isBuiltInType($typeHint)) { $typeHint = '\\'.$typeHint; } diff --git a/vendor/mockery/mockery/library/Mockery/Generator/StringManipulationGenerator.php b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulationGenerator.php index d60db908..544bb88f 100644 --- a/vendor/mockery/mockery/library/Mockery/Generator/StringManipulationGenerator.php +++ b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulationGenerator.php @@ -20,18 +20,19 @@ namespace Mockery\Generator; -use Mockery\Generator\StringManipulation\Pass\Pass; -use Mockery\Generator\StringManipulation\Pass\RemoveDestructorPass; use Mockery\Generator\StringManipulation\Pass\CallTypeHintPass; -use Mockery\Generator\StringManipulation\Pass\MagicMethodTypeHintsPass; use Mockery\Generator\StringManipulation\Pass\ClassNamePass; use Mockery\Generator\StringManipulation\Pass\ClassPass; -use Mockery\Generator\StringManipulation\Pass\TraitPass; +use Mockery\Generator\StringManipulation\Pass\ConstantsPass; use Mockery\Generator\StringManipulation\Pass\InstanceMockPass; use Mockery\Generator\StringManipulation\Pass\InterfacePass; +use Mockery\Generator\StringManipulation\Pass\MagicMethodTypeHintsPass; use Mockery\Generator\StringManipulation\Pass\MethodDefinitionPass; +use Mockery\Generator\StringManipulation\Pass\Pass; use Mockery\Generator\StringManipulation\Pass\RemoveBuiltinMethodsThatAreFinalPass; +use Mockery\Generator\StringManipulation\Pass\RemoveDestructorPass; use Mockery\Generator\StringManipulation\Pass\RemoveUnserializeForInternalSerializableClassesPass; +use Mockery\Generator\StringManipulation\Pass\TraitPass; class StringManipulationGenerator implements Generator { @@ -56,6 +57,7 @@ class StringManipulationGenerator implements Generator new RemoveUnserializeForInternalSerializableClassesPass(), new RemoveBuiltinMethodsThatAreFinalPass(), new RemoveDestructorPass(), + new ConstantsPass(), ]); } diff --git a/vendor/mockery/mockery/library/Mockery/Generator/TargetClassInterface.php b/vendor/mockery/mockery/library/Mockery/Generator/TargetClassInterface.php index 422bddf3..77244124 100644 --- a/vendor/mockery/mockery/library/Mockery/Generator/TargetClassInterface.php +++ b/vendor/mockery/mockery/library/Mockery/Generator/TargetClassInterface.php @@ -27,7 +27,7 @@ interface TargetClassInterface * TargetClassInterface's * implementation. * - * @param $name + * @param string $name * @return TargetClassInterface */ public static function factory($name); @@ -92,7 +92,7 @@ interface TargetClassInterface * Returns whether the targetClass is in * the passed interface. * - * @param $interface + * @param mixed $interface * @return boolean */ public function implementsInterface($interface); diff --git a/vendor/mockery/mockery/library/Mockery/HigherOrderMessage.php b/vendor/mockery/mockery/library/Mockery/HigherOrderMessage.php index 851183ad..1c13c898 100644 --- a/vendor/mockery/mockery/library/Mockery/HigherOrderMessage.php +++ b/vendor/mockery/mockery/library/Mockery/HigherOrderMessage.php @@ -39,12 +39,11 @@ class HigherOrderMessage */ public function __call($method, $args) { - $expectation = $this->mock->{$this->method}($method); - - if ($this->method !== "shouldNotHaveReceived") { - return $expectation->withArgs($args); + if ($this->method === 'shouldNotHaveReceived') { + return $this->mock->{$this->method}($method, $args); } - return $expectation; + $expectation = $this->mock->{$this->method}($method); + return $expectation->withArgs($args); } } diff --git a/vendor/mockery/mockery/library/Mockery/Instantiator.php b/vendor/mockery/mockery/library/Mockery/Instantiator.php index a6239bc4..0e2c4647 100644 --- a/vendor/mockery/mockery/library/Mockery/Instantiator.php +++ b/vendor/mockery/mockery/library/Mockery/Instantiator.php @@ -47,7 +47,6 @@ final class Instantiator { $factory = $this->buildFactory($className); $instance = $factory(); - $reflection = new ReflectionClass($instance); return $instance; } diff --git a/vendor/mockery/mockery/library/Mockery/Matcher/AndAnyOtherArgs.php b/vendor/mockery/mockery/library/Mockery/Matcher/AndAnyOtherArgs.php new file mode 100644 index 00000000..e3c3b943 --- /dev/null +++ b/vendor/mockery/mockery/library/Mockery/Matcher/AndAnyOtherArgs.php @@ -0,0 +1,45 @@ +'; + } +} diff --git a/vendor/mockery/mockery/library/Mockery/Matcher/AnyOf.php b/vendor/mockery/mockery/library/Mockery/Matcher/AnyOf.php index 1ed11faf..bcce4b74 100644 --- a/vendor/mockery/mockery/library/Mockery/Matcher/AnyOf.php +++ b/vendor/mockery/mockery/library/Mockery/Matcher/AnyOf.php @@ -31,12 +31,7 @@ class AnyOf extends MatcherAbstract */ public function match(&$actual) { - foreach ($this->_expected as $exp) { - if ($actual === $exp) { - return true; - } - } - return false; + return in_array($actual, $this->_expected, true); } /** diff --git a/vendor/mockery/mockery/library/Mockery/Matcher/MustBe.php b/vendor/mockery/mockery/library/Mockery/Matcher/MustBe.php index b841ba5a..27b5ec56 100644 --- a/vendor/mockery/mockery/library/Mockery/Matcher/MustBe.php +++ b/vendor/mockery/mockery/library/Mockery/Matcher/MustBe.php @@ -35,9 +35,9 @@ class MustBe extends MatcherAbstract { if (!is_object($actual)) { return $this->_expected === $actual; - } else { - return $this->_expected == $actual; } + + return $this->_expected == $actual; } /** diff --git a/vendor/mockery/mockery/library/Mockery/Matcher/PHPUnitConstraint.php b/vendor/mockery/mockery/library/Mockery/Matcher/PHPUnitConstraint.php index d22bf1b5..a9aaf4c4 100644 --- a/vendor/mockery/mockery/library/Mockery/Matcher/PHPUnitConstraint.php +++ b/vendor/mockery/mockery/library/Mockery/Matcher/PHPUnitConstraint.php @@ -28,7 +28,7 @@ class PHPUnitConstraint extends MatcherAbstract protected $rethrow; /** - * @param \PHPUnit\Framework\Constraint $constraint + * @param mixed $constraint * @param bool $rethrow */ public function __construct($constraint, $rethrow = false) @@ -63,7 +63,7 @@ class PHPUnitConstraint extends MatcherAbstract throw $e; } return false; - } + } } /** diff --git a/vendor/mockery/mockery/library/Mockery/Mock.php b/vendor/mockery/mockery/library/Mockery/Mock.php index 1470f025..d4899691 100644 --- a/vendor/mockery/mockery/library/Mockery/Mock.php +++ b/vendor/mockery/mockery/library/Mockery/Mock.php @@ -185,9 +185,9 @@ class Mock implements MockInterface /** * Set expected method calls * - * @param array $methodNames,... one or many methods that are expected to be called in this mock + * @param array ...$methodNames one or many methods that are expected to be called in this mock * - * @return \Mockery\ExpectationInterface|\Mockery\HigherOrderMessage + * @return \Mockery\ExpectationInterface|\Mockery\Expectation|\Mockery\HigherOrderMessage */ public function shouldReceive(...$methodNames) { @@ -201,21 +201,18 @@ class Mock implements MockInterface } } - /** @var array $nonPublicMethods */ - $nonPublicMethods = $this->getNonPublicMethods(); - $self = $this; $allowMockingProtectedMethods = $this->_mockery_allowMockingProtectedMethods; $lastExpectation = \Mockery::parseShouldReturnArgs( - $this, $methodNames, function ($method) use ($self, $nonPublicMethods, $allowMockingProtectedMethods) { + $this, $methodNames, function ($method) use ($self, $allowMockingProtectedMethods) { $rm = $self->mockery_getMethod($method); if ($rm) { if ($rm->isPrivate()) { throw new \InvalidArgumentException("$method() cannot be mocked as it is a private method"); } if (!$allowMockingProtectedMethods && $rm->isProtected()) { - throw new \InvalidArgumentException("$method() cannot be mocked as it is a protected method and mocking protected methods is not enabled for the currently used mock object."); + throw new \InvalidArgumentException("$method() cannot be mocked as it is a protected method and mocking protected methods is not enabled for the currently used mock object. Use shouldAllowMockingProtectedMethods() to enable mocking of protected methods."); } } @@ -234,7 +231,7 @@ class Mock implements MockInterface /** * @param mixed $something String method name or map of method => return - * @return self|\Mockery\ExpectationInterface|\Mockery\HigherOrderMessage + * @return self|\Mockery\ExpectationInterface|\Mockery\Expectation|\Mockery\HigherOrderMessage */ public function allows($something = []) { @@ -255,7 +252,7 @@ class Mock implements MockInterface /** * @param mixed $something String method name (optional) - * @return \Mockery\ExpectationInterface|ExpectsHigherOrderMessage + * @return \Mockery\ExpectationInterface|\Mockery\Expectation|ExpectsHigherOrderMessage */ public function expects($something = null) { @@ -269,8 +266,8 @@ class Mock implements MockInterface /** * Shortcut method for setting an expectation that a method should not be called. * - * @param array $methodNames one or many methods that are expected not to be called in this mock - * @return \Mockery\Expectation|\Mockery\HigherOrderMessage + * @param array ...$methodNames one or many methods that are expected not to be called in this mock + * @return \Mockery\ExpectationInterface|\Mockery\Expectation|\Mockery\HigherOrderMessage */ public function shouldNotReceive(...$methodNames) { @@ -329,22 +326,27 @@ class Mock implements MockInterface * This is particularly useless for this class, as it doesn't have a parent, * but included for completeness * + * @deprecated 2.0.0 Please use makePartial() instead + * * @return Mock */ public function shouldDeferMissing() { - $this->_mockery_deferMissing = true; - return $this; + return $this->makePartial(); } /** - * Create an obviously worded alias to shouldDeferMissing() + * Set mock to defer unexpected methods to it's parent + * + * It was an alias for shouldDeferMissing(), which will be removed + * in 2.0.0. * * @return Mock */ public function makePartial() { - return $this->shouldDeferMissing(); + $this->_mockery_deferMissing = true; + return $this; } /** @@ -629,7 +631,7 @@ class Mock implements MockInterface public function mockery_isAnonymous() { $rfc = new \ReflectionClass($this); - + // HHVM has a Stringish interface $interfaces = array_filter($rfc->getInterfaces(), function ($i) { return $i->getName() !== "Stringish"; @@ -762,8 +764,8 @@ class Mock implements MockInterface protected static function _mockery_handleStaticMethodCall($method, array $args) { + $associatedRealObject = \Mockery::fetchMock(__CLASS__); try { - $associatedRealObject = \Mockery::fetchMock(__CLASS__); return $associatedRealObject->__call($method, $args); } catch (BadMethodCallException $e) { throw new BadMethodCallException( @@ -780,6 +782,22 @@ class Mock implements MockInterface return $this->_mockery_receivedMethodCalls ?: $this->_mockery_receivedMethodCalls = new \Mockery\ReceivedMethodCalls(); } + protected function _mockery_findExpectedMethodHandler($method) + { + if (isset($this->_mockery_expectations[$method])) { + return $this->_mockery_expectations[$method]; + } + + $lowerCasedMockeryExpectations = array_change_key_case($this->_mockery_expectations, CASE_LOWER); + $lowerCasedMethod = strtolower($method); + + if (isset($lowerCasedMockeryExpectations[$lowerCasedMethod])) { + return $lowerCasedMockeryExpectations[$lowerCasedMethod]; + } + + return null; + } + protected function _mockery_handleMethodCall($method, array $args) { $this->_mockery_getReceivedMethodCalls()->push(new \Mockery\MethodCall($method, $args)); @@ -802,10 +820,9 @@ class Mock implements MockInterface return call_user_func_array("parent::$method", $args); } - if (isset($this->_mockery_expectations[$method]) - && !$this->_mockery_disableExpectationMatching) { - $handler = $this->_mockery_expectations[$method]; + $handler = $this->_mockery_findExpectedMethodHandler($method); + if ($handler !== null && !$this->_mockery_disableExpectationMatching) { try { return $handler->call($args); } catch (\Mockery\Exception\NoMatchingExpectationException $e) { @@ -831,9 +848,9 @@ class Mock implements MockInterface return call_user_func_array(array($this->_mockery_defaultReturnValue, $method), $args); } elseif (null === $this->_mockery_defaultReturnValue) { return $this->mockery_returnValueForMethod($method); - } else { - return $this->_mockery_defaultReturnValue; } + + return $this->_mockery_defaultReturnValue; } } @@ -858,7 +875,7 @@ class Mock implements MockInterface */ protected function mockery_getMethods() { - if (static::$_mockery_methods) { + if (static::$_mockery_methods && \Mockery::getConfiguration()->reflectionCacheEnabled()) { return static::$_mockery_methods; } diff --git a/vendor/mockery/mockery/library/Mockery/MockInterface.php b/vendor/mockery/mockery/library/Mockery/MockInterface.php index dcf99f64..a0bd6b68 100644 --- a/vendor/mockery/mockery/library/Mockery/MockInterface.php +++ b/vendor/mockery/mockery/library/Mockery/MockInterface.php @@ -24,13 +24,13 @@ interface MockInterface { /** * @param mixed $something String method name or map of method => return - * @return self|\Mockery\ExpectationInterface|\Mockery\HigherOrderMessage + * @return self|\Mockery\ExpectationInterface|\Mockery\Expectation|\Mockery\HigherOrderMessage */ public function allows($something = []); /** * @param mixed $something String method name (optional) - * @return \Mockery\ExpectationInterface|\Mockery\ExpectsHigherOrderMessage + * @return \Mockery\ExpectationInterface|\Mockery\Expectation|\Mockery\ExpectsHigherOrderMessage */ public function expects($something = null); @@ -48,15 +48,15 @@ interface MockInterface * * @param array ...$methodNames one or many methods that are expected to be called in this mock * - * @return \Mockery\ExpectationInterface|\Mockery\HigherOrderMessage + * @return \Mockery\ExpectationInterface|\Mockery\Expectation|\Mockery\HigherOrderMessage */ public function shouldReceive(...$methodNames); /** * Shortcut method for setting an expectation that a method should not be called. * - * @param array $methodNames one or many methods that are expected not to be called in this mock - * @return \Mockery\Expectation|\Mockery\HigherOrderMessage + * @param array ...$methodNames one or many methods that are expected not to be called in this mock + * @return \Mockery\ExpectationInterface|\Mockery\Expectation|\Mockery\HigherOrderMessage */ public function shouldNotReceive(...$methodNames); @@ -81,10 +81,12 @@ interface MockInterface /** * Set mock to defer unexpected methods to its parent if possible * + * @deprecated 2.0.0 Please use makePartial() instead + * * @return Mock */ public function shouldDeferMissing(); - + /** * Set mock to defer unexpected methods to its parent if possible * diff --git a/vendor/mockery/mockery/library/helpers.php b/vendor/mockery/mockery/library/helpers.php index a700d990..7f5af5da 100644 --- a/vendor/mockery/mockery/library/helpers.php +++ b/vendor/mockery/mockery/library/helpers.php @@ -1,5 +1,6 @@ ./tests + ./tests/Mockery/MockingOldStyleConstructorTest.php ./tests/Mockery/MockingVariadicArgumentsTest.php ./tests/Mockery/MockingParameterAndReturnTypesTest.php ./tests/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php ./tests/Mockery/Php72LanguageFeaturesTest.php + ./tests/Mockery/MockingOldStyleConstructorTest.php ./tests/Mockery/MockingParameterAndReturnTypesTest.php ./tests/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php ./tests/Mockery/Php72LanguageFeaturesTest.php diff --git a/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegrationTest.php b/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegrationTest.php index 7db722c7..72f87a29 100644 --- a/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegrationTest.php +++ b/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegrationTest.php @@ -7,21 +7,24 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Adapter\Phpunit\MockeryTestCase; use Mockery\Exception\BadMethodCallException; -class BaseClassStub +class BaseClassStub { use MockeryPHPUnitIntegration; - function finish() { + public function finish() + { $this->checkMockeryExceptions(); } - function markAsRisky() {} + public function markAsRisky() + { + } }; class MockeryPHPUnitIntegrationTest extends MockeryTestCase { - /** - * @test + /** + * @test * @requires PHPUnit 5.7.6 */ public function it_marks_a_passing_test_as_risky_if_we_threw_exceptions() @@ -36,10 +39,10 @@ class MockeryPHPUnitIntegrationTest extends MockeryTestCase $test = spy(BaseClassStub::class)->makePartial(); $test->finish(); - $test->shouldHaveReceived()->markAsRisky(m::type("string")); + $test->shouldHaveReceived()->markAsRisky(); } - /** + /** * @test * @requires PHPUnit 5.7.6 */ @@ -55,6 +58,6 @@ class MockeryPHPUnitIntegrationTest extends MockeryTestCase $test = spy(BaseClassStub::class)->makePartial(); $test->finish(); - $test->shouldNotHaveReceived()->markAsRisky(m::any()); + $test->shouldNotHaveReceived()->markAsRisky(); } } diff --git a/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/TestListenerTest.php b/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/TestListenerTest.php index fda081cb..fcabd999 100644 --- a/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/TestListenerTest.php +++ b/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/TestListenerTest.php @@ -83,6 +83,15 @@ class Mockery_Adapter_Phpunit_TestListenerTest extends TestCase $mock->bar(); \Mockery::close(); } + + public function testMockeryIsAddedToBlacklist() + { + $suite = \Mockery::mock(\PHPUnit\Framework\TestSuite::class); + + $this->assertArrayNotHasKey(\Mockery::class, \PHPUnit\Util\Blacklist::$blacklistedClassNames); + $this->listener->startTestSuite($suite); + $this->assertSame(1, \PHPUnit\Util\Blacklist::$blacklistedClassNames[\Mockery::class]); + } } class EmptyTestCase extends TestCase diff --git a/vendor/mockery/mockery/tests/Mockery/AdhocTest.php b/vendor/mockery/mockery/tests/Mockery/AdhocTest.php index 2da4338c..b930c0a4 100644 --- a/vendor/mockery/mockery/tests/Mockery/AdhocTest.php +++ b/vendor/mockery/mockery/tests/Mockery/AdhocTest.php @@ -39,31 +39,31 @@ class Mockery_AdhocTest extends MockeryTestCase public function testSimplestMockCreation() { $m = $this->container->mock('MockeryTest_NameOfExistingClass'); - $this->assertTrue($m instanceof MockeryTest_NameOfExistingClass); + $this->assertInstanceOf(MockeryTest_NameOfExistingClass::class, $m); } public function testMockeryInterfaceForClass() { $m = $this->container->mock('SplFileInfo'); - $this->assertTrue($m instanceof \Mockery\MockInterface); + $this->assertInstanceOf(\Mockery\MockInterface::class, $m); } public function testMockeryInterfaceForNonExistingClass() { $m = $this->container->mock('ABC_IDontExist'); - $this->assertTrue($m instanceof \Mockery\MockInterface); + $this->assertInstanceOf(\Mockery\MockInterface::class, $m); } public function testMockeryInterfaceForInterface() { $m = $this->container->mock('MockeryTest_NameOfInterface'); - $this->assertTrue($m instanceof \Mockery\MockInterface); + $this->assertInstanceOf(\Mockery\MockInterface::class, $m); } public function testMockeryInterfaceForAbstract() { $m = $this->container->mock('MockeryTest_NameOfAbstract'); - $this->assertTrue($m instanceof \Mockery\MockInterface); + $this->assertInstanceOf(\Mockery\MockInterface::class, $m); } public function testInvalidCountExceptionThrowsRuntimeExceptionOnIllegalComparativeSymbol() diff --git a/vendor/mockery/mockery/tests/Mockery/ContainerTest.php b/vendor/mockery/mockery/tests/Mockery/ContainerTest.php index c8aa55b3..c71f3f7d 100644 --- a/vendor/mockery/mockery/tests/Mockery/ContainerTest.php +++ b/vendor/mockery/mockery/tests/Mockery/ContainerTest.php @@ -38,21 +38,21 @@ class ContainerTest extends MockeryTestCase $m = mock(); $m->shouldReceive('foo->bar'); $this->assertRegExp( - '/Mockery_(\d+)__demeter_foo/', - Mockery::getContainer()->getKeyOfDemeterMockFor('foo') + '/Mockery_(\d+)__demeter_([0-9a-f]+)_foo/', + Mockery::getContainer()->getKeyOfDemeterMockFor('foo', get_class($m)) ); } public function testGetKeyOfDemeterMockShouldReturnNullWhenNoMatchingMock() { $method = 'unknownMethod'; - $this->assertNull(Mockery::getContainer()->getKeyOfDemeterMockFor($method)); + $this->assertNull(Mockery::getContainer()->getKeyOfDemeterMockFor($method, 'any')); $m = mock(); $m->shouldReceive('method'); - $this->assertNull(Mockery::getContainer()->getKeyOfDemeterMockFor($method)); + $this->assertNull(Mockery::getContainer()->getKeyOfDemeterMockFor($method, get_class($m))); $m->shouldReceive('foo->bar'); - $this->assertNull(Mockery::getContainer()->getKeyOfDemeterMockFor($method)); + $this->assertNull(Mockery::getContainer()->getKeyOfDemeterMockFor($method, get_class($m))); } @@ -159,14 +159,14 @@ class ContainerTest extends MockeryTestCase public function testNamedMockWithConstructorArgsButNoQuickDefsShouldLeaveConstructorIntact() { $m = mock("MockeryTest_ClassConstructor2", array($param1 = new stdClass())); - $m->shouldDeferMissing(); + $m->makePartial(); $this->assertEquals($param1, $m->getParam1()); } - public function testNamedMockWithShouldDeferMissing() + public function testNamedMockWithMakePartial() { $m = mock("MockeryTest_ClassConstructor2", array($param1 = new stdClass())); - $m->shouldDeferMissing(); + $m->makePartial(); $this->assertEquals('foo', $m->bar()); $m->shouldReceive("bar")->andReturn(123); $this->assertEquals(123, $m->bar()); @@ -175,10 +175,10 @@ class ContainerTest extends MockeryTestCase /** * @expectedException BadMethodCallException */ - public function testNamedMockWithShouldDeferMissingThrowsIfNotAvailable() + public function testNamedMockWithMakePartialThrowsIfNotAvailable() { $m = mock("MockeryTest_ClassConstructor2", array($param1 = new stdClass())); - $m->shouldDeferMissing(); + $m->makePartial(); $m->foorbar123(); $m->mockery_verify(); } @@ -188,13 +188,13 @@ class ContainerTest extends MockeryTestCase $m = mock('stdClass'); $m->shouldReceive('foo')->andReturn('bar'); $this->assertEquals('bar', $m->foo()); - $this->assertTrue($m instanceof stdClass); + $this->assertInstanceOf(stdClass::class, $m); } public function testMockingAKnownUserClassSoMockInheritsClassType() { $m = mock('MockeryTest_TestInheritedType'); - $this->assertTrue($m instanceof MockeryTest_TestInheritedType); + $this->assertInstanceOf(MockeryTest_TestInheritedType::class, $m); } public function testMockingAConcreteObjectCreatesAPartialWithoutError() @@ -202,7 +202,7 @@ class ContainerTest extends MockeryTestCase $m = mock(new stdClass); $m->shouldReceive('foo')->andReturn('bar'); $this->assertEquals('bar', $m->foo()); - $this->assertTrue($m instanceof stdClass); + $this->assertInstanceOf(stdClass::class, $m); } public function testCreatingAPartialAllowsDynamicExpectationsAndPassesThroughUnexpectedMethods() @@ -211,7 +211,7 @@ class ContainerTest extends MockeryTestCase $m->shouldReceive('bar')->andReturn('bar'); $this->assertEquals('bar', $m->bar()); $this->assertEquals('foo', $m->foo()); - $this->assertTrue($m instanceof MockeryTestFoo); + $this->assertInstanceOf(MockeryTestFoo::class, $m); } public function testCreatingAPartialAllowsExpectationsToInterceptCallsToImplementedMethods() @@ -220,7 +220,7 @@ class ContainerTest extends MockeryTestCase $m->shouldReceive('bar')->andReturn('baz'); $this->assertEquals('baz', $m->bar()); $this->assertEquals('foo', $m->foo()); - $this->assertTrue($m instanceof MockeryTestFoo2); + $this->assertInstanceOf(MockeryTestFoo2::class, $m); } public function testBlockForwardingToPartialObject() @@ -264,7 +264,7 @@ class ContainerTest extends MockeryTestCase $m = mock(new MockeryFoo3); $m->shouldReceive('foo')->andReturn('baz'); $this->assertEquals('baz', $m->foo()); - $this->assertFalse($m instanceof MockeryFoo3); + $this->assertNotInstanceOf(MockeryFoo3::class, $m); } public function testSplClassWithFinalMethodsCanBeMocked() @@ -272,7 +272,7 @@ class ContainerTest extends MockeryTestCase $m = mock('SplFileInfo'); $m->shouldReceive('foo')->andReturn('baz'); $this->assertEquals('baz', $m->foo()); - $this->assertTrue($m instanceof SplFileInfo); + $this->assertInstanceOf(SplFileInfo::class, $m); } public function testSplClassWithFinalMethodsCanBeMockedMultipleTimes() @@ -281,7 +281,7 @@ class ContainerTest extends MockeryTestCase $m = mock('SplFileInfo'); $m->shouldReceive('foo')->andReturn('baz'); $this->assertEquals('baz', $m->foo()); - $this->assertTrue($m instanceof SplFileInfo); + $this->assertInstanceOf(SplFileInfo::class, $m); } public function testClassesWithFinalMethodsCanBeProxyPartialMocks() @@ -290,7 +290,7 @@ class ContainerTest extends MockeryTestCase $m->shouldReceive('foo')->andReturn('baz'); $this->assertEquals('baz', $m->foo()); $this->assertEquals('bar', $m->bar()); - $this->assertTrue($m instanceof MockeryFoo4); + $this->assertInstanceOf(MockeryFoo4::class, $m); } public function testClassesWithFinalMethodsCanBeProperPartialMocks() @@ -299,7 +299,7 @@ class ContainerTest extends MockeryTestCase $m->shouldReceive('bar')->andReturn('baz'); $this->assertEquals('baz', $m->foo()); $this->assertEquals('baz', $m->bar()); - $this->assertTrue($m instanceof MockeryFoo4); + $this->assertInstanceOf(MockeryFoo4::class, $m); } public function testClassesWithFinalMethodsCanBeProperPartialMocksButFinalMethodsNotPartialed() @@ -307,7 +307,7 @@ class ContainerTest extends MockeryTestCase $m = mock('MockeryFoo4[foo]'); $m->shouldReceive('foo')->andReturn('foo'); $this->assertEquals('baz', $m->foo()); // partial expectation ignored - will fail callcount assertion - $this->assertTrue($m instanceof MockeryFoo4); + $this->assertInstanceOf(MockeryFoo4::class, $m); } public function testSplfileinfoClassMockPassesUserExpectations() @@ -329,19 +329,19 @@ class ContainerTest extends MockeryTestCase public function testCanMockInterface() { $m = mock('MockeryTest_Interface'); - $this->assertTrue($m instanceof MockeryTest_Interface); + $this->assertInstanceOf(MockeryTest_Interface::class, $m); } public function testCanMockSpl() { $m = mock('\\SplFixedArray'); - $this->assertTrue($m instanceof SplFixedArray); + $this->assertInstanceOf(SplFixedArray::class, $m); } public function testCanMockInterfaceWithAbstractMethod() { $m = mock('MockeryTest_InterfaceWithAbstractMethod'); - $this->assertTrue($m instanceof MockeryTest_InterfaceWithAbstractMethod); + $this->assertInstanceOf(MockeryTest_InterfaceWithAbstractMethod::class, $m); $m->shouldReceive('foo')->andReturn(1); $this->assertEquals(1, $m->foo()); } @@ -349,25 +349,25 @@ class ContainerTest extends MockeryTestCase public function testCanMockAbstractWithAbstractProtectedMethod() { $m = mock('MockeryTest_AbstractWithAbstractMethod'); - $this->assertTrue($m instanceof MockeryTest_AbstractWithAbstractMethod); + $this->assertInstanceOf(MockeryTest_AbstractWithAbstractMethod::class, $m); } public function testCanMockInterfaceWithPublicStaticMethod() { $m = mock('MockeryTest_InterfaceWithPublicStaticMethod'); - $this->assertTrue($m instanceof MockeryTest_InterfaceWithPublicStaticMethod); + $this->assertInstanceOf(MockeryTest_InterfaceWithPublicStaticMethod::class, $m); } public function testCanMockClassWithConstructor() { $m = mock('MockeryTest_ClassConstructor'); - $this->assertTrue($m instanceof MockeryTest_ClassConstructor); + $this->assertInstanceOf(MockeryTest_ClassConstructor::class, $m); } public function testCanMockClassWithConstructorNeedingClassArgs() { $m = mock('MockeryTest_ClassConstructor2'); - $this->assertTrue($m instanceof MockeryTest_ClassConstructor2); + $this->assertInstanceOf(MockeryTest_ClassConstructor2::class, $m); } /** @@ -376,7 +376,7 @@ class ContainerTest extends MockeryTestCase public function testCanPartiallyMockANormalClass() { $m = mock('MockeryTest_PartialNormalClass[foo]'); - $this->assertTrue($m instanceof MockeryTest_PartialNormalClass); + $this->assertInstanceOf(MockeryTest_PartialNormalClass::class, $m); $m->shouldReceive('foo')->andReturn('cba'); $this->assertEquals('abc', $m->bar()); $this->assertEquals('cba', $m->foo()); @@ -388,7 +388,7 @@ class ContainerTest extends MockeryTestCase public function testCanPartiallyMockAnAbstractClass() { $m = mock('MockeryTest_PartialAbstractClass[foo]'); - $this->assertTrue($m instanceof MockeryTest_PartialAbstractClass); + $this->assertInstanceOf(MockeryTest_PartialAbstractClass::class, $m); $m->shouldReceive('foo')->andReturn('cba'); $this->assertEquals('abc', $m->bar()); $this->assertEquals('cba', $m->foo()); @@ -400,7 +400,7 @@ class ContainerTest extends MockeryTestCase public function testCanPartiallyMockANormalClassWith2Methods() { $m = mock('MockeryTest_PartialNormalClass2[foo, baz]'); - $this->assertTrue($m instanceof MockeryTest_PartialNormalClass2); + $this->assertInstanceOf(MockeryTest_PartialNormalClass2::class, $m); $m->shouldReceive('foo')->andReturn('cba'); $m->shouldReceive('baz')->andReturn('cba'); $this->assertEquals('abc', $m->bar()); @@ -414,7 +414,7 @@ class ContainerTest extends MockeryTestCase public function testCanPartiallyMockAnAbstractClassWith2Methods() { $m = mock('MockeryTest_PartialAbstractClass2[foo,baz]'); - $this->assertTrue($m instanceof MockeryTest_PartialAbstractClass2); + $this->assertInstanceOf(MockeryTest_PartialAbstractClass2::class, $m); $m->shouldReceive('foo')->andReturn('cba'); $m->shouldReceive('baz')->andReturn('cba'); $this->assertEquals('abc', $m->bar()); @@ -430,7 +430,7 @@ class ContainerTest extends MockeryTestCase { $this->markTestSkipped('For now...'); $m = mock('MockeryTest_PartialNormalClass[foo]'); - $this->assertTrue($m instanceof MockeryTest_PartialNormalClass); + $this->assertInstanceOf(MockeryTest_PartialNormalClass::class, $m); $m->shouldReceive('bar')->andReturn('cba'); } @@ -449,7 +449,7 @@ class ContainerTest extends MockeryTestCase public function testCanMockClassContainingMagicCallMethod() { $m = mock('MockeryTest_Call1'); - $this->assertTrue($m instanceof MockeryTest_Call1); + $this->assertInstanceOf(MockeryTest_Call1::class, $m); } /** @@ -458,7 +458,7 @@ class ContainerTest extends MockeryTestCase public function testCanMockClassContainingMagicCallMethodWithoutTypeHinting() { $m = mock('MockeryTest_Call2'); - $this->assertTrue($m instanceof MockeryTest_Call2); + $this->assertInstanceOf(MockeryTest_Call2::class, $m); } /** @@ -467,7 +467,7 @@ class ContainerTest extends MockeryTestCase public function testCanMockClassContainingAPublicWakeupMethod() { $m = mock('MockeryTest_Wakeup1'); - $this->assertTrue($m instanceof MockeryTest_Wakeup1); + $this->assertInstanceOf(MockeryTest_Wakeup1::class, $m); } /** @@ -514,7 +514,7 @@ class ContainerTest extends MockeryTestCase $m = mock('alias:MyNamespace\MyClass'); $m->shouldReceive('foo')->andReturn('bar'); $this->assertEquals('bar', $m->foo()); - $this->assertTrue($m instanceof MyNamespace\MyClass); + $this->assertInstanceOf(MyNamespace\MyClass::class, $m); } /** @@ -523,8 +523,8 @@ class ContainerTest extends MockeryTestCase public function testCanMockMultipleInterfaces() { $m = mock('MockeryTest_Interface1, MockeryTest_Interface2'); - $this->assertTrue($m instanceof MockeryTest_Interface1); - $this->assertTrue($m instanceof MockeryTest_Interface2); + $this->assertInstanceOf(MockeryTest_Interface1::class, $m); + $this->assertInstanceOf(MockeryTest_Interface2::class, $m); } /** @@ -532,9 +532,9 @@ class ContainerTest extends MockeryTestCase public function testCanMockMultipleInterfacesThatMayNotExist() { $m = mock('NonExistingClass, MockeryTest_Interface1, MockeryTest_Interface2, \Some\Thing\That\Doesnt\Exist'); - $this->assertTrue($m instanceof MockeryTest_Interface1); - $this->assertTrue($m instanceof MockeryTest_Interface2); - $this->assertTrue($m instanceof \Some\Thing\That\Doesnt\Exist); + $this->assertInstanceOf(MockeryTest_Interface1::class, $m); + $this->assertInstanceOf(MockeryTest_Interface2::class, $m); + $this->assertInstanceOf(\Some\Thing\That\Doesnt\Exist::class, $m); } /** @@ -543,9 +543,9 @@ class ContainerTest extends MockeryTestCase public function testCanMockClassAndApplyMultipleInterfaces() { $m = mock('MockeryTestFoo, MockeryTest_Interface1, MockeryTest_Interface2'); - $this->assertTrue($m instanceof MockeryTestFoo); - $this->assertTrue($m instanceof MockeryTest_Interface1); - $this->assertTrue($m instanceof MockeryTest_Interface2); + $this->assertInstanceOf(MockeryTestFoo::class, $m); + $this->assertInstanceOf(MockeryTest_Interface1::class, $m); + $this->assertInstanceOf(MockeryTest_Interface2::class, $m); } /** @@ -582,7 +582,7 @@ class ContainerTest extends MockeryTestCase MyNameSpace\StaticNoMethod::staticFoo(); } catch (BadMethodCallException $e) { // Mockery + PHPUnit has a fail safe for tests swallowing our - // exceptions + // exceptions $e->dismiss(); return; } @@ -598,7 +598,7 @@ class ContainerTest extends MockeryTestCase $m = mock('MockeryTestFoo'); $m->foo = 'bar'; $this->assertEquals('bar', $m->foo); - //$this->assertTrue(array_key_exists('foo', $m->mockery_getMockableProperties())); + //$this->assertArrayHasKey('foo', $m->mockery_getMockableProperties()); } /** @@ -609,7 +609,7 @@ class ContainerTest extends MockeryTestCase $m = mock('Foo'); $m->foo = 'bar'; $this->assertEquals('bar', $m->foo); - //$this->assertTrue(array_key_exists('foo', $m->mockery_getMockableProperties())); + //$this->assertArrayHasKey('foo', $m->mockery_getMockableProperties()); } /** @@ -620,7 +620,7 @@ class ContainerTest extends MockeryTestCase $m = mock(new stdClass); $m->foo = 'bar'; $this->assertEquals('bar', $m->foo); - //$this->assertTrue(array_key_exists('foo', $m->mockery_getMockableProperties())); + //$this->assertArrayHasKey('foo', $m->mockery_getMockableProperties()); } /** @@ -630,20 +630,20 @@ class ContainerTest extends MockeryTestCase { $m = mock(new MockeryTest_ExistingProperty); $this->assertEquals('bar', $m->foo); - $this->assertFalse(array_key_exists('foo', $m->mockery_getMockableProperties())); + $this->assertArrayNotHasKey('foo', $m->mockery_getMockableProperties()); } public function testCreationOfInstanceMock() { $m = mock('overload:MyNamespace\MyClass4'); - $this->assertTrue($m instanceof MyNamespace\MyClass4); + $this->assertInstanceOf(MyNamespace\MyClass4::class, $m); } public function testInstantiationOfInstanceMock() { $m = mock('overload:MyNamespace\MyClass5'); $instance = new MyNamespace\MyClass5; - $this->assertTrue($instance instanceof MyNamespace\MyClass5); + $this->assertInstanceOf(MyNamespace\MyClass5::class, $instance); } public function testInstantiationOfInstanceMockImportsExpectations() @@ -661,7 +661,6 @@ class ContainerTest extends MockeryTestCase $instance = new MyNamespace\MyClass6; $this->assertEquals('bar', $instance->foo()); - } public function testInstantiationOfInstanceMockImportsDefaultExpectationsInTheCorrectOrder() @@ -673,7 +672,6 @@ class ContainerTest extends MockeryTestCase $instance = new MyNamespace\MyClass6; $this->assertEquals(3, $instance->foo()); - } public function testInstantiationOfInstanceMocksIgnoresVerificationOfOriginMock() @@ -719,7 +717,7 @@ class ContainerTest extends MockeryTestCase public function testCreationOfInstanceMockWithFullyQualifiedName() { $m = mock('overload:\MyNamespace\MyClass11'); - $this->assertTrue($m instanceof MyNamespace\MyClass11); + $this->assertInstanceOf(MyNamespace\MyClass11::class, $m); } public function testInstanceMocksShouldIgnoreMissing() @@ -827,7 +825,7 @@ class ContainerTest extends MockeryTestCase ); $data = array('a'=>1,'b'=>2); $m->insert($data, array()); - $this->assertTrue(isset($data['_id'])); + $this->assertArrayHasKey('_id', $data); $this->assertEquals(123, $data['_id']); Mockery::getConfiguration()->resetInternalClassMethodParamMaps(); } @@ -863,7 +861,7 @@ class ContainerTest extends MockeryTestCase public function testCanMockAbstractClassWithAbstractPublicMethod() { $m = mock('MockeryTest_AbstractWithAbstractPublicMethod'); - $this->assertTrue($m instanceof MockeryTest_AbstractWithAbstractPublicMethod); + $this->assertInstanceOf(MockeryTest_AbstractWithAbstractPublicMethod::class, $m); } /** @@ -888,12 +886,12 @@ class ContainerTest extends MockeryTestCase public function testCallingSelfOnlyReturnsLastMockCreatedOrCurrentMockBeingProgrammedSinceTheyAreOneAndTheSame() { $m = mock('MockeryTestFoo'); - $this->assertFalse(Mockery::self() instanceof MockeryTestFoo2); + $this->assertNotInstanceOf(MockeryTestFoo2::class, Mockery::self()); //$m = mock('MockeryTestFoo2'); - //$this->assertTrue(self() instanceof MockeryTestFoo2); + //$this->assertInstanceOf(MockeryTestFoo2::class, self()); //$m = mock('MockeryTestFoo'); - //$this->assertFalse(Mockery::self() instanceof MockeryTestFoo2); - //$this->assertTrue(Mockery::self() instanceof MockeryTestFoo); + //$this->assertNotInstanceOf(MockeryTestFoo2::class, Mockery::self()); + //$this->assertInstanceOf(MockeryTestFoo::class, Mockery::self()); } /** @@ -1084,14 +1082,6 @@ class ContainerTest extends MockeryTestCase $this->assertInstanceOf(MockInterface::class, mock('MockeryTest_CallStatic')); } - /** - * @issue issue/139 - */ - public function testCanMockClassWithOldStyleConstructorAndArguments() - { - $this->assertInstanceOf(MockInterface::class, mock('MockeryTest_OldStyleConstructor')); - } - /** @group issue/144 */ public function testMockeryShouldInterpretEmptyArrayAsConstructorArgs() { @@ -1725,13 +1715,6 @@ class MockeryTest_ImplementsIterator implements Iterator } } -class MockeryTest_OldStyleConstructor -{ - public function MockeryTest_OldStyleConstructor($arg) - { - } -} - class EmptyConstructorTest { public $numberOfConstructorArgs; diff --git a/vendor/mockery/mockery/tests/Mockery/DemeterChainTest.php b/vendor/mockery/mockery/tests/Mockery/DemeterChainTest.php index 369effc9..9528d161 100644 --- a/vendor/mockery/mockery/tests/Mockery/DemeterChainTest.php +++ b/vendor/mockery/mockery/tests/Mockery/DemeterChainTest.php @@ -19,6 +19,10 @@ * @license http://github.com/padraic/mockery/blob/master/LICENSE New BSD License */ +if (version_compare(PHP_VERSION, '7.0.0') >= 0) { + require_once __DIR__.'/DummyClasses/DemeterChain.php'; +} + use Mockery\Adapter\Phpunit\MockeryTestCase; class DemeterChainTest extends MockeryTestCase @@ -167,4 +171,34 @@ class DemeterChainTest extends MockeryTestCase $this->mock->levelOne()->levelTwo()->getFirst() ); } + + public function testSimilarDemeterChainsOnDifferentClasses() + { + $mock1 = Mockery::mock('overload:mock1'); + $mock1->shouldReceive('select->some->data')->andReturn(1); + $mock1->shouldReceive('select->some->other->data')->andReturn(2); + + $mock2 = Mockery::mock('overload:mock2'); + $mock2->shouldReceive('select->some->data')->andReturn(3); + $mock2->shouldReceive('select->some->other->data')->andReturn(4); + + $this->assertEquals(1, mock1::select()->some()->data()); + $this->assertEquals(2, mock1::select()->some()->other()->data()); + $this->assertEquals(3, mock2::select()->some()->data()); + $this->assertEquals(4, mock2::select()->some()->other()->data()); + } + + /** + * @requires PHP 7.0.0 + */ + public function testDemeterChainsWithClassReturnTypeHints() + { + $a = \Mockery::mock(\DemeterChain\A::class); + $a->shouldReceive('foo->bar->baz')->andReturn(new stdClass); + + $m = new \DemeterChain\Main(); + $result = $m->callDemeter($a); + + $this->assertInstanceOf(stdClass::class, $result); + } } diff --git a/vendor/mockery/mockery/tests/Mockery/DummyClasses/DemeterChain.php b/vendor/mockery/mockery/tests/Mockery/DummyClasses/DemeterChain.php new file mode 100644 index 00000000..b778cd4e --- /dev/null +++ b/vendor/mockery/mockery/tests/Mockery/DummyClasses/DemeterChain.php @@ -0,0 +1,54 @@ +foo()->bar()->baz(); + } +} diff --git a/vendor/mockery/mockery/tests/Mockery/ExpectationTest.php b/vendor/mockery/mockery/tests/Mockery/ExpectationTest.php index f3eb8885..faaaf58d 100644 --- a/vendor/mockery/mockery/tests/Mockery/ExpectationTest.php +++ b/vendor/mockery/mockery/tests/Mockery/ExpectationTest.php @@ -221,7 +221,7 @@ class ExpectationTest extends MockeryTestCase public function testReturnsUndefined() { $this->mock->shouldReceive('foo')->andReturnUndefined(); - $this->assertTrue($this->mock->foo() instanceof \Mockery\Undefined); + $this->assertInstanceOf(\Mockery\Undefined::class, $this->mock->foo()); } public function testReturnsValuesSetAsArray() @@ -885,8 +885,8 @@ class ExpectationTest extends MockeryTestCase $s = $this->mock->shouldReceive('start')->ordered(); $m = $this->mock->shouldReceive('mid')->ordered('foobar'); $e = $this->mock->shouldReceive('end')->ordered(); - $this->assertTrue($s->getOrderNumber() < $m->getOrderNumber()); - $this->assertTrue($m->getOrderNumber() < $e->getOrderNumber()); + $this->assertLessThan($m->getOrderNumber(), $s->getOrderNumber()); + $this->assertLessThan($e->getOrderNumber(), $m->getOrderNumber()); } /** @@ -1080,6 +1080,23 @@ class ExpectationTest extends MockeryTestCase $this->mock->foo(1, 2, 3); } + public function testAndAnyOtherConstraintMatchesTheRestOfTheArguments() + { + $this->mock->shouldReceive('foo')->with(1, 2, Mockery::andAnyOthers())->twice(); + $this->mock->foo(1, 2, 3, 4, 5); + $this->mock->foo(1, 'str', 3, 4); + } + + /** + * @expectedException \Mockery\Exception + */ + public function testAndAnyOtherConstraintDoesNotPreventMatchingOfRegularArguments() + { + $this->mock->shouldReceive('foo')->with(1, 2, Mockery::andAnyOthers()); + $this->mock->foo(10, 2, 3, 4, 5); + Mockery::close(); + } + public function testArrayConstraintMatchesArgument() { $this->mock->shouldReceive('foo')->with(Mockery::type('array'))->once(); @@ -1697,23 +1714,23 @@ class ExpectationTest extends MockeryTestCase public function testReturnUndefinedIfIgnoreMissingMethodsSet() { $this->mock->shouldIgnoreMissing()->asUndefined(); - $this->assertTrue($this->mock->g(1, 2) instanceof \Mockery\Undefined); + $this->assertInstanceOf(\Mockery\Undefined::class, $this->mock->g(1, 2)); } public function testReturnAsUndefinedAllowsForInfiniteSelfReturningChain() { $this->mock->shouldIgnoreMissing()->asUndefined(); - $this->assertTrue($this->mock->g(1, 2)->a()->b()->c() instanceof \Mockery\Undefined); + $this->assertInstanceOf(\Mockery\Undefined::class, $this->mock->g(1, 2)->a()->b()->c()); } public function testShouldIgnoreMissingFluentInterface() { - $this->assertTrue($this->mock->shouldIgnoreMissing() instanceof \Mockery\MockInterface); + $this->assertInstanceOf(\Mockery\MockInterface::class, $this->mock->shouldIgnoreMissing()); } public function testShouldIgnoreMissingAsUndefinedFluentInterface() { - $this->assertTrue($this->mock->shouldIgnoreMissing()->asUndefined() instanceof \Mockery\MockInterface); + $this->assertInstanceOf(\Mockery\MockInterface::class, $this->mock->shouldIgnoreMissing()->asUndefined()); } public function testShouldIgnoreMissingAsDefinedProxiesToUndefinedAllowingToString() @@ -1745,7 +1762,7 @@ class ExpectationTest extends MockeryTestCase public function testOptionalMockRetrieval() { $m = mock('f')->shouldReceive('foo')->with(1)->andReturn(3)->mock(); - $this->assertTrue($m instanceof \Mockery\MockInterface); + $this->assertInstanceOf(\Mockery\MockInterface::class, $m); } public function testNotConstraintMatchesArgument() @@ -1930,7 +1947,6 @@ class ExpectationTest extends MockeryTestCase $this->assertTrue($service->addBookmark('http://example.com/3', 'some_tag3')); $this->assertTrue($service->hasBookmarksTagged('php')); $this->assertTrue($service->hasBookmarksTagged('php')); - } public function testAnExampleWithSomeExpectationAmendsOnCallCounts_PHPUnitTest() @@ -1981,6 +1997,14 @@ class ExpectationTest extends MockeryTestCase $this->assertSame('Spam!', $demeter->doitWithArgs()); } + public function testShouldNotReceiveCanBeAddedToCompositeExpectation() + { + $mock = mock('Foo'); + $mock->shouldReceive('a')->once()->andReturn('Spam!') + ->shouldNotReceive('b'); + $mock->a(); + } + public function testPassthruEnsuresRealMethodCalledForReturnValues() { $mock = mock('MockeryTest_SubjectCall1'); @@ -1996,9 +2020,9 @@ class ExpectationTest extends MockeryTestCase $mock->hasBookmarksTagged("padraic"); } - public function testShouldDeferMissingExpectationBasedOnArgs() + public function testMakePartialExpectationBasedOnArgs() { - $mock = mock("MockeryTest_SubjectCall1")->shouldDeferMissing(); + $mock = mock("MockeryTest_SubjectCall1")->makePartial(); $this->assertEquals('bar', $mock->foo()); $this->assertEquals('bar', $mock->foo("baz")); @@ -2013,7 +2037,6 @@ class ExpectationTest extends MockeryTestCase $this->assertEquals('456', $mock->foo()); $this->assertEquals('123', $mock->foo("baz")); $this->assertEquals('bar', $mock->foo("qux")); - } public function testCanReturnSelf() @@ -2025,13 +2048,13 @@ class ExpectationTest extends MockeryTestCase public function testReturnsTrueIfTrueIsReturnValue() { $this->mock->shouldReceive("foo")->andReturnTrue(); - $this->assertSame(true, $this->mock->foo()); + $this->assertTrue($this->mock->foo()); } public function testReturnsFalseIfFalseIsReturnValue() { $this->mock->shouldReceive("foo")->andReturnFalse(); - $this->assertSame(false, $this->mock->foo()); + $this->assertFalse($this->mock->foo()); } public function testExpectationCanBeOverridden() diff --git a/vendor/mockery/mockery/tests/Mockery/Fixtures/ClassWithAllLowerCaseMethod.php b/vendor/mockery/mockery/tests/Mockery/Fixtures/ClassWithAllLowerCaseMethod.php new file mode 100644 index 00000000..2cf2b770 --- /dev/null +++ b/vendor/mockery/mockery/tests/Mockery/Fixtures/ClassWithAllLowerCaseMethod.php @@ -0,0 +1,30 @@ +addTarget(ClassWithMagicCall::class); $methods = $builder->getMockConfiguration()->getMethodsToMock(); - $this->assertEquals(1, count($methods)); + $this->assertCount(1, $methods); $this->assertEquals("foo", $methods[0]->getName()); } @@ -57,7 +57,7 @@ class MockConfigurationBuilderTest extends TestCase $builder = new MockConfigurationBuilder; $builder->addTarget(ClassWithDebugInfo::class); $methods = $builder->getMockConfiguration()->getMethodsToMock(); - $this->assertEquals(1, count($methods)); + $this->assertCount(1, $methods); $this->assertEquals("foo", $methods[0]->getName()); } } diff --git a/vendor/mockery/mockery/tests/Mockery/Generator/MockConfigurationTest.php b/vendor/mockery/mockery/tests/Mockery/Generator/MockConfigurationTest.php index a1b1433e..d32ac581 100644 --- a/vendor/mockery/mockery/tests/Mockery/Generator/MockConfigurationTest.php +++ b/vendor/mockery/mockery/tests/Mockery/Generator/MockConfigurationTest.php @@ -33,7 +33,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("Mockery\Generator\\TestSubject"), array("foo")); $methods = $config->getMethodsToMock(); - $this->assertEquals(1, count($methods)); + $this->assertCount(1, $methods); $this->assertEquals("bar", $methods[0]->getName()); } @@ -45,7 +45,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("Mockery\Generator\\TestSubject"), array("FOO")); $methods = $config->getMethodsToMock(); - $this->assertEquals(1, count($methods)); + $this->assertCount(1, $methods); $this->assertEquals("bar", $methods[0]->getName()); } @@ -58,7 +58,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("Mockery\Generator\\TestSubject"), array(), array('foo')); $methods = $config->getMethodsToMock(); - $this->assertEquals(1, count($methods)); + $this->assertCount(1, $methods); $this->assertEquals("foo", $methods[0]->getName()); } @@ -70,7 +70,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("Mockery\Generator\\TestSubject"), array("foo"), array("foo")); $methods = $config->getMethodsToMock(); - $this->assertEquals(1, count($methods)); + $this->assertCount(1, $methods); $this->assertEquals("foo", $methods[0]->getName()); } @@ -82,7 +82,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("Mockery\Generator\\TestSubject"), array(), array("FOO")); $methods = $config->getMethodsToMock(); - $this->assertEquals(1, count($methods)); + $this->assertCount(1, $methods); $this->assertEquals("foo", $methods[0]->getName()); } @@ -94,7 +94,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("Mockery\Generator\\ClassWithFinalMethod")); $methods = $config->getMethodsToMock(); - $this->assertEquals(1, count($methods)); + $this->assertCount(1, $methods); $this->assertEquals("bar", $methods[0]->getName()); } @@ -105,7 +105,7 @@ class MockConfigurationTest extends TestCase { $config = new MockConfiguration(array("Mockery\\Generator\\TestInterface", "Mockery\\Generator\\TestInterface2")); $methods = $config->getMethodsToMock(); - $this->assertEquals(2, count($methods)); + $this->assertCount(2, $methods); } /** @@ -126,7 +126,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("\\Traversable")); $interfaces = $config->getTargetInterfaces(); - $this->assertEquals(1, count($interfaces)); + $this->assertCount(1, $interfaces); $first = array_shift($interfaces); $this->assertEquals("IteratorAggregate", $first->getName()); } @@ -139,7 +139,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("Mockery\Generator\TestTraversableInterface")); $interfaces = $config->getTargetInterfaces(); - $this->assertEquals(2, count($interfaces)); + $this->assertCount(2, $interfaces); $this->assertEquals("IteratorAggregate", $interfaces[0]->getName()); $this->assertEquals("Mockery\Generator\TestTraversableInterface", $interfaces[1]->getName()); } @@ -152,7 +152,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("Mockery\Generator\TestTraversableInterface2")); $interfaces = $config->getTargetInterfaces(); - $this->assertEquals(2, count($interfaces)); + $this->assertCount(2, $interfaces); $this->assertEquals("Iterator", $interfaces[0]->getName()); $this->assertEquals("Mockery\Generator\TestTraversableInterface2", $interfaces[1]->getName()); } @@ -165,7 +165,7 @@ class MockConfigurationTest extends TestCase $config = new MockConfiguration(array("Mockery\Generator\TestTraversableInterface3")); $interfaces = $config->getTargetInterfaces(); - $this->assertEquals(2, count($interfaces)); + $this->assertCount(2, $interfaces); $this->assertEquals("IteratorAggregate", $interfaces[0]->getName()); $this->assertEquals("Mockery\Generator\TestTraversableInterface3", $interfaces[1]->getName()); } diff --git a/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/CallTypeHintPassTest.php b/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/CallTypeHintPassTest.php index 99a26de9..6ce54e96 100644 --- a/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/CallTypeHintPassTest.php +++ b/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/CallTypeHintPassTest.php @@ -39,7 +39,7 @@ class CallTypeHintPassTest extends TestCase $pass = new CallTypeHintPass; $config = m::mock("Mockery\Generator\MockConfiguration", array( "requiresCallTypeHintRemoval" => true, - ))->shouldDeferMissing(); + ))->makePartial(); $code = $pass->apply(static::CODE, $config); $this->assertContains('__call($method, $args)', $code); } @@ -52,7 +52,7 @@ class CallTypeHintPassTest extends TestCase $pass = new CallTypeHintPass; $config = m::mock("Mockery\Generator\MockConfiguration", array( "requiresCallStaticTypeHintRemoval" => true, - ))->shouldDeferMissing(); + ))->makePartial(); $code = $pass->apply(static::CODE, $config); $this->assertContains('__callStatic($method, $args)', $code); } diff --git a/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/ConstantsPassTest.php b/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/ConstantsPassTest.php new file mode 100644 index 00000000..ae907bca --- /dev/null +++ b/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/ConstantsPassTest.php @@ -0,0 +1,52 @@ + ['FOO' => 'test']] + ); + $code = $pass->apply(static::CODE, $config); + $this->assertContains("const FOO = 'test'", $code); + } +} diff --git a/vendor/mockery/mockery/tests/Mockery/MockTest.php b/vendor/mockery/mockery/tests/Mockery/MockTest.php index c05624c2..d8efd238 100644 --- a/vendor/mockery/mockery/tests/Mockery/MockTest.php +++ b/vendor/mockery/mockery/tests/Mockery/MockTest.php @@ -62,7 +62,7 @@ class Mockery_MockTest extends MockeryTestCase public function testMockToStringMayBeDeferred() { - $mock = mock('ClassWithToString')->shouldDeferMissing(); + $mock = mock('ClassWithToString')->makePartial(); $this->assertEquals("foo", (string)$mock); } diff --git a/vendor/mockery/mockery/tests/Mockery/MockingAllLowerCasedMethodsTest.php b/vendor/mockery/mockery/tests/Mockery/MockingAllLowerCasedMethodsTest.php new file mode 100644 index 00000000..295ae6ca --- /dev/null +++ b/vendor/mockery/mockery/tests/Mockery/MockingAllLowerCasedMethodsTest.php @@ -0,0 +1,43 @@ +shouldReceive('userExpectsCamelCaseMethod') + ->andReturn('mocked'); + + $result = $mock->userExpectsCamelCaseMethod(); + + $expected = 'mocked'; + + self::assertSame($expected, $result); + } +} diff --git a/vendor/mockery/mockery/tests/Mockery/MockingClassConstantsTest.php b/vendor/mockery/mockery/tests/Mockery/MockingClassConstantsTest.php new file mode 100644 index 00000000..4cb7b839 --- /dev/null +++ b/vendor/mockery/mockery/tests/Mockery/MockingClassConstantsTest.php @@ -0,0 +1,43 @@ +setConstantsMap([ + 'ClassWithConstants' => [ + 'FOO' => 'baz', + 'X' => 2, + ] + ]); + + $mock = \Mockery::mock('overload:ClassWithConstants'); + + self::assertEquals('baz', $mock::FOO); + self::assertEquals(2, $mock::X); + } +} diff --git a/vendor/mockery/mockery/tests/Mockery/MockingMethodsWithIterableTypeHintsTest.php b/vendor/mockery/mockery/tests/Mockery/MockingMethodsWithIterableTypeHintsTest.php index e1b5e574..34ef54c0 100644 --- a/vendor/mockery/mockery/tests/Mockery/MockingMethodsWithIterableTypeHintsTest.php +++ b/vendor/mockery/mockery/tests/Mockery/MockingMethodsWithIterableTypeHintsTest.php @@ -34,6 +34,6 @@ class MockingMethodsWithIterableTypeHintsTest extends MockeryTestCase require __DIR__."/Fixtures/MethodWithIterableTypeHints.php"; $mock = mock("test\Mockery\Fixtures\MethodWithIterableTypeHints"); - $this->assertTrue($mock instanceof \test\Mockery\Fixtures\MethodWithIterableTypeHints); + $this->assertInstanceOf(\test\Mockery\Fixtures\MethodWithIterableTypeHints::class, $mock); } } diff --git a/vendor/mockery/mockery/tests/Mockery/MockingMethodsWithNullableParametersTest.php b/vendor/mockery/mockery/tests/Mockery/MockingMethodsWithNullableParametersTest.php index 2f3b6d47..e3aa7675 100644 --- a/vendor/mockery/mockery/tests/Mockery/MockingMethodsWithNullableParametersTest.php +++ b/vendor/mockery/mockery/tests/Mockery/MockingMethodsWithNullableParametersTest.php @@ -36,7 +36,7 @@ class MockingMethodsWithNullableParametersTest extends MockeryTestCase require __DIR__."/Fixtures/MethodWithNullableTypedParameter.php"; $mock = mock("test\Mockery\Fixtures\MethodWithNullableTypedParameter"); - $this->assertTrue($mock instanceof \test\Mockery\Fixtures\MethodWithNullableTypedParameter); + $this->assertInstanceOf(\test\Mockery\Fixtures\MethodWithNullableTypedParameter::class, $mock); } /** @@ -47,6 +47,6 @@ class MockingMethodsWithNullableParametersTest extends MockeryTestCase require __DIR__."/Fixtures/MethodWithParametersWithDefaultValues.php"; $mock = mock("test\Mockery\Fixtures\MethodWithParametersWithDefaultValues"); - $this->assertTrue($mock instanceof \test\Mockery\Fixtures\MethodWithParametersWithDefaultValues); + $this->assertInstanceOf(\test\Mockery\Fixtures\MethodWithParametersWithDefaultValues::class, $mock); } } diff --git a/vendor/mockery/mockery/tests/Mockery/MockingNullableMethodsTest.php b/vendor/mockery/mockery/tests/Mockery/MockingNullableMethodsTest.php index f29c53ae..9b7bdc24 100644 --- a/vendor/mockery/mockery/tests/Mockery/MockingNullableMethodsTest.php +++ b/vendor/mockery/mockery/tests/Mockery/MockingNullableMethodsTest.php @@ -184,7 +184,7 @@ class MockingNullableMethodsTest extends MockeryTestCase $double->shouldReceive("nullableClass")->andReturnNull(); - $this->assertEquals(null, $double->nullableClass()); + $this->assertNull($double->nullableClass()); } /** @test */ @@ -194,7 +194,7 @@ class MockingNullableMethodsTest extends MockeryTestCase $double->shouldReceive("nullableString")->andReturnNull(); - $this->assertEquals(null, $double->nullableString()); + $this->assertNull($double->nullableString()); } /** @test */ @@ -204,7 +204,7 @@ class MockingNullableMethodsTest extends MockeryTestCase $double->shouldReceive("nullableInt")->andReturnNull(); - $this->assertEquals(null, $double->nullableInt()); + $this->assertNull($double->nullableInt()); } /** @test */ @@ -212,6 +212,6 @@ class MockingNullableMethodsTest extends MockeryTestCase { $double = \Mockery::spy(MethodWithNullableReturnType::class); - $this->assertEquals(null, $double->nullableClass()); + $this->assertNull($double->nullableClass()); } } diff --git a/vendor/mockery/mockery/tests/Mockery/MockingOldStyleConstructorTest.php b/vendor/mockery/mockery/tests/Mockery/MockingOldStyleConstructorTest.php new file mode 100644 index 00000000..c1ec5d85 --- /dev/null +++ b/vendor/mockery/mockery/tests/Mockery/MockingOldStyleConstructorTest.php @@ -0,0 +1,42 @@ +assertInstanceOf(MockInterface::class, mock('MockeryTest_OldStyleConstructor')); + } +} + +class MockeryTest_OldStyleConstructor +{ + public function MockeryTest_OldStyleConstructor($arg) + { + } +} diff --git a/vendor/mockery/mockery/tests/Mockery/MockingParameterAndReturnTypesTest.php b/vendor/mockery/mockery/tests/Mockery/MockingParameterAndReturnTypesTest.php index 3613707a..690625f6 100644 --- a/vendor/mockery/mockery/tests/Mockery/MockingParameterAndReturnTypesTest.php +++ b/vendor/mockery/mockery/tests/Mockery/MockingParameterAndReturnTypesTest.php @@ -56,7 +56,7 @@ class MockingParameterAndReturnTypesTest extends MockeryTestCase $mock = mock("test\Mockery\TestWithParameterAndReturnType"); $mock->shouldReceive("returnBoolean"); - $this->assertSame(false, $mock->returnBoolean()); + $this->assertFalse($mock->returnBoolean()); } public function testMockingArrayReturnType() @@ -80,7 +80,7 @@ class MockingParameterAndReturnTypesTest extends MockeryTestCase $mock = mock("test\Mockery\TestWithParameterAndReturnType"); $mock->shouldReceive("returnCallable"); - $this->assertTrue(is_callable($mock->returnCallable())); + $this->assertInternalType('callable', $mock->returnCallable()); } public function testMockingClassReturnTypes() @@ -108,9 +108,9 @@ class MockingParameterAndReturnTypesTest extends MockeryTestCase $this->assertSame('', $mock->returnString()); $this->assertSame(0, $mock->returnInteger()); $this->assertSame(0.0, $mock->returnFloat()); - $this->assertSame(false, $mock->returnBoolean()); + $this->assertFalse( $mock->returnBoolean()); $this->assertSame([], $mock->returnArray()); - $this->assertTrue(is_callable($mock->returnCallable())); + $this->assertInternalType('callable', $mock->returnCallable()); $this->assertInstanceOf("\Generator", $mock->returnGenerator()); $this->assertInstanceOf("test\Mockery\TestWithParameterAndReturnType", $mock->withClassReturnType()); } diff --git a/vendor/mockery/mockery/tests/Mockery/MockingProtectedMethodsTest.php b/vendor/mockery/mockery/tests/Mockery/MockingProtectedMethodsTest.php index 4041516d..7810d1bf 100644 --- a/vendor/mockery/mockery/tests/Mockery/MockingProtectedMethodsTest.php +++ b/vendor/mockery/mockery/tests/Mockery/MockingProtectedMethodsTest.php @@ -45,22 +45,22 @@ class MockingProtectedMethodsTest extends MockeryTestCase */ public function shouldAutomaticallyDeferCallsToProtectedMethodsForRuntimePartials() { - $mock = mock("test\Mockery\TestWithProtectedMethods")->shouldDeferMissing(); + $mock = mock("test\Mockery\TestWithProtectedMethods")->makePartial(); $this->assertEquals("bar", $mock->bar()); } /** @test */ public function shouldAutomaticallyIgnoreAbstractProtectedMethods() { - $mock = mock("test\Mockery\TestWithProtectedMethods")->shouldDeferMissing(); - $this->assertEquals(null, $mock->foo()); + $mock = mock("test\Mockery\TestWithProtectedMethods")->makePartial(); + $this->assertNull($mock->foo()); } /** @test */ public function shouldAllowMockingProtectedMethods() { $mock = mock("test\Mockery\TestWithProtectedMethods") - ->shouldDeferMissing() + ->makePartial() ->shouldAllowMockingProtectedMethods(); $mock->shouldReceive("protectedBar")->andReturn("notbar"); @@ -81,7 +81,7 @@ class MockingProtectedMethodsTest extends MockeryTestCase public function shouldAllowMockingAbstractProtectedMethods() { $mock = mock("test\Mockery\TestWithProtectedMethods") - ->shouldDeferMissing() + ->makePartial() ->shouldAllowMockingProtectedMethods(); $mock->shouldReceive("abstractProtected")->andReturn("abstractProtected"); diff --git a/vendor/mockery/mockery/tests/Mockery/MockingVoidMethodsTest.php b/vendor/mockery/mockery/tests/Mockery/MockingVoidMethodsTest.php index a9fb3d7b..f1f167a1 100644 --- a/vendor/mockery/mockery/tests/Mockery/MockingVoidMethodsTest.php +++ b/vendor/mockery/mockery/tests/Mockery/MockingVoidMethodsTest.php @@ -39,7 +39,7 @@ class MockingVoidMethodsTest extends MockeryTestCase { $mock = mock("test\Mockery\Fixtures\MethodWithVoidReturnType"); - $this->assertTrue($mock instanceof \test\Mockery\Fixtures\MethodWithVoidReturnType); + $this->assertInstanceOf(\test\Mockery\Fixtures\MethodWithVoidReturnType::class, $mock); } /** @test */ diff --git a/vendor/mockery/mockery/tests/Mockery/NamedMockTest.php b/vendor/mockery/mockery/tests/Mockery/NamedMockTest.php index c9fe9bbe..b39355f2 100644 --- a/vendor/mockery/mockery/tests/Mockery/NamedMockTest.php +++ b/vendor/mockery/mockery/tests/Mockery/NamedMockTest.php @@ -22,6 +22,8 @@ require_once __DIR__.'/DummyClasses/Namespaced.php'; use Mockery\Adapter\Phpunit\MockeryTestCase; +use test\Mockery\Stubs\Animal; +use test\Mockery\Stubs\Habitat; class NamedMockTest extends MockeryTestCase { @@ -29,7 +31,7 @@ class NamedMockTest extends MockeryTestCase public function itCreatesANamedMock() { $mock = Mockery::namedMock("Mockery\Dave123"); - $this->assertEquals("Mockery\Dave123", get_class($mock)); + $this->assertInstanceOf("Mockery\Dave123", $mock); } /** @test */ @@ -65,4 +67,20 @@ class NamedMockTest extends MockeryTestCase ); $this->assertTrue($gardener->water($cactus)); } + + /** + * @test + * @requires PHP 7.0.0 + */ + public function it_gracefully_handles_namespacing() + { + $animal = Mockery::namedMock( + uniqid(Animal::class, false), + Animal::class + ); + + $animal->shouldReceive("habitat")->andReturn(new Habitat()); + + $this->assertInstanceOf(Habitat::class, $animal->habitat()); + } } diff --git a/vendor/mockery/mockery/tests/Mockery/Php72LanguageFeaturesTest.php b/vendor/mockery/mockery/tests/Mockery/Php72LanguageFeaturesTest.php index 0b87e656..f6fb957a 100644 --- a/vendor/mockery/mockery/tests/Mockery/Php72LanguageFeaturesTest.php +++ b/vendor/mockery/mockery/tests/Mockery/Php72LanguageFeaturesTest.php @@ -30,12 +30,16 @@ class Php72LanguageFeaturesTest extends MockeryTestCase } } -class ArgumentObjectTypeHint +class ArgumentObjectTypeHint { - function foo(object $foo) {} + public function foo(object $foo) + { + } } -class ReturnTypeObjectTypeHint +class ReturnTypeObjectTypeHint { - function foo(): object {} + public function foo(): object + { + } } diff --git a/vendor/mockery/mockery/tests/Mockery/SpyTest.php b/vendor/mockery/mockery/tests/Mockery/SpyTest.php index 78be2a7d..73de84c0 100644 --- a/vendor/mockery/mockery/tests/Mockery/SpyTest.php +++ b/vendor/mockery/mockery/tests/Mockery/SpyTest.php @@ -111,4 +111,42 @@ class SpyTest extends MockeryTestCase $spy->shouldHaveReceived()->foo(anyArgs()); } + + /** @test */ + public function should_have_received_higher_order_message_call_a_method_with_correct_arguments() + { + $spy = m::spy(); + $spy->foo(123); + + $spy->shouldHaveReceived()->foo(123); + } + + /** @test */ + public function should_have_received_higher_order_message_call_a_method_with_incorrect_arguments_throws_exception() + { + $spy = m::spy(); + $spy->foo(123); + + $this->expectException("Mockery\Exception\InvalidCountException"); + $spy->shouldHaveReceived()->foo(456); + } + + /** @test */ + public function should_not_have_received_higher_order_message_call_a_method_with_incorrect_arguments() + { + $spy = m::spy(); + $spy->foo(123); + + $spy->shouldNotHaveReceived()->foo(456); + } + + /** @test */ + public function should_not_have_received_higher_order_message_call_a_method_with_correct_arguments_throws_an_exception() + { + $spy = m::spy(); + $spy->foo(123); + + $this->expectException("Mockery\Exception\InvalidCountException"); + $spy->shouldNotHaveReceived()->foo(123); + } } diff --git a/vendor/mockery/mockery/tests/Mockery/Stubs/Animal.php b/vendor/mockery/mockery/tests/Mockery/Stubs/Animal.php new file mode 100644 index 00000000..50de1293 --- /dev/null +++ b/vendor/mockery/mockery/tests/Mockery/Stubs/Animal.php @@ -0,0 +1,29 @@ +copy($value); +use function function_exists; + +if (false === function_exists('DeepCopy\deep_copy')) { + /** + * Deep copies the given value. + * + * @param mixed $value + * @param bool $useCloneMethod + * + * @return mixed + */ + function deep_copy($value, $useCloneMethod = false) + { + return (new DeepCopy($useCloneMethod))->copy($value); + } } diff --git a/vendor/nesbot/carbon/.php_cs.dist b/vendor/nesbot/carbon/.php_cs.dist index ff8b56f0..f731e3ad 100644 --- a/vendor/nesbot/carbon/.php_cs.dist +++ b/vendor/nesbot/carbon/.php_cs.dist @@ -3,20 +3,20 @@ use PhpCsFixer\Config; use PhpCsFixer\Finder; -$rules = [ +$rules = array( '@PSR2' => true, - 'array_syntax' => [ + 'array_syntax' => array( 'syntax' => 'long', - ], - 'binary_operator_spaces' => [ + ), + 'binary_operator_spaces' => array( 'align_double_arrow' => false, 'align_equals' => false, - ], + ), 'blank_line_before_return' => true, 'cast_spaces' => true, - 'concat_space' => [ + 'concat_space' => array( 'spacing' => 'none', - ], + ), 'ereg_to_preg' => true, 'method_separation' => true, 'no_blank_lines_after_phpdoc' => true, @@ -30,9 +30,9 @@ $rules = [ 'phpdoc_indent' => true, 'phpdoc_inline_tag' => true, 'phpdoc_no_access' => true, - 'phpdoc_no_alias_tag' => [ + 'phpdoc_no_alias_tag' => array( 'type' => 'var', - ], + ), 'phpdoc_no_package' => true, 'phpdoc_order' => true, 'phpdoc_scalar' => true, @@ -49,9 +49,12 @@ $rules = [ 'trailing_comma_in_multiline_array' => true, 'trim_array_spaces' => true, 'unary_operator_spaces' => true, -]; + 'line_ending' => true, + 'blank_line_after_namespace' => true, + 'no_unused_imports' => true, +); return Config::create()->setRules($rules) ->setFinder(Finder::create()->in(__DIR__)) ->setUsingCache(true) - ->setRiskyAllowed(true); \ No newline at end of file + ->setRiskyAllowed(true); diff --git a/vendor/nesbot/carbon/build.php b/vendor/nesbot/carbon/build.php new file mode 100644 index 00000000..3cb0b5be --- /dev/null +++ b/vendor/nesbot/carbon/build.php @@ -0,0 +1,87 @@ +open($archive, ZipArchive::CREATE | ZipArchive::OVERWRITE); + + foreach (array('src', 'vendor', 'Carbon') as $directory) { + if (is_dir($directory)) { + $directory = realpath($directory); + $base = dirname($directory); + + $files = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($directory), + RecursiveIteratorIterator::LEAVES_ONLY + ); + + foreach ($files as $name => $file) { + if (!$file->isDir()) { + $filePath = $file->getRealPath(); + + $zip->addFile($filePath, substr($filePath, strlen($base) + 1)); + } + } + } + } + + $autoload = 'autoload.php'; + file_put_contents($autoload, "addFile($autoload, $autoload); + $zip->close(); + unlink($autoload); + + shell_exec('git checkout .'); + shell_exec("git checkout $currentBranch"); + shell_exec("git branch -d $branch"); + shell_exec('git stash pop'); + shell_exec('composer update --no-interaction'); +} + +exit(0); diff --git a/vendor/nesbot/carbon/composer.json b/vendor/nesbot/carbon/composer.json index 63d576d1..3ce2fbd5 100644 --- a/vendor/nesbot/carbon/composer.json +++ b/vendor/nesbot/carbon/composer.json @@ -21,16 +21,16 @@ } ], "require": { - "php": ">=5.3.0", - "symfony/translation": "~2.6 || ~3.0" + "php": ">=5.3.9", + "symfony/translation": "~2.6 || ~3.0 || ~4.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2", - "phpunit/phpunit": "~4.0 || ~5.0" + "phpunit/phpunit": "^4.8.35 || ^5.7" }, "autoload": { "psr-4": { - "Carbon\\": "src/Carbon/" + "": "src/" } }, "autoload-dev": { @@ -38,17 +38,16 @@ "Tests\\": "tests/" } }, - "extra": { - "branch-alias": { - "dev-master": "1.23-dev" - } - }, "config": { "sort-packages": true }, "scripts": { - "test": "./vendor/bin/phpunit; ./vendor/bin/php-cs-fixer fix -v --diff --dry-run;", - "phpunit": "./vendor/bin/phpunit;", - "phpcs": "./vendor/bin/php-cs-fixer fix -v --diff --dry-run;" + "test": [ + "@phpunit", + "@phpcs" + ], + "phpunit": "phpunit --verbose --coverage-clover=coverage.xml", + "phpcs": "php-cs-fixer fix -v --diff --dry-run", + "phpstan": "phpstan analyse --configuration phpstan.neon --level 3 src tests" } } diff --git a/vendor/nesbot/carbon/readme.md b/vendor/nesbot/carbon/readme.md index 57836c3a..5e9d1ccb 100644 --- a/vendor/nesbot/carbon/readme.md +++ b/vendor/nesbot/carbon/readme.md @@ -6,6 +6,7 @@ [![StyleCI](https://styleci.io/repos/5724990/shield?style=flat)](https://styleci.io/repos/5724990) [![codecov.io](https://codecov.io/github/briannesbitt/Carbon/coverage.svg?branch=master)](https://codecov.io/github/briannesbitt/Carbon?branch=master) [![PHP-Eye](https://php-eye.com/badge/nesbot/carbon/tested.svg?style=flat)](https://php-eye.com/package/nesbot/carbon) +[![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan) A simple PHP API extension for DateTime. [http://carbon.nesbot.com](http://carbon.nesbot.com) @@ -16,7 +17,7 @@ printf("Right now is %s", Carbon::now()->toDateTimeString()); printf("Right now in Vancouver is %s", Carbon::now('America/Vancouver')); //implicit __toString() $tomorrow = Carbon::now()->addDay(); $lastWeek = Carbon::now()->subWeek(); -$nextSummerOlympics = Carbon::createFromDate(2012)->addYears(4); +$nextSummerOlympics = Carbon::createFromDate(2016)->addYears(4); $officialDate = Carbon::now()->toRfc2822String(); @@ -24,13 +25,13 @@ $howOldAmI = Carbon::createFromDate(1975, 5, 21)->age; $noonTodayLondonTime = Carbon::createFromTime(12, 0, 0, 'Europe/London'); -$worldWillEnd = Carbon::createFromDate(2012, 12, 21, 'GMT'); +$internetWillBlowUpOn = Carbon::create(2038, 01, 19, 3, 14, 7, 'GMT'); -// Don't really want to die so mock now +// Don't really want this to happen so mock now Carbon::setTestNow(Carbon::createFromDate(2000, 1, 1)); // comparisons are always done in UTC -if (Carbon::now()->gte($worldWillEnd)) { +if (Carbon::now()->gte($internetWillBlowUpOn)) { die(); } @@ -74,6 +75,7 @@ printf("Now: %s", Carbon::now()); ``` + ### Without Composer Why are you not using [composer](http://getcomposer.org/)? Download [Carbon.php](https://github.com/briannesbitt/Carbon/blob/master/src/Carbon/Carbon.php) from the repo and save the file into your project path somewhere. @@ -89,4 +91,4 @@ printf("Now: %s", Carbon::now()); ## Docs -[http://carbon.nesbot.com/docs](http://carbon.nesbot.com/docs) \ No newline at end of file +[http://carbon.nesbot.com/docs](http://carbon.nesbot.com/docs) diff --git a/vendor/nesbot/carbon/src/Carbon/Carbon.php b/vendor/nesbot/carbon/src/Carbon/Carbon.php index d537e0b0..e5b7d99d 100644 --- a/vendor/nesbot/carbon/src/Carbon/Carbon.php +++ b/vendor/nesbot/carbon/src/Carbon/Carbon.php @@ -15,10 +15,10 @@ use Carbon\Exceptions\InvalidDateException; use Closure; use DatePeriod; use DateTime; +use DateTimeInterface; use DateTimeZone; use InvalidArgumentException; -use Symfony\Component\Translation\Loader\ArrayLoader; -use Symfony\Component\Translation\Translator; +use JsonSerializable; use Symfony\Component\Translation\TranslatorInterface; /** @@ -36,8 +36,10 @@ use Symfony\Component\Translation\TranslatorInterface; * @property \DateTimeZone $tz alias of timezone * @property-read int $micro * @property-read int $dayOfWeek 0 (for Sunday) through 6 (for Saturday) + * @property-read int $dayOfWeekIso 1 (for Monday) through 7 (for Sunday) * @property-read int $dayOfYear 0 through 365 * @property-read int $weekOfMonth 1 through 5 + * @property-read int $weekNumberInMonth 1 through 5 * @property-read int $weekOfYear ISO-8601 week number of year, weeks starting on Monday * @property-read int $daysInMonth number of days in the given month * @property-read int $age does a diffInYears() with default parameters @@ -50,8 +52,13 @@ use Symfony\Component\Translation\TranslatorInterface; * @property-read string $timezoneName * @property-read string $tzName */ -class Carbon extends DateTime +class Carbon extends DateTime implements JsonSerializable { + const NO_ZERO_DIFF = 01; + const JUST_NOW = 02; + const ONE_DAY_WORDS = 04; + const TWO_DAY_WORDS = 010; + /** * The day constants. */ @@ -78,26 +85,6 @@ class Carbon extends DateTime self::SATURDAY => 'Saturday', ); - /** - * Terms used to detect if a time passed is a relative date. - * - * This is here for testing purposes. - * - * @var array - */ - protected static $relativeKeywords = array( - '+', - '-', - 'ago', - 'first', - 'last', - 'next', - 'this', - 'today', - 'tomorrow', - 'yesterday', - ); - /** * Number of X in Y. */ @@ -106,11 +93,19 @@ class Carbon extends DateTime const MONTHS_PER_YEAR = 12; const MONTHS_PER_QUARTER = 3; const WEEKS_PER_YEAR = 52; + const WEEKS_PER_MONTH = 4; const DAYS_PER_WEEK = 7; const HOURS_PER_DAY = 24; const MINUTES_PER_HOUR = 60; const SECONDS_PER_MINUTE = 60; + /** + * RFC7231 DateTime format. + * + * @var string + */ + const RFC7231_FORMAT = 'D, d M Y H:i:s \G\M\T'; + /** * Default format to use for __toString method when type juggling occurs. * @@ -118,6 +113,20 @@ class Carbon extends DateTime */ const DEFAULT_TO_STRING_FORMAT = 'Y-m-d H:i:s'; + /** + * Format for converting mocked time, includes microseconds. + * + * @var string + */ + const MOCK_DATETIME_FORMAT = 'Y-m-d H:i:s.u'; + + /** + * Customizable PHP_INT_SIZE override. + * + * @var int + */ + public static $PHPIntSize = PHP_INT_SIZE; + /** * Format to use for __toString method when type juggling occurs. * @@ -149,6 +158,61 @@ class Carbon extends DateTime self::SUNDAY, ); + /** + * Midday/noon hour. + * + * @var int + */ + protected static $midDayAt = 12; + + /** + * Format regex patterns. + * + * @var array + */ + protected static $regexFormats = array( + 'd' => '(3[01]|[12][0-9]|0[1-9])', + 'D' => '([a-zA-Z]{3})', + 'j' => '([123][0-9]|[1-9])', + 'l' => '([a-zA-Z]{2,})', + 'N' => '([1-7])', + 'S' => '([a-zA-Z]{2})', + 'w' => '([0-6])', + 'z' => '(36[0-5]|3[0-5][0-9]|[12][0-9]{2}|[1-9]?[0-9])', + 'W' => '(5[012]|[1-4][0-9]|[1-9])', + 'F' => '([a-zA-Z]{2,})', + 'm' => '(1[012]|0[1-9])', + 'M' => '([a-zA-Z]{3})', + 'n' => '(1[012]|[1-9])', + 't' => '(2[89]|3[01])', + 'L' => '(0|1)', + 'o' => '([1-9][0-9]{0,4})', + 'Y' => '([1-9][0-9]{0,4})', + 'y' => '([0-9]{2})', + 'a' => '(am|pm)', + 'A' => '(AM|PM)', + 'B' => '([0-9]{3})', + 'g' => '(1[012]|[1-9])', + 'G' => '(2[0-3]|1?[0-9])', + 'h' => '(1[012]|0[1-9])', + 'H' => '(2[0-3]|[01][0-9])', + 'i' => '([0-5][0-9])', + 's' => '([0-5][0-9])', + 'u' => '([0-9]{1,6})', + 'v' => '([0-9]{1,3})', + 'e' => '([a-zA-Z]{1,5})|([a-zA-Z]*\/[a-zA-Z]*)', + 'I' => '(0|1)', + 'O' => '([\+\-](1[012]|0[0-9])[0134][05])', + 'P' => '([\+\-](1[012]|0[0-9]):[0134][05])', + 'T' => '([a-zA-Z]{1,5})', + 'Z' => '(-?[1-5]?[0-9]{1,4})', + 'U' => '([0-9]*)', + + // The formats below are combinations of the above formats. + 'c' => '(([1-9][0-9]{0,4})\-(1[012]|0[1-9])\-(3[01]|[12][0-9]|0[1-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])[\+\-](1[012]|0[0-9]):([0134][05]))', // Y-m-dTH:i:sP + 'r' => '(([a-zA-Z]{3}), ([123][0-9]|[1-9]) ([a-zA-Z]{3}) ([1-9][0-9]{0,4}) (2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9]) [\+\-](1[012]|0[0-9])([0134][05]))', // D, j M Y H:i:s O + ); + /** * A test Carbon instance to be returned when now instances are created. * @@ -170,6 +234,20 @@ class Carbon extends DateTime */ protected static $lastErrors; + /** + * The custom Carbon JSON serializer. + * + * @var callable|null + */ + protected static $serializer; + + /** + * The registered string macros. + * + * @var array + */ + protected static $localMacros = array(); + /** * Will UTF8 encoding be used to print localized date/time ? * @@ -177,13 +255,96 @@ class Carbon extends DateTime */ protected static $utf8 = false; - /* + /** + * Add microseconds to now on PHP < 7.1 and 7.1.3. true by default. + * + * @var bool + */ + protected static $microsecondsFallback = true; + + /** * Indicates if months should be calculated with overflow. * * @var bool */ protected static $monthsOverflow = true; + /** + * Indicates if years should be calculated with overflow. + * + * @var bool + */ + protected static $yearsOverflow = true; + + /** + * Indicates if years are compared with month by default so isSameMonth and isSameQuarter have $ofSameYear set + * to true by default. + * + * @var bool + */ + protected static $compareYearWithMonth = false; + + /** + * Options for diffForHumans(). + * + * @var int + */ + protected static $humanDiffOptions = self::NO_ZERO_DIFF; + + /** + * @param int $humanDiffOptions + */ + public static function setHumanDiffOptions($humanDiffOptions) + { + static::$humanDiffOptions = $humanDiffOptions; + } + + /** + * @param int $humanDiffOption + */ + public static function enableHumanDiffOption($humanDiffOption) + { + static::$humanDiffOptions = static::getHumanDiffOptions() | $humanDiffOption; + } + + /** + * @param int $humanDiffOption + */ + public static function disableHumanDiffOption($humanDiffOption) + { + static::$humanDiffOptions = static::getHumanDiffOptions() & ~$humanDiffOption; + } + + /** + * @return int + */ + public static function getHumanDiffOptions() + { + return static::$humanDiffOptions; + } + + /** + * Add microseconds to now on PHP < 7.1 and 7.1.3 if set to true, + * let microseconds to 0 on those PHP versions if false. + * + * @param bool $microsecondsFallback + */ + public static function useMicrosecondsFallback($microsecondsFallback = true) + { + static::$microsecondsFallback = $microsecondsFallback; + } + + /** + * Return true if microseconds fallback on PHP < 7.1 and 7.1.3 is + * enabled. false if disabled. + * + * @return bool + */ + public static function isMicrosecondsFallbackEnabled() + { + return static::$microsecondsFallback; + } + /** * Indicates if months should be calculated with overflow. * @@ -216,6 +377,58 @@ class Carbon extends DateTime return static::$monthsOverflow; } + /** + * Indicates if years should be calculated with overflow. + * + * @param bool $yearsOverflow + * + * @return void + */ + public static function useYearsOverflow($yearsOverflow = true) + { + static::$yearsOverflow = $yearsOverflow; + } + + /** + * Reset the month overflow behavior. + * + * @return void + */ + public static function resetYearsOverflow() + { + static::$yearsOverflow = true; + } + + /** + * Get the month overflow behavior. + * + * @return bool + */ + public static function shouldOverflowYears() + { + return static::$yearsOverflow; + } + + /** + * Get the month comparison default behavior. + * + * @return bool + */ + public static function compareYearWithMonth($compareYearWithMonth = true) + { + static::$compareYearWithMonth = $compareYearWithMonth; + } + + /** + * Get the month comparison default behavior. + * + * @return bool + */ + public static function shouldCompareYearWithMonth() + { + return static::$compareYearWithMonth; + } + /** * Creates a DateTimeZone from a string, DateTimeZone or integer offset. * @@ -246,13 +459,25 @@ class Carbon extends DateTime $object = $tzName; } - $tz = @timezone_open((string) $object); + $tz = @timezone_open($object = (string) $object); - if ($tz === false) { - throw new InvalidArgumentException('Unknown or bad timezone ('.$object.')'); + if ($tz !== false) { + return $tz; } - return $tz; + // Work-around for a bug fixed in PHP 5.5.10 https://bugs.php.net/bug.php?id=45528 + // See: https://stackoverflow.com/q/14068594/2646927 + // @codeCoverageIgnoreStart + if (strpos($object, ':') !== false) { + try { + return static::createFromFormat('O', $object)->getTimezone(); + } catch (InvalidArgumentException $e) { + // + } + } + // @codeCoverageIgnoreEnd + + throw new InvalidArgumentException('Unknown or bad timezone ('.$object.')'); } /////////////////////////////////////////////////////////////////// @@ -272,11 +497,9 @@ class Carbon extends DateTime { // If the class has a test now set and we are trying to create a now() // instance then override as required - if (static::hasTestNow() && (empty($time) || $time === 'now' || static::hasRelativeKeywords($time))) { + $isNow = empty($time) || $time === 'now'; + if (static::hasTestNow() && ($isNow || static::hasRelativeKeywords($time))) { $testInstance = clone static::getTestNow(); - if (static::hasRelativeKeywords($time)) { - $testInstance->modify($time); - } //shift the time according to the given time zone if ($tz !== null && $tz !== static::getTestNow()->getTimezone()) { @@ -285,26 +508,57 @@ class Carbon extends DateTime $tz = $testInstance->getTimezone(); } - $time = $testInstance->toDateTimeString(); + if (static::hasRelativeKeywords($time)) { + $testInstance->modify($time); + } + + $time = $testInstance->format(static::MOCK_DATETIME_FORMAT); } - parent::__construct($time, static::safeCreateDateTimeZone($tz)); + $timezone = static::safeCreateDateTimeZone($tz); + // @codeCoverageIgnoreStart + if ($isNow && !isset($testInstance) && static::isMicrosecondsFallbackEnabled() && ( + version_compare(PHP_VERSION, '7.1.0-dev', '<') + || + version_compare(PHP_VERSION, '7.1.3-dev', '>=') && version_compare(PHP_VERSION, '7.1.4-dev', '<') + ) + ) { + // Get microseconds from microtime() if "now" asked and PHP < 7.1 and PHP 7.1.3 if fallback enabled. + list($microTime, $timeStamp) = explode(' ', microtime()); + $dateTime = new DateTime('now', $timezone); + $dateTime->setTimestamp($timeStamp); // Use the timestamp returned by microtime as now can happen in the next second + $time = $dateTime->format(static::DEFAULT_TO_STRING_FORMAT).substr($microTime, 1, 7); + } + // @codeCoverageIgnoreEnd + + // Work-around for PHP bug https://bugs.php.net/bug.php?id=67127 + if (strpos((string) .1, '.') === false) { + $locale = setlocale(LC_NUMERIC, '0'); + setlocale(LC_NUMERIC, 'C'); + } + parent::__construct($time, $timezone); + if (isset($locale)) { + setlocale(LC_NUMERIC, $locale); + } + static::setLastErrors(parent::getLastErrors()); } /** * Create a Carbon instance from a DateTime one. * - * @param \DateTime $dt + * @param \DateTime|\DateTimeInterface $date * * @return static */ - public static function instance(DateTime $dt) + public static function instance($date) { - if ($dt instanceof static) { - return clone $dt; + if ($date instanceof static) { + return clone $date; } - return new static($dt->format('Y-m-d H:i:s.u'), $dt->getTimezone()); + static::expectDateTime($date); + + return new static($date->format('Y-m-d H:i:s.u'), $date->getTimezone()); } /** @@ -345,7 +599,7 @@ class Carbon extends DateTime */ public static function today($tz = null) { - return static::now($tz)->startOfDay(); + return static::parse('today', $tz); } /** @@ -357,7 +611,7 @@ class Carbon extends DateTime */ public static function tomorrow($tz = null) { - return static::today($tz)->addDay(); + return static::parse('tomorrow', $tz); } /** @@ -369,7 +623,7 @@ class Carbon extends DateTime */ public static function yesterday($tz = null) { - return static::today($tz)->subDay(); + return static::parse('yesterday', $tz); } /** @@ -379,9 +633,9 @@ class Carbon extends DateTime */ public static function maxValue() { - if (PHP_INT_SIZE === 4) { - // 32 bit (and additionally Windows 64 bit) - return static::createFromTimestamp(PHP_INT_MAX); + if (self::$PHPIntSize === 4) { + // 32 bit + return static::createFromTimestamp(PHP_INT_MAX); // @codeCoverageIgnore } // 64 bit @@ -395,9 +649,9 @@ class Carbon extends DateTime */ public static function minValue() { - if (PHP_INT_SIZE === 4) { - // 32 bit (and additionally Windows 64 bit) - return static::createFromTimestamp(~PHP_INT_MAX); + if (self::$PHPIntSize === 4) { + // 32 bit + return static::createFromTimestamp(~PHP_INT_MAX); // @codeCoverageIgnore } // 64 bit @@ -424,11 +678,13 @@ class Carbon extends DateTime * @param int|null $second * @param \DateTimeZone|string|null $tz * + * @throws \InvalidArgumentException + * * @return static */ public static function create($year = null, $month = null, $day = null, $hour = null, $minute = null, $second = null, $tz = null) { - $now = static::hasTestNow() ? static::getTestNow()->getTimestamp() : time(); + $now = static::hasTestNow() ? static::getTestNow() : static::now($tz); $defaults = array_combine(array( 'year', @@ -437,7 +693,7 @@ class Carbon extends DateTime 'hour', 'minute', 'second', - ), explode('-', date('Y-n-j-G-i-s', $now))); + ), explode('-', $now->format('Y-n-j-G-i-s'))); $year = $year === null ? $defaults['year'] : $year; $month = $month === null ? $defaults['month'] : $month; @@ -462,7 +718,7 @@ class Carbon extends DateTime $year = 9999; } - $instance = static::createFromFormat('Y-n-j G:i:s', sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz); + $instance = static::createFromFormat('!Y-n-j G:i:s', sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz); if ($fixYear !== null) { $instance->addYears($fixYear); @@ -494,7 +750,7 @@ class Carbon extends DateTime * @param int|null $second * @param \DateTimeZone|string|null $tz * - * @throws \Carbon\Exceptions\InvalidDateException + * @throws \Carbon\Exceptions\InvalidDateException|\InvalidArgumentException * * @return static */ @@ -515,13 +771,15 @@ class Carbon extends DateTime } } - $instance = static::create($year, $month, 1, $hour, $minute, $second, $tz); + $instance = static::create($year, $month, $day, $hour, $minute, $second, $tz); - if ($day !== null && $day > $instance->daysInMonth) { - throw new InvalidDateException('day', $day); + foreach (array_reverse($fields) as $field => $range) { + if ($$field !== null && (!is_int($$field) || $$field !== $instance->$field)) { + throw new InvalidDateException($field, $$field); + } } - return $instance->day($day); + return $instance; } /** @@ -532,6 +790,8 @@ class Carbon extends DateTime * @param int|null $day * @param \DateTimeZone|string|null $tz * + * @throws \InvalidArgumentException + * * @return static */ public static function createFromDate($year = null, $month = null, $day = null, $tz = null) @@ -539,6 +799,21 @@ class Carbon extends DateTime return static::create($year, $month, $day, null, null, null, $tz); } + /** + * Create a Carbon instance from just a date. The time portion is set to midnight. + * + * @param int|null $year + * @param int|null $month + * @param int|null $day + * @param \DateTimeZone|string|null $tz + * + * @return static + */ + public static function createMidnightDate($year = null, $month = null, $day = null, $tz = null) + { + return static::create($year, $month, $day, 0, 0, 0, $tz); + } + /** * Create a Carbon instance from just a time. The date portion is set to today. * @@ -547,6 +822,8 @@ class Carbon extends DateTime * @param int|null $second * @param \DateTimeZone|string|null $tz * + * @throws \InvalidArgumentException + * * @return static */ public static function createFromTime($hour = null, $minute = null, $second = null, $tz = null) @@ -555,9 +832,8 @@ class Carbon extends DateTime } /** - * Create a Carbon instance from a specific format. + * Create a Carbon instance from a time string. The date portion is set to today. * - * @param string $format * @param string $time * @param \DateTimeZone|string|null $tz * @@ -565,18 +841,61 @@ class Carbon extends DateTime * * @return static */ + public static function createFromTimeString($time, $tz = null) + { + return static::today($tz)->setTimeFromTimeString($time); + } + + private static function createFromFormatAndTimezone($format, $time, $tz) + { + return $tz !== null + ? parent::createFromFormat($format, $time, static::safeCreateDateTimeZone($tz)) + : parent::createFromFormat($format, $time); + } + + /** + * Create a Carbon instance from a specific format. + * + * @param string $format Datetime format + * @param string $time + * @param \DateTimeZone|string|null $tz + * + * @throws InvalidArgumentException + * + * @return static + */ public static function createFromFormat($format, $time, $tz = null) { - if ($tz !== null) { - $dt = parent::createFromFormat($format, $time, static::safeCreateDateTimeZone($tz)); - } else { - $dt = parent::createFromFormat($format, $time); + // First attempt to create an instance, so that error messages are based on the unmodified format. + $date = self::createFromFormatAndTimezone($format, $time, $tz); + $lastErrors = parent::getLastErrors(); + + if (($mock = static::getTestNow()) && ($date instanceof DateTime || $date instanceof DateTimeInterface)) { + // Set timezone from mock if custom timezone was neither given directly nor as a part of format. + // First let's skip the part that will be ignored by the parser. + $nonEscaped = '(?getTimezone(); + } + + // Prepend mock datetime only if the format does not contain non escaped unix epoch reset flag. + if (!preg_match("/{$nonEscaped}[!|]/", $format)) { + $format = static::MOCK_DATETIME_FORMAT.' '.$format; + $time = $mock->format(static::MOCK_DATETIME_FORMAT).' '.$time; + } + + // Regenerate date from the modified format to base result on the mocked instance instead of now. + $date = self::createFromFormatAndTimezone($format, $time, $tz); } - static::setLastErrors($lastErrors = parent::getLastErrors()); + if ($date instanceof DateTime || $date instanceof DateTimeInterface) { + $instance = static::instance($date); + $instance::setLastErrors($lastErrors); - if ($dt instanceof DateTime) { - return static::instance($dt); + return $instance; } throw new InvalidArgumentException(implode(PHP_EOL, $lastErrors['errors'])); @@ -612,7 +931,21 @@ class Carbon extends DateTime */ public static function createFromTimestamp($timestamp, $tz = null) { - return static::now($tz)->setTimestamp($timestamp); + return static::today($tz)->setTimestamp($timestamp); + } + + /** + * Create a Carbon instance from a timestamp in milliseconds. + * + * @param int $timestamp + * @param \DateTimeZone|string|null $tz + * + * @return static + */ + public static function createFromTimestampMs($timestamp, $tz = null) + { + return static::createFromFormat('U.u', sprintf('%F', $timestamp / 1000)) + ->setTimezone($tz); } /** @@ -627,6 +960,32 @@ class Carbon extends DateTime return new static('@'.$timestamp); } + /** + * Make a Carbon instance from given variable if possible. + * + * Always return a new instance. Parse only strings and only these likely to be dates (skip intervals + * and recurrences). Throw an exception for invalid format, but otherwise return null. + * + * @param mixed $var + * + * @return static|null + */ + public static function make($var) + { + if ($var instanceof DateTime || $var instanceof DateTimeInterface) { + return static::instance($var); + } + + if (is_string($var)) { + $var = trim($var); + $first = substr($var, 0, 1); + + if (is_string($var) && $first !== 'P' && $first !== 'R' && preg_match('/[a-z0-9]/i', $var)) { + return static::parse($var); + } + } + } + /** * Get a copy of the instance. * @@ -637,6 +996,56 @@ class Carbon extends DateTime return clone $this; } + /** + * Returns a present instance in the same timezone. + * + * @return static + */ + public function nowWithSameTz() + { + return static::now($this->getTimezone()); + } + + /** + * Throws an exception if the given object is not a DateTime and does not implement DateTimeInterface. + * + * @param mixed $date + * + * @throws \InvalidArgumentException + */ + protected static function expectDateTime($date) + { + if (!$date instanceof DateTime && !$date instanceof DateTimeInterface) { + throw new InvalidArgumentException( + 'Expected null, string, DateTime or DateTimeInterface, '. + (is_object($date) ? get_class($date) : gettype($date)).' given' + ); + } + } + + /** + * Return the Carbon instance passed through, a now instance in the same timezone + * if null given or parse the input if string given. + * + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * + * @return static + */ + protected function resolveCarbon($date = null) + { + if (!$date) { + return $this->nowWithSameTz(); + } + + if (is_string($date)) { + return static::parse($date, $this->getTimezone()); + } + + static::expectDateTime($date); + + return $date instanceof self ? $date : static::instance($date); + } + /////////////////////////////////////////////////////////////////// ///////////////////////// GETTERS AND SETTERS ///////////////////// /////////////////////////////////////////////////////////////////// @@ -652,27 +1061,33 @@ class Carbon extends DateTime */ public function __get($name) { + static $formats = array( + 'year' => 'Y', + 'yearIso' => 'o', + 'month' => 'n', + 'day' => 'j', + 'hour' => 'G', + 'minute' => 'i', + 'second' => 's', + 'micro' => 'u', + 'dayOfWeek' => 'w', + 'dayOfWeekIso' => 'N', + 'dayOfYear' => 'z', + 'weekOfYear' => 'W', + 'daysInMonth' => 't', + 'timestamp' => 'U', + ); + switch (true) { - case array_key_exists($name, $formats = array( - 'year' => 'Y', - 'yearIso' => 'o', - 'month' => 'n', - 'day' => 'j', - 'hour' => 'G', - 'minute' => 'i', - 'second' => 's', - 'micro' => 'u', - 'dayOfWeek' => 'w', - 'dayOfYear' => 'z', - 'weekOfYear' => 'W', - 'daysInMonth' => 't', - 'timestamp' => 'U', - )): + case isset($formats[$name]): return (int) $this->format($formats[$name]); case $name === 'weekOfMonth': return (int) ceil($this->day / static::DAYS_PER_WEEK); + case $name === 'weekNumberInMonth': + return (int) ceil(($this->day + $this->copy()->startOfMonth()->dayOfWeek - 1) / static::DAYS_PER_WEEK); + case $name === 'age': return $this->diffInYears(); @@ -730,6 +1145,8 @@ class Carbon extends DateTime * @param string|int|\DateTimeZone $value * * @throws \InvalidArgumentException + * + * @return void */ public function __set($name, $value) { @@ -889,13 +1306,11 @@ class Carbon extends DateTime */ public function setTimeFromTimeString($time) { - $time = explode(':', $time); + if (strpos($time, ':') === false) { + $time .= ':0'; + } - $hour = $time[0]; - $minute = isset($time[1]) ? $time[1] : 0; - $second = isset($time[2]) ? $time[2] : 0; - - return $this->setTime($hour, $minute, $second); + return $this->modify($time); } /** @@ -943,7 +1358,54 @@ class Carbon extends DateTime */ public function setTimezone($value) { - return parent::setTimezone(static::safeCreateDateTimeZone($value)); + parent::setTimezone(static::safeCreateDateTimeZone($value)); + // https://bugs.php.net/bug.php?id=72338 + // just workaround on this bug + $this->getTimestamp(); + + return $this; + } + + /** + * Set the year, month, and date for this instance to that of the passed instance. + * + * @param \Carbon\Carbon|\DateTimeInterface $date + * + * @return static + */ + public function setDateFrom($date) + { + $date = static::instance($date); + + $this->setDate($date->year, $date->month, $date->day); + + return $this; + } + + /** + * Set the hour, day, and time for this instance to that of the passed instance. + * + * @param \Carbon\Carbon|\DateTimeInterface $date + * + * @return static + */ + public function setTimeFrom($date) + { + $date = static::instance($date); + + $this->setTime($date->hour, $date->minute, $date->second); + + return $this; + } + + /** + * Get the days of the week + * + * @return array + */ + public static function getDays() + { + return static::$days; } /////////////////////////////////////////////////////////////////// @@ -963,7 +1425,9 @@ class Carbon extends DateTime /** * Set the first day of week * - * @param int + * @param int $day week start day + * + * @return void */ public static function setWeekStartsAt($day) { @@ -983,7 +1447,9 @@ class Carbon extends DateTime /** * Set the last day of week * - * @param int + * @param int $day + * + * @return void */ public static function setWeekEndsAt($day) { @@ -1003,13 +1469,37 @@ class Carbon extends DateTime /** * Set weekend days * - * @param array + * @param array $days + * + * @return void */ public static function setWeekendDays($days) { static::$weekendDays = $days; } + /** + * get midday/noon hour + * + * @return int + */ + public static function getMidDayAt() + { + return static::$midDayAt; + } + + /** + * Set midday/noon hour + * + * @param int $hour midday hour + * + * @return void + */ + public static function setMidDayAt($hour) + { + static::$midDayAt = $hour; + } + /////////////////////////////////////////////////////////////////// ///////////////////////// TESTING AIDS //////////////////////////// /////////////////////////////////////////////////////////////////// @@ -1029,6 +1519,7 @@ class Carbon extends DateTime * To clear the test instance call this method using the default * parameter of null. * + * @param \Carbon\Carbon|null $testNow real or mock Carbon instance * @param \Carbon\Carbon|string|null $testNow */ public static function setTestNow($testNow = null) @@ -1059,25 +1550,24 @@ class Carbon extends DateTime } /** - * Determine if there is a relative keyword in the time string, this is to - * create dates relative to now for test instances. e.g.: next tuesday + * Determine if a time string will produce a relative date. * * @param string $time * - * @return bool true if there is a keyword, otherwise false + * @return bool true if time match a relative date, false if absolute or invalid time string */ public static function hasRelativeKeywords($time) { - // skip common format with a '-' in it - if (preg_match('/\d{4}-\d{1,2}-\d{1,2}/', $time) !== 1) { - foreach (static::$relativeKeywords as $keyword) { - if (stripos($time, $keyword) !== false) { - return true; - } - } + if (strtotime($time) === false) { + return false; } - return false; + $date1 = new DateTime('2000-01-01T00:00:00Z'); + $date1->modify($time); + $date2 = new DateTime('2001-12-25T00:00:00Z'); + $date2->modify($time); + + return $date1 != $date2; } /////////////////////////////////////////////////////////////////// @@ -1092,9 +1582,7 @@ class Carbon extends DateTime protected static function translator() { if (static::$translator === null) { - static::$translator = new Translator('en'); - static::$translator->addLoader('array', new ArrayLoader()); - static::setLocale('en'); + static::$translator = Translator::get(); } return static::$translator; @@ -1114,6 +1602,8 @@ class Carbon extends DateTime * Set the translator instance to use * * @param \Symfony\Component\Translation\TranslatorInterface $translator + * + * @return void */ public static function setTranslator(TranslatorInterface $translator) { @@ -1133,25 +1623,13 @@ class Carbon extends DateTime /** * Set the current translator locale and indicate if the source locale file exists * - * @param string $locale + * @param string $locale locale ex. en * * @return bool */ public static function setLocale($locale) { - $locale = preg_replace_callback('/\b([a-z]{2})[-_](?:([a-z]{4})[-_])?([a-z]{2})\b/', function ($matches) { - return $matches[1].'_'.(!empty($matches[2]) ? ucfirst($matches[2]).'_' : '').strtoupper($matches[3]); - }, strtolower($locale)); - - if (file_exists($filename = __DIR__.'/Lang/'.$locale.'.php')) { - static::translator()->setLocale($locale); - // Ensure the locale has been loaded. - static::translator()->addResource('array', require $filename, $locale); - - return true; - } - - return false; + return static::translator()->setLocale($locale) !== false; } /////////////////////////////////////////////////////////////////// @@ -1178,19 +1656,20 @@ class Carbon extends DateTime */ public function formatLocalized($format) { - // Check for Windows to find and replace the %e - // modifier correctly + // Check for Windows to find and replace the %e modifier correctly. if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { - $format = preg_replace('#(?toDateTimeString())); return static::$utf8 ? utf8_encode($formatted) : $formatted; } /** * Reset the format used to the default when type juggling a Carbon instance to a string + * + * @return void */ public static function resetToStringFormat() { @@ -1201,6 +1680,8 @@ class Carbon extends DateTime * Set the default format used when type juggling a Carbon instance to a string * * @param string $format + * + * @return void */ public static function setToStringFormat($format) { @@ -1307,6 +1788,16 @@ class Carbon extends DateTime return $this->format(static::RFC822); } + /** + * Convert the instance to UTC and return as Zulu ISO8601 + * + * @return string + */ + public function toIso8601ZuluString() + { + return $this->copy()->setTimezone('UTC')->format('Y-m-d\TH:i:s\Z'); + } + /** * Format the instance as RFC850 * @@ -1377,6 +1868,41 @@ class Carbon extends DateTime return $this->format(static::W3C); } + /** + * Format the instance as RFC7231 + * + * @return string + */ + public function toRfc7231String() + { + return $this->copy() + ->setTimezone('GMT') + ->format(static::RFC7231_FORMAT); + } + + /** + * Get default array representation + * + * @return array + */ + public function toArray() + { + return array( + 'year' => $this->year, + 'month' => $this->month, + 'day' => $this->day, + 'dayOfWeek' => $this->dayOfWeek, + 'dayOfYear' => $this->dayOfYear, + 'hour' => $this->hour, + 'minute' => $this->minute, + 'second' => $this->second, + 'micro' => $this->micro, + 'timestamp' => $this->timestamp, + 'formatted' => $this->format(self::DEFAULT_TO_STRING_FORMAT), + 'timezone' => $this->timezone, + ); + } + /////////////////////////////////////////////////////////////////// ////////////////////////// COMPARISONS //////////////////////////// /////////////////////////////////////////////////////////////////// @@ -1384,267 +1910,267 @@ class Carbon extends DateTime /** * Determines if the instance is equal to another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @return bool */ - public function eq(Carbon $dt) + public function eq($date) { - return $this == $dt; + return $this == $date; } /** * Determines if the instance is equal to another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @see eq() * * @return bool */ - public function equalTo(Carbon $dt) + public function equalTo($date) { - return $this->eq($dt); + return $this->eq($date); } /** * Determines if the instance is not equal to another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @return bool */ - public function ne(Carbon $dt) + public function ne($date) { - return !$this->eq($dt); + return !$this->eq($date); } /** * Determines if the instance is not equal to another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @see ne() * * @return bool */ - public function notEqualTo(Carbon $dt) + public function notEqualTo($date) { - return $this->ne($dt); + return $this->ne($date); } /** * Determines if the instance is greater (after) than another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @return bool */ - public function gt(Carbon $dt) + public function gt($date) { - return $this > $dt; + return $this > $date; } /** * Determines if the instance is greater (after) than another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @see gt() * * @return bool */ - public function greaterThan(Carbon $dt) + public function greaterThan($date) { - return $this->gt($dt); + return $this->gt($date); } /** * Determines if the instance is greater (after) than or equal to another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @return bool */ - public function gte(Carbon $dt) + public function gte($date) { - return $this >= $dt; + return $this >= $date; } /** * Determines if the instance is greater (after) than or equal to another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @see gte() * * @return bool */ - public function greaterThanOrEqualTo(Carbon $dt) + public function greaterThanOrEqualTo($date) { - return $this->gte($dt); + return $this->gte($date); } /** * Determines if the instance is less (before) than another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @return bool */ - public function lt(Carbon $dt) + public function lt($date) { - return $this < $dt; + return $this < $date; } /** * Determines if the instance is less (before) than another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @see lt() * * @return bool */ - public function lessThan(Carbon $dt) + public function lessThan($date) { - return $this->lt($dt); + return $this->lt($date); } /** * Determines if the instance is less (before) or equal to another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @return bool */ - public function lte(Carbon $dt) + public function lte($date) { - return $this <= $dt; + return $this <= $date; } /** * Determines if the instance is less (before) or equal to another * - * @param Carbon $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @see lte() * * @return bool */ - public function lessThanOrEqualTo(Carbon $dt) + public function lessThanOrEqualTo($date) { - return $this->lte($dt); + return $this->lte($date); } /** * Determines if the instance is between two others * - * @param Carbon $dt1 - * @param Carbon $dt2 - * @param bool $equal Indicates if a > and < comparison should be used or <= or >= + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date1 + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date2 + * @param bool $equal Indicates if an equal to comparison should be done * * @return bool */ - public function between(Carbon $dt1, Carbon $dt2, $equal = true) + public function between($date1, $date2, $equal = true) { - if ($dt1->gt($dt2)) { - $temp = $dt1; - $dt1 = $dt2; - $dt2 = $temp; + if ($date1->gt($date2)) { + $temp = $date1; + $date1 = $date2; + $date2 = $temp; } if ($equal) { - return $this->gte($dt1) && $this->lte($dt2); + return $this->gte($date1) && $this->lte($date2); } - return $this->gt($dt1) && $this->lt($dt2); + return $this->gt($date1) && $this->lt($date2); } /** * Get the closest date from the instance. * - * @param Carbon $dt1 - * @param Carbon $dt2 + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date1 + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date2 * * @return static */ - public function closest(Carbon $dt1, Carbon $dt2) + public function closest($date1, $date2) { - return $this->diffInSeconds($dt1) < $this->diffInSeconds($dt2) ? $dt1 : $dt2; + return $this->diffInSeconds($date1) < $this->diffInSeconds($date2) ? $date1 : $date2; } /** * Get the farthest date from the instance. * - * @param Carbon $dt1 - * @param Carbon $dt2 + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date1 + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date2 * * @return static */ - public function farthest(Carbon $dt1, Carbon $dt2) + public function farthest($date1, $date2) { - return $this->diffInSeconds($dt1) > $this->diffInSeconds($dt2) ? $dt1 : $dt2; + return $this->diffInSeconds($date1) > $this->diffInSeconds($date2) ? $date1 : $date2; } /** * Get the minimum instance between a given instance (default now) and the current instance. * - * @param \Carbon\Carbon|null $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @return static */ - public function min(Carbon $dt = null) + public function min($date = null) { - $dt = $dt ?: static::now($this->getTimezone()); + $date = $this->resolveCarbon($date); - return $this->lt($dt) ? $this : $dt; + return $this->lt($date) ? $this : $date; } /** * Get the minimum instance between a given instance (default now) and the current instance. * - * @param \Carbon\Carbon|null $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @see min() * * @return static */ - public function minimum(Carbon $dt = null) + public function minimum($date = null) { - return $this->min($dt); + return $this->min($date); } /** * Get the maximum instance between a given instance (default now) and the current instance. * - * @param \Carbon\Carbon|null $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @return static */ - public function max(Carbon $dt = null) + public function max($date = null) { - $dt = $dt ?: static::now($this->getTimezone()); + $date = $this->resolveCarbon($date); - return $this->gt($dt) ? $this : $dt; + return $this->gt($date) ? $this : $date; } /** * Get the maximum instance between a given instance (default now) and the current instance. * - * @param \Carbon\Carbon|null $dt + * @param \Carbon\Carbon|\DateTimeInterface|mixed $date * * @see max() * * @return static */ - public function maximum(Carbon $dt = null) + public function maximum($date = null) { - return $this->max($dt); + return $this->max($date); } /** - * Determines if the instance is a weekday + * Determines if the instance is a weekday. * * @return bool */ @@ -1654,7 +2180,7 @@ class Carbon extends DateTime } /** - * Determines if the instance is a weekend day + * Determines if the instance is a weekend day. * * @return bool */ @@ -1664,7 +2190,7 @@ class Carbon extends DateTime } /** - * Determines if the instance is yesterday + * Determines if the instance is yesterday. * * @return bool */ @@ -1674,17 +2200,17 @@ class Carbon extends DateTime } /** - * Determines if the instance is today + * Determines if the instance is today. * * @return bool */ public function isToday() { - return $this->toDateString() === static::now($this->getTimezone())->toDateString(); + return $this->toDateString() === $this->nowWithSameTz()->toDateString(); } /** - * Determines if the instance is tomorrow + * Determines if the instance is tomorrow. * * @return bool */ @@ -1694,87 +2220,107 @@ class Carbon extends DateTime } /** - * Determines if the instance is within the next week + * Determines if the instance is within the next week. * * @return bool */ public function isNextWeek() { - return $this->weekOfYear === static::now($this->getTimezone())->addWeek()->weekOfYear; + return $this->weekOfYear === $this->nowWithSameTz()->addWeek()->weekOfYear; } /** - * Determines if the instance is within the last week + * Determines if the instance is within the last week. * * @return bool */ public function isLastWeek() { - return $this->weekOfYear === static::now($this->getTimezone())->subWeek()->weekOfYear; + return $this->weekOfYear === $this->nowWithSameTz()->subWeek()->weekOfYear; } /** - * Determines if the instance is within the next month + * Determines if the instance is within the next quarter. + * + * @return bool + */ + public function isNextQuarter() + { + return $this->quarter === $this->nowWithSameTz()->addQuarter()->quarter; + } + + /** + * Determines if the instance is within the last quarter. + * + * @return bool + */ + public function isLastQuarter() + { + return $this->quarter === $this->nowWithSameTz()->subQuarter()->quarter; + } + + /** + * Determines if the instance is within the next month. * * @return bool */ public function isNextMonth() { - return $this->month === static::now($this->getTimezone())->addMonthNoOverflow()->month; + return $this->month === $this->nowWithSameTz()->addMonthNoOverflow()->month; } /** - * Determines if the instance is within the last month + * Determines if the instance is within the last month. * * @return bool */ public function isLastMonth() { - return $this->month === static::now($this->getTimezone())->subMonthNoOverflow()->month; + return $this->month === $this->nowWithSameTz()->subMonthNoOverflow()->month; } /** - * Determines if the instance is within next year + * Determines if the instance is within next year. * * @return bool */ public function isNextYear() { - return $this->year === static::now($this->getTimezone())->addYear()->year; + return $this->year === $this->nowWithSameTz()->addYear()->year; } /** - * Determines if the instance is within the previous year + * Determines if the instance is within the previous year. * * @return bool */ public function isLastYear() { - return $this->year === static::now($this->getTimezone())->subYear()->year; + return $this->year === $this->nowWithSameTz()->subYear()->year; } /** - * Determines if the instance is in the future, ie. greater (after) than now + * Determines if the instance is in the future, ie. greater (after) than now. * * @return bool */ public function isFuture() { - return $this->gt(static::now($this->getTimezone())); + return $this->gt($this->nowWithSameTz()); } /** - * Determines if the instance is in the past, ie. less (before) than now + * Determines if the instance is in the past, ie. less (before) than now. * * @return bool */ public function isPast() { - return $this->lt(static::now($this->getTimezone())); + return $this->lt($this->nowWithSameTz()); } /** - * Determines if the instance is a leap year + * Determines if the instance is a leap year. * * @return bool */ @@ -1795,23 +2341,27 @@ class Carbon extends DateTime return static::create($this->year, 12, 28, 0, 0, 0, $this->tz)->weekOfYear === 53; } - /* + /** * Compares the formatted values of the two dates. * - * @param string $format The date formats to compare. - * @param \Carbon\Carbon|null $dt The instance to compare with or null to use current day. + * @param string $format The date formats to compare. + * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use current day. + * + * @throws \InvalidArgumentException * * @return bool */ - public function isSameAs($format, Carbon $dt = null) + public function isSameAs($format, $date = null) { - $dt = $dt ?: static::now($this->tz); + $date = $date ?: static::now($this->tz); - return $this->format($format) === $dt->format($format); + static::expectDateTime($date); + + return $this->format($format) === $date->format($format); } /** - * Determines if the instance is in the current year + * Determines if the instance is in the current year. * * @return bool */ @@ -1823,50 +2373,172 @@ class Carbon extends DateTime /** * Checks if the passed in date is in the same year as the instance year. * - * @param \Carbon\Carbon|null $dt The instance to compare with or null to use current day. + * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use current day. * * @return bool */ - public function isSameYear(Carbon $dt = null) + public function isSameYear($date = null) { - return $this->isSameAs('Y', $dt); + return $this->isSameAs('Y', $date); } /** - * Determines if the instance is in the current month + * Determines if the instance is in the current month. * * @return bool */ - public function isCurrentMonth() + public function isCurrentQuarter() { - return $this->isSameMonth(); + return $this->isSameQuarter(); } /** - * Checks if the passed in date is in the same month as the instance month (and year if needed). + * Checks if the passed in date is in the same quarter as the instance quarter (and year if needed). * - * @param \Carbon\Carbon|null $dt The instance to compare with or null to use current day. - * @param bool $ofSameYear Check if it is the same month in the same year. + * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use current day. + * @param bool $ofSameYear Check if it is the same month in the same year. * * @return bool */ - public function isSameMonth(Carbon $dt = null, $ofSameYear = false) + public function isSameQuarter($date = null, $ofSameYear = null) { - $format = $ofSameYear ? 'Y-m' : 'm'; + $date = $date ? static::instance($date) : static::now($this->tz); - return $this->isSameAs($format, $dt); + static::expectDateTime($date); + + $ofSameYear = is_null($ofSameYear) ? static::shouldCompareYearWithMonth() : $ofSameYear; + + return $this->quarter === $date->quarter && (!$ofSameYear || $this->isSameYear($date)); } /** - * Checks if the passed in date is the same day as the instance current day. + * Determines if the instance is in the current month. * - * @param \Carbon\Carbon $dt + * @param bool $ofSameYear Check if it is the same month in the same year. * * @return bool */ - public function isSameDay(Carbon $dt) + public function isCurrentMonth($ofSameYear = null) { - return $this->toDateString() === $dt->toDateString(); + return $this->isSameMonth($ofSameYear); + } + + /** + * Checks if the passed in date is in the same month as the instance´s month. + * + * Note that this defaults to only comparing the month while ignoring the year. + * To test if it is the same exact month of the same year, pass in true as the second parameter. + * + * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date. + * @param bool $ofSameYear Check if it is the same month in the same year. + * + * @return bool + */ + public function isSameMonth($date = null, $ofSameYear = null) + { + $ofSameYear = is_null($ofSameYear) ? static::shouldCompareYearWithMonth() : $ofSameYear; + + return $this->isSameAs($ofSameYear ? 'Y-m' : 'm', $date); + } + + /** + * Determines if the instance is in the current day. + * + * @return bool + */ + public function isCurrentDay() + { + return $this->isSameDay(); + } + + /** + * Checks if the passed in date is the same exact day as the instance´s day. + * + * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date. + * + * @return bool + */ + public function isSameDay($date = null) + { + return $this->isSameAs('Y-m-d', $date); + } + + /** + * Determines if the instance is in the current hour. + * + * @return bool + */ + public function isCurrentHour() + { + return $this->isSameHour(); + } + + /** + * Checks if the passed in date is the same exact hour as the instance´s hour. + * + * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date. + * + * @return bool + */ + public function isSameHour($date = null) + { + return $this->isSameAs('Y-m-d H', $date); + } + + /** + * Determines if the instance is in the current minute. + * + * @return bool + */ + public function isCurrentMinute() + { + return $this->isSameMinute(); + } + + /** + * Checks if the passed in date is the same exact minute as the instance´s minute. + * + * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date. + * + * @return bool + */ + public function isSameMinute($date = null) + { + return $this->isSameAs('Y-m-d H:i', $date); + } + + /** + * Determines if the instance is in the current second. + * + * @return bool + */ + public function isCurrentSecond() + { + return $this->isSameSecond(); + } + + /** + * Checks if the passed in date is the same exact second as the instance´s second. + * + * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date. + * + * @return bool + */ + public function isSameSecond($date = null) + { + return $this->isSameAs('Y-m-d H:i:s', $date); + } + + /** + * Checks if this day is a specific day of the week. + * + * @param int $dayOfWeek + * + * @return bool + */ + public function isDayOfWeek($dayOfWeek) + { + return $this->dayOfWeek === $dayOfWeek; } /** @@ -1939,10 +2611,161 @@ class Carbon extends DateTime return $this->dayOfWeek === static::SATURDAY; } + /** + * Check if its the birthday. Compares the date/month values of the two dates. + * + * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use current day. + * + * @return bool + */ + public function isBirthday($date = null) + { + return $this->isSameAs('md', $date); + } + + /** + * Check if today is the last day of the Month + * + * @return bool + */ + public function isLastOfMonth() + { + return $this->day === $this->daysInMonth; + } + + /** + * Check if the instance is start of day / midnight. + * + * @param bool $checkMicroseconds check time at microseconds precision + * /!\ Warning, this is not reliable with PHP < 7.1.4 + * + * @return bool + */ + public function isStartOfDay($checkMicroseconds = false) + { + return $checkMicroseconds + ? $this->format('H:i:s.u') === '00:00:00.000000' + : $this->format('H:i:s') === '00:00:00'; + } + + /** + * Check if the instance is end of day. + * + * @param bool $checkMicroseconds check time at microseconds precision + * /!\ Warning, this is not reliable with PHP < 7.1.4 + * + * @return bool + */ + public function isEndOfDay($checkMicroseconds = false) + { + return $checkMicroseconds + ? $this->format('H:i:s.u') === '23:59:59.999999' + : $this->format('H:i:s') === '23:59:59'; + } + + /** + * Check if the instance is start of day / midnight. + * + * @return bool + */ + public function isMidnight() + { + return $this->isStartOfDay(); + } + + /** + * Check if the instance is midday. + * + * @return bool + */ + public function isMidday() + { + return $this->format('G:i:s') === static::$midDayAt.':00:00'; + } + + /** + * Checks if the (date)time string is in a given format. + * + * @param string $date + * @param string $format + * + * @return bool + */ + public static function hasFormat($date, $format) + { + try { + // Try to create a DateTime object. Throws an InvalidArgumentException if the provided time string + // doesn't match the format in any way. + static::createFromFormat($format, $date); + + // createFromFormat() is known to handle edge cases silently. + // E.g. "1975-5-1" (Y-n-j) will still be parsed correctly when "Y-m-d" is supplied as the format. + // To ensure we're really testing against our desired format, perform an additional regex validation. + $regex = strtr( + preg_quote($format, '/'), + static::$regexFormats + ); + + return (bool) preg_match('/^'.$regex.'$/', $date); + } catch (InvalidArgumentException $e) { + } + + return false; + } + /////////////////////////////////////////////////////////////////// /////////////////// ADDITIONS AND SUBTRACTIONS //////////////////// /////////////////////////////////////////////////////////////////// + /** + * Add centuries to the instance. Positive $value travels forward while + * negative $value travels into the past. + * + * @param int $value + * + * @return static + */ + public function addCenturies($value) + { + return $this->addYears(static::YEARS_PER_CENTURY * $value); + } + + /** + * Add a century to the instance + * + * @param int $value + * + * @return static + */ + public function addCentury($value = 1) + { + return $this->addCenturies($value); + } + + /** + * Remove centuries from the instance + * + * @param int $value + * + * @return static + */ + public function subCenturies($value) + { + return $this->addCenturies(-1 * $value); + } + + /** + * Remove a century from the instance + * + * @param int $value + * + * @return static + */ + public function subCentury($value = 1) + { + return $this->subCenturies($value); + } + /** * Add years to the instance. Positive $value travel forward while * negative $value travel into the past. @@ -1953,7 +2776,11 @@ class Carbon extends DateTime */ public function addYears($value) { - return $this->modify((int) $value.' year'); + if ($this->shouldOverflowYears()) { + return $this->addYearsWithOverflow($value); + } + + return $this->addYearsNoOverflow($value); } /** @@ -1969,15 +2796,55 @@ class Carbon extends DateTime } /** - * Remove a year from the instance + * Add years to the instance with no overflow of months + * Positive $value travel forward while + * negative $value travel into the past. * * @param int $value * * @return static */ - public function subYear($value = 1) + public function addYearsNoOverflow($value) { - return $this->subYears($value); + return $this->addMonthsNoOverflow($value * static::MONTHS_PER_YEAR); + } + + /** + * Add year with overflow months set to false + * + * @param int $value + * + * @return static + */ + public function addYearNoOverflow($value = 1) + { + return $this->addYearsNoOverflow($value); + } + + /** + * Add years to the instance. + * Positive $value travel forward while + * negative $value travel into the past. + * + * @param int $value + * + * @return static + */ + public function addYearsWithOverflow($value) + { + return $this->modify((int) $value.' year'); + } + + /** + * Add year with overflow. + * + * @param int $value + * + * @return static + */ + public function addYearWithOverflow($value = 1) + { + return $this->addYearsWithOverflow($value); } /** @@ -1992,6 +2859,66 @@ class Carbon extends DateTime return $this->addYears(-1 * $value); } + /** + * Remove a year from the instance + * + * @param int $value + * + * @return static + */ + public function subYear($value = 1) + { + return $this->subYears($value); + } + + /** + * Remove years from the instance with no month overflow. + * + * @param int $value + * + * @return static + */ + public function subYearsNoOverflow($value) + { + return $this->subMonthsNoOverflow($value * static::MONTHS_PER_YEAR); + } + + /** + * Remove year from the instance with no month overflow + * + * @param int $value + * + * @return static + */ + public function subYearNoOverflow($value = 1) + { + return $this->subYearsNoOverflow($value); + } + + /** + * Remove years from the instance. + * + * @param int $value + * + * @return static + */ + public function subYearsWithOverflow($value) + { + return $this->subMonthsWithOverflow($value * static::MONTHS_PER_YEAR); + } + + /** + * Remove year from the instance. + * + * @param int $value + * + * @return static + */ + public function subYearWithOverflow($value = 1) + { + return $this->subYearsWithOverflow($value); + } + /** * Add quarters to the instance. Positive $value travels forward while * negative $value travels into the past. @@ -2017,18 +2944,6 @@ class Carbon extends DateTime return $this->addQuarters($value); } - /** - * Remove a quarter from the instance - * - * @param int $value - * - * @return static - */ - public function subQuarter($value = 1) - { - return $this->subQuarters($value); - } - /** * Remove quarters from the instance * @@ -2042,52 +2957,15 @@ class Carbon extends DateTime } /** - * Add centuries to the instance. Positive $value travels forward while - * negative $value travels into the past. + * Remove a quarter from the instance * * @param int $value * * @return static */ - public function addCenturies($value) + public function subQuarter($value = 1) { - return $this->addYears(static::YEARS_PER_CENTURY * $value); - } - - /** - * Add a century to the instance - * - * @param int $value - * - * @return static - */ - public function addCentury($value = 1) - { - return $this->addCenturies($value); - } - - /** - * Remove a century from the instance - * - * @param int $value - * - * @return static - */ - public function subCentury($value = 1) - { - return $this->subCenturies($value); - } - - /** - * Remove centuries from the instance - * - * @param int $value - * - * @return static - */ - public function subCenturies($value) - { - return $this->addCenturies(-1 * $value); + return $this->subQuarters($value); } /** @@ -2119,18 +2997,6 @@ class Carbon extends DateTime return $this->addMonths($value); } - /** - * Remove a month from the instance - * - * @param int $value - * - * @return static - */ - public function subMonth($value = 1) - { - return $this->subMonths($value); - } - /** * Remove months from the instance * @@ -2143,6 +3009,18 @@ class Carbon extends DateTime return $this->addMonths(-1 * $value); } + /** + * Remove a month from the instance + * + * @param int $value + * + * @return static + */ + public function subMonth($value = 1) + { + return $this->subMonths($value); + } + /** * Add months to the instance. Positive $value travels forward while * negative $value travels into the past. @@ -2168,18 +3046,6 @@ class Carbon extends DateTime return $this->addMonthsWithOverflow($value); } - /** - * Remove a month from the instance - * - * @param int $value - * - * @return static - */ - public function subMonthWithOverflow($value = 1) - { - return $this->subMonthsWithOverflow($value); - } - /** * Remove months from the instance * @@ -2192,6 +3058,18 @@ class Carbon extends DateTime return $this->addMonthsWithOverflow(-1 * $value); } + /** + * Remove a month from the instance + * + * @param int $value + * + * @return static + */ + public function subMonthWithOverflow($value = 1) + { + return $this->subMonthsWithOverflow($value); + } + /** * Add months without overflowing to the instance. Positive $value * travels forward while negative $value travels into the past. @@ -2225,18 +3103,6 @@ class Carbon extends DateTime return $this->addMonthsNoOverflow($value); } - /** - * Remove a month with no overflow from the instance - * - * @param int $value - * - * @return static - */ - public function subMonthNoOverflow($value = 1) - { - return $this->subMonthsNoOverflow($value); - } - /** * Remove months with no overflow from the instance * @@ -2249,6 +3115,18 @@ class Carbon extends DateTime return $this->addMonthsNoOverflow(-1 * $value); } + /** + * Remove a month with no overflow from the instance + * + * @param int $value + * + * @return static + */ + public function subMonthNoOverflow($value = 1) + { + return $this->subMonthsNoOverflow($value); + } + /** * Add days to the instance. Positive $value travels forward while * negative $value travels into the past. @@ -2274,18 +3152,6 @@ class Carbon extends DateTime return $this->addDays($value); } - /** - * Remove a day from the instance - * - * @param int $value - * - * @return static - */ - public function subDay($value = 1) - { - return $this->subDays($value); - } - /** * Remove days from the instance * @@ -2298,6 +3164,18 @@ class Carbon extends DateTime return $this->addDays(-1 * $value); } + /** + * Remove a day from the instance + * + * @param int $value + * + * @return static + */ + public function subDay($value = 1) + { + return $this->subDays($value); + } + /** * Add weekdays to the instance. Positive $value travels forward while * negative $value travels into the past. @@ -2308,7 +3186,7 @@ class Carbon extends DateTime */ public function addWeekdays($value) { - // fix for https://bugs.php.net/bug.php?id=54909 + // Fix for weekday bug https://bugs.php.net/bug.php?id=54909 $t = $this->toTimeString(); $this->modify((int) $value.' weekday'); @@ -2327,18 +3205,6 @@ class Carbon extends DateTime return $this->addWeekdays($value); } - /** - * Remove a weekday from the instance - * - * @param int $value - * - * @return static - */ - public function subWeekday($value = 1) - { - return $this->subWeekdays($value); - } - /** * Remove weekdays from the instance * @@ -2351,6 +3217,18 @@ class Carbon extends DateTime return $this->addWeekdays(-1 * $value); } + /** + * Remove a weekday from the instance + * + * @param int $value + * + * @return static + */ + public function subWeekday($value = 1) + { + return $this->subWeekdays($value); + } + /** * Add weeks to the instance. Positive $value travels forward while * negative $value travels into the past. @@ -2376,18 +3254,6 @@ class Carbon extends DateTime return $this->addWeeks($value); } - /** - * Remove a week from the instance - * - * @param int $value - * - * @return static - */ - public function subWeek($value = 1) - { - return $this->subWeeks($value); - } - /** * Remove weeks to the instance * @@ -2400,6 +3266,18 @@ class Carbon extends DateTime return $this->addWeeks(-1 * $value); } + /** + * Remove a week from the instance + * + * @param int $value + * + * @return static + */ + public function subWeek($value = 1) + { + return $this->subWeeks($value); + } + /** * Add hours to the instance. Positive $value travels forward while * negative $value travels into the past. @@ -2414,7 +3292,20 @@ class Carbon extends DateTime } /** - * Add an hour to the instance + * Add hours to the instance using timestamp. Positive $value travels + * forward while negative $value travels into the past. + * + * @param int $value + * + * @return static + */ + public function addRealHours($value) + { + return $this->addRealMinutes($value * static::MINUTES_PER_HOUR); + } + + /** + * Add an hour to the instance. * * @param int $value * @@ -2426,19 +3317,19 @@ class Carbon extends DateTime } /** - * Remove an hour from the instance + * Add an hour to the instance using timestamp. * * @param int $value * * @return static */ - public function subHour($value = 1) + public function addRealHour($value = 1) { - return $this->subHours($value); + return $this->addRealHours($value); } /** - * Remove hours from the instance + * Remove hours from the instance. * * @param int $value * @@ -2450,8 +3341,44 @@ class Carbon extends DateTime } /** - * Add minutes to the instance. Positive $value travels forward while - * negative $value travels into the past. + * Remove hours from the instance using timestamp. + * + * @param int $value + * + * @return static + */ + public function subRealHours($value) + { + return $this->addRealHours(-1 * $value); + } + + /** + * Remove an hour from the instance. + * + * @param int $value + * + * @return static + */ + public function subHour($value = 1) + { + return $this->subHours($value); + } + + /** + * Remove an hour from the instance. + * + * @param int $value + * + * @return static + */ + public function subRealHour($value = 1) + { + return $this->subRealHours($value); + } + + /** + * Add minutes to the instance using timestamp. Positive $value + * travels forward while negative $value travels into the past. * * @param int $value * @@ -2463,7 +3390,20 @@ class Carbon extends DateTime } /** - * Add a minute to the instance + * Add minutes to the instance using timestamp. Positive $value travels + * forward while negative $value travels into the past. + * + * @param int $value + * + * @return static + */ + public function addRealMinutes($value) + { + return $this->addRealSeconds($value * static::SECONDS_PER_MINUTE); + } + + /** + * Add a minute to the instance. * * @param int $value * @@ -2475,7 +3415,19 @@ class Carbon extends DateTime } /** - * Remove a minute from the instance + * Add a minute to the instance using timestamp. + * + * @param int $value + * + * @return static + */ + public function addRealMinute($value = 1) + { + return $this->addRealMinutes($value); + } + + /** + * Remove a minute from the instance. * * @param int $value * @@ -2487,7 +3439,19 @@ class Carbon extends DateTime } /** - * Remove minutes from the instance + * Remove a minute from the instance using timestamp. + * + * @param int $value + * + * @return static + */ + public function subRealMinute($value = 1) + { + return $this->addRealMinutes(-1 * $value); + } + + /** + * Remove minutes from the instance. * * @param int $value * @@ -2498,6 +3462,18 @@ class Carbon extends DateTime return $this->addMinutes(-1 * $value); } + /** + * Remove a minute from the instance using timestamp. + * + * @param int $value + * + * @return static + */ + public function subRealMinutes($value = 1) + { + return $this->subRealMinute($value); + } + /** * Add seconds to the instance. Positive $value travels forward while * negative $value travels into the past. @@ -2512,7 +3488,20 @@ class Carbon extends DateTime } /** - * Add a second to the instance + * Add seconds to the instance using timestamp. Positive $value travels + * forward while negative $value travels into the past. + * + * @param int $value + * + * @return static + */ + public function addRealSeconds($value) + { + return $this->setTimestamp($this->getTimestamp() + $value); + } + + /** + * Add a second to the instance. * * @param int $value * @@ -2523,6 +3512,42 @@ class Carbon extends DateTime return $this->addSeconds($value); } + /** + * Add a second to the instance using timestamp. + * + * @param int $value + * + * @return static + */ + public function addRealSecond($value = 1) + { + return $this->addRealSeconds($value); + } + + /** + * Remove seconds from the instance. + * + * @param int $value + * + * @return static + */ + public function subSeconds($value) + { + return $this->addSeconds(-1 * $value); + } + + /** + * Remove seconds from the instance using timestamp. + * + * @param int $value + * + * @return static + */ + public function subRealSeconds($value) + { + return $this->addRealSeconds(-1 * $value); + } + /** * Remove a second from the instance * @@ -2536,121 +3561,130 @@ class Carbon extends DateTime } /** - * Remove seconds from the instance + * Remove a second from the instance using timestamp. * * @param int $value * * @return static */ - public function subSeconds($value) + public function subRealSecond($value = 1) { - return $this->addSeconds(-1 * $value); + return $this->subRealSeconds($value); } /////////////////////////////////////////////////////////////////// /////////////////////////// DIFFERENCES /////////////////////////// /////////////////////////////////////////////////////////////////// + /** + * Get the difference as a CarbonInterval instance + * + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference + * + * @return CarbonInterval + */ + public function diffAsCarbonInterval($date = null, $absolute = true) + { + return CarbonInterval::instance($this->diff($this->resolveCarbon($date), $absolute)); + } + /** * Get the difference in years * - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInYears(Carbon $dt = null, $abs = true) + public function diffInYears($date = null, $absolute = true) { - $dt = $dt ?: static::now($this->getTimezone()); - - return (int) $this->diff($dt, $abs)->format('%r%y'); + return (int) $this->diff($this->resolveCarbon($date), $absolute)->format('%r%y'); } /** * Get the difference in months * - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInMonths(Carbon $dt = null, $abs = true) + public function diffInMonths($date = null, $absolute = true) { - $dt = $dt ?: static::now($this->getTimezone()); + $date = $this->resolveCarbon($date); - return $this->diffInYears($dt, $abs) * static::MONTHS_PER_YEAR + (int) $this->diff($dt, $abs)->format('%r%m'); + return $this->diffInYears($date, $absolute) * static::MONTHS_PER_YEAR + (int) $this->diff($date, $absolute)->format('%r%m'); } /** * Get the difference in weeks * - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInWeeks(Carbon $dt = null, $abs = true) + public function diffInWeeks($date = null, $absolute = true) { - return (int) ($this->diffInDays($dt, $abs) / static::DAYS_PER_WEEK); + return (int) ($this->diffInDays($date, $absolute) / static::DAYS_PER_WEEK); } /** * Get the difference in days * - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInDays(Carbon $dt = null, $abs = true) + public function diffInDays($date = null, $absolute = true) { - $dt = $dt ?: static::now($this->getTimezone()); - - return (int) $this->diff($dt, $abs)->format('%r%a'); + return (int) $this->diff($this->resolveCarbon($date), $absolute)->format('%r%a'); } /** * Get the difference in days using a filter closure * - * @param Closure $callback - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param Closure $callback + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInDaysFiltered(Closure $callback, Carbon $dt = null, $abs = true) + public function diffInDaysFiltered(Closure $callback, $date = null, $absolute = true) { - return $this->diffFiltered(CarbonInterval::day(), $callback, $dt, $abs); + return $this->diffFiltered(CarbonInterval::day(), $callback, $date, $absolute); } /** * Get the difference in hours using a filter closure * - * @param Closure $callback - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param Closure $callback + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInHoursFiltered(Closure $callback, Carbon $dt = null, $abs = true) + public function diffInHoursFiltered(Closure $callback, $date = null, $absolute = true) { - return $this->diffFiltered(CarbonInterval::hour(), $callback, $dt, $abs); + return $this->diffFiltered(CarbonInterval::hour(), $callback, $date, $absolute); } /** * Get the difference by the given interval using a filter closure * - * @param CarbonInterval $ci An interval to traverse by - * @param Closure $callback - * @param Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param CarbonInterval $ci An interval to traverse by + * @param Closure $callback + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffFiltered(CarbonInterval $ci, Closure $callback, Carbon $dt = null, $abs = true) + public function diffFiltered(CarbonInterval $ci, Closure $callback, $date = null, $absolute = true) { $start = $this; - $end = $dt ?: static::now($this->getTimezone()); + $end = $this->resolveCarbon($date); $inverse = false; if ($end < $start) { @@ -2660,85 +3694,130 @@ class Carbon extends DateTime } $period = new DatePeriod($start, $ci, $end); - $vals = array_filter(iterator_to_array($period), function (DateTime $date) use ($callback) { + $values = array_filter(iterator_to_array($period), function ($date) use ($callback) { return call_user_func($callback, Carbon::instance($date)); }); - $diff = count($vals); + $diff = count($values); - return $inverse && !$abs ? -$diff : $diff; + return $inverse && !$absolute ? -$diff : $diff; } /** * Get the difference in weekdays * - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInWeekdays(Carbon $dt = null, $abs = true) + public function diffInWeekdays($date = null, $absolute = true) { return $this->diffInDaysFiltered(function (Carbon $date) { return $date->isWeekday(); - }, $dt, $abs); + }, $date, $absolute); } /** * Get the difference in weekend days using a filter * - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInWeekendDays(Carbon $dt = null, $abs = true) + public function diffInWeekendDays($date = null, $absolute = true) { return $this->diffInDaysFiltered(function (Carbon $date) { return $date->isWeekend(); - }, $dt, $abs); + }, $date, $absolute); } /** - * Get the difference in hours + * Get the difference in hours. * - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInHours(Carbon $dt = null, $abs = true) + public function diffInHours($date = null, $absolute = true) { - return (int) ($this->diffInSeconds($dt, $abs) / static::SECONDS_PER_MINUTE / static::MINUTES_PER_HOUR); + return (int) ($this->diffInSeconds($date, $absolute) / static::SECONDS_PER_MINUTE / static::MINUTES_PER_HOUR); } /** - * Get the difference in minutes + * Get the difference in hours using timestamps. * - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInMinutes(Carbon $dt = null, $abs = true) + public function diffInRealHours($date = null, $absolute = true) { - return (int) ($this->diffInSeconds($dt, $abs) / static::SECONDS_PER_MINUTE); + return (int) ($this->diffInRealSeconds($date, $absolute) / static::SECONDS_PER_MINUTE / static::MINUTES_PER_HOUR); } /** - * Get the difference in seconds + * Get the difference in minutes. * - * @param \Carbon\Carbon|null $dt - * @param bool $abs Get the absolute of the difference + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference * * @return int */ - public function diffInSeconds(Carbon $dt = null, $abs = true) + public function diffInMinutes($date = null, $absolute = true) { - $dt = $dt ?: static::now($this->getTimezone()); - $value = $dt->getTimestamp() - $this->getTimestamp(); + return (int) ($this->diffInSeconds($date, $absolute) / static::SECONDS_PER_MINUTE); + } - return $abs ? abs($value) : $value; + /** + * Get the difference in minutes using timestamps. + * + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference + * + * @return int + */ + public function diffInRealMinutes($date = null, $absolute = true) + { + return (int) ($this->diffInRealSeconds($date, $absolute) / static::SECONDS_PER_MINUTE); + } + + /** + * Get the difference in seconds. + * + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference + * + * @return int + */ + public function diffInSeconds($date = null, $absolute = true) + { + $diff = $this->diff($this->resolveCarbon($date)); + $value = $diff->days * static::HOURS_PER_DAY * static::MINUTES_PER_HOUR * static::SECONDS_PER_MINUTE + + $diff->h * static::MINUTES_PER_HOUR * static::SECONDS_PER_MINUTE + + $diff->i * static::SECONDS_PER_MINUTE + + $diff->s; + + return $absolute || !$diff->invert ? $value : -$value; + } + + /** + * Get the difference in seconds using timestamps. + * + * @param \Carbon\Carbon|\DateTimeInterface|string|null $date + * @param bool $absolute Get the absolute of the difference + * + * @return int + */ + public function diffInRealSeconds($date = null, $absolute = true) + { + $date = $this->resolveCarbon($date); + $value = $date->getTimestamp() - $this->getTimestamp(); + + return $absolute ? abs($value) : $value; } /** @@ -2752,7 +3831,7 @@ class Carbon extends DateTime } /** - * The number of seconds until 23:23:59. + * The number of seconds until 23:59:59. * * @return int */ @@ -2783,61 +3862,83 @@ class Carbon extends DateTime * @param Carbon|null $other * @param bool $absolute removes time difference modifiers ago, after, etc * @param bool $short displays short format of time units + * @param int $parts displays number of parts in the interval * * @return string */ - public function diffForHumans(Carbon $other = null, $absolute = false, $short = false) + public function diffForHumans($other = null, $absolute = false, $short = false, $parts = 1) { $isNow = $other === null; + $interval = array(); + + $parts = min(6, max(1, (int) $parts)); + $count = 1; + $unit = $short ? 's' : 'second'; if ($isNow) { - $other = static::now($this->getTimezone()); + $other = $this->nowWithSameTz(); + } elseif (!$other instanceof DateTime && !$other instanceof DateTimeInterface) { + $other = static::parse($other); } $diffInterval = $this->diff($other); - switch (true) { - case $diffInterval->y > 0: - $unit = $short ? 'y' : 'year'; - $count = $diffInterval->y; - break; + $diffIntervalArray = array( + array('value' => $diffInterval->y, 'unit' => 'year', 'unitShort' => 'y'), + array('value' => $diffInterval->m, 'unit' => 'month', 'unitShort' => 'm'), + array('value' => $diffInterval->d, 'unit' => 'day', 'unitShort' => 'd'), + array('value' => $diffInterval->h, 'unit' => 'hour', 'unitShort' => 'h'), + array('value' => $diffInterval->i, 'unit' => 'minute', 'unitShort' => 'min'), + array('value' => $diffInterval->s, 'unit' => 'second', 'unitShort' => 's'), + ); - case $diffInterval->m > 0: - $unit = $short ? 'm' : 'month'; - $count = $diffInterval->m; - break; + foreach ($diffIntervalArray as $diffIntervalData) { + if ($diffIntervalData['value'] > 0) { + $unit = $short ? $diffIntervalData['unitShort'] : $diffIntervalData['unit']; + $count = $diffIntervalData['value']; - case $diffInterval->d > 0: - $unit = $short ? 'd' : 'day'; - $count = $diffInterval->d; - - if ($count >= static::DAYS_PER_WEEK) { + if ($diffIntervalData['unit'] === 'day' && $count >= static::DAYS_PER_WEEK) { $unit = $short ? 'w' : 'week'; $count = (int) ($count / static::DAYS_PER_WEEK); + + $interval[] = static::translator()->transChoice($unit, $count, array(':count' => $count)); + + // get the count days excluding weeks (might be zero) + $numOfDaysCount = (int) ($diffIntervalData['value'] - ($count * static::DAYS_PER_WEEK)); + + if ($numOfDaysCount > 0 && count($interval) < $parts) { + $unit = $short ? 'd' : 'day'; + $count = $numOfDaysCount; + $interval[] = static::translator()->transChoice($unit, $count, array(':count' => $count)); + } + } else { + $interval[] = static::translator()->transChoice($unit, $count, array(':count' => $count)); } - break; + } - case $diffInterval->h > 0: - $unit = $short ? 'h' : 'hour'; - $count = $diffInterval->h; - break; - - case $diffInterval->i > 0: - $unit = $short ? 'min' : 'minute'; - $count = $diffInterval->i; - break; - - default: - $count = $diffInterval->s; - $unit = $short ? 's' : 'second'; + // break the loop after we get the required number of parts in array + if (count($interval) >= $parts) { break; + } } - if ($count === 0) { - $count = 1; + if (count($interval) === 0) { + if ($isNow && static::getHumanDiffOptions() & self::JUST_NOW) { + $key = 'diff_now'; + $translation = static::translator()->trans($key); + if ($translation !== $key) { + return $translation; + } + } + $count = static::getHumanDiffOptions() & self::NO_ZERO_DIFF ? 1 : 0; + $unit = $short ? 's' : 'second'; + $interval[] = static::translator()->transChoice($unit, $count, array(':count' => $count)); } - $time = static::translator()->transChoice($unit, $count, array(':count' => $count)); + // join the interval parts by a space + $time = implode(' ', $interval); + + unset($diffIntervalArray, $interval); if ($absolute) { return $time; @@ -2847,10 +3948,29 @@ class Carbon extends DateTime $transId = $isNow ? ($isFuture ? 'from_now' : 'ago') : ($isFuture ? 'after' : 'before'); - // Some langs have special pluralization for past and future tense. - $tryKeyExists = $unit.'_'.$transId; - if ($tryKeyExists !== static::translator()->transChoice($tryKeyExists, $count)) { - $time = static::translator()->transChoice($tryKeyExists, $count, array(':count' => $count)); + if ($parts === 1) { + if ($isNow && $unit === 'day') { + if ($count === 1 && static::getHumanDiffOptions() & self::ONE_DAY_WORDS) { + $key = $isFuture ? 'diff_tomorrow' : 'diff_yesterday'; + $translation = static::translator()->trans($key); + if ($translation !== $key) { + return $translation; + } + } + if ($count === 2 && static::getHumanDiffOptions() & self::TWO_DAY_WORDS) { + $key = $isFuture ? 'diff_after_tomorrow' : 'diff_before_yesterday'; + $translation = static::translator()->trans($key); + if ($translation !== $key) { + return $translation; + } + } + } + // Some langs have special pluralization for past and future tense. + $key = $unit.'_'.$transId; + $count = isset($count) ? $count : 1; + if ($key !== static::translator()->transChoice($key, $count)) { + $time = static::translator()->transChoice($key, $count, array(':count' => $count)); + } } return static::translator()->trans($transId, array(':time' => $time)); @@ -2861,23 +3981,23 @@ class Carbon extends DateTime /////////////////////////////////////////////////////////////////// /** - * Resets the time to 00:00:00 + * Resets the time to 00:00:00 start of day * * @return static */ public function startOfDay() { - return $this->setTime(0, 0, 0); + return $this->modify('00:00:00.000000'); } /** - * Resets the time to 23:59:59 + * Resets the time to 23:59:59 end of day * * @return static */ public function endOfDay() { - return $this->setTime(23, 59, 59); + return $this->modify('23.59.59.999999'); } /** @@ -2887,7 +4007,7 @@ class Carbon extends DateTime */ public function startOfMonth() { - return $this->setDateTime($this->year, $this->month, 1, 0, 0, 0); + return $this->setDate($this->year, $this->month, 1)->startOfDay(); } /** @@ -2897,7 +4017,7 @@ class Carbon extends DateTime */ public function endOfMonth() { - return $this->setDateTime($this->year, $this->month, $this->daysInMonth, 23, 59, 59); + return $this->setDate($this->year, $this->month, $this->daysInMonth)->endOfDay(); } /** @@ -2909,7 +4029,7 @@ class Carbon extends DateTime { $month = ($this->quarter - 1) * static::MONTHS_PER_QUARTER + 1; - return $this->setDateTime($this->year, $month, 1, 0, 0, 0); + return $this->setDate($this->year, $month, 1)->startOfDay(); } /** @@ -2929,7 +4049,7 @@ class Carbon extends DateTime */ public function startOfYear() { - return $this->setDateTime($this->year, 1, 1, 0, 0, 0); + return $this->setDate($this->year, 1, 1)->startOfDay(); } /** @@ -2939,7 +4059,7 @@ class Carbon extends DateTime */ public function endOfYear() { - return $this->setDateTime($this->year, 12, 31, 23, 59, 59); + return $this->setDate($this->year, 12, 31)->endOfDay(); } /** @@ -2951,7 +4071,7 @@ class Carbon extends DateTime { $year = $this->year - $this->year % static::YEARS_PER_DECADE; - return $this->setDateTime($year, 1, 1, 0, 0, 0); + return $this->setDate($year, 1, 1)->startOfDay(); } /** @@ -2963,7 +4083,7 @@ class Carbon extends DateTime { $year = $this->year - $this->year % static::YEARS_PER_DECADE + static::YEARS_PER_DECADE - 1; - return $this->setDateTime($year, 12, 31, 23, 59, 59); + return $this->setDate($year, 12, 31)->endOfDay(); } /** @@ -2975,7 +4095,7 @@ class Carbon extends DateTime { $year = $this->year - ($this->year - 1) % static::YEARS_PER_CENTURY; - return $this->setDateTime($year, 1, 1, 0, 0, 0); + return $this->setDate($year, 1, 1)->startOfDay(); } /** @@ -2987,7 +4107,7 @@ class Carbon extends DateTime { $year = $this->year - 1 - ($this->year - 1) % static::YEARS_PER_CENTURY + static::YEARS_PER_CENTURY; - return $this->setDateTime($year, 12, 31, 23, 59, 59); + return $this->setDate($year, 12, 31)->endOfDay(); } /** @@ -3018,6 +4138,56 @@ class Carbon extends DateTime return $this->endOfDay(); } + /** + * Modify to start of current hour, minutes and seconds become 0 + * + * @return static + */ + public function startOfHour() + { + return $this->setTime($this->hour, 0, 0); + } + + /** + * Modify to end of current hour, minutes and seconds become 59 + * + * @return static + */ + public function endOfHour() + { + return $this->setTime($this->hour, 59, 59); + } + + /** + * Modify to start of current minute, seconds become 0 + * + * @return static + */ + public function startOfMinute() + { + return $this->setTime($this->hour, $this->minute, 0); + } + + /** + * Modify to end of current minute, seconds become 59 + * + * @return static + */ + public function endOfMinute() + { + return $this->setTime($this->hour, $this->minute, 59); + } + + /** + * Modify to midday, default to self::$midDayAt + * + * @return static + */ + public function midDay() + { + return $this->setTime(self::$midDayAt, 0, 0); + } + /** * Modify to the next occurrence of a given day of the week. * If no dayOfWeek is provided, modify to the next occurrence @@ -3043,7 +4213,7 @@ class Carbon extends DateTime * @param bool $weekday * @param bool $forward * - * @return static + * @return $this */ private function nextOrPreviousDay($weekday = true, $forward = true) { @@ -3069,7 +4239,7 @@ class Carbon extends DateTime /** * Go backward to the previous weekday. * - * @return static + * @return $this */ public function previousWeekday() { @@ -3079,7 +4249,7 @@ class Carbon extends DateTime /** * Go forward to the next weekend day. * - * @return static + * @return $this */ public function nextWeekendDay() { @@ -3089,7 +4259,7 @@ class Carbon extends DateTime /** * Go backward to the previous weekend day. * - * @return static + * @return $this */ public function previousWeekendDay() { @@ -3170,11 +4340,11 @@ class Carbon extends DateTime */ public function nthOfMonth($nth, $dayOfWeek) { - $dt = $this->copy()->firstOfMonth(); - $check = $dt->format('Y-m'); - $dt->modify('+'.$nth.' '.static::$days[$dayOfWeek]); + $date = $this->copy()->firstOfMonth(); + $check = $date->format('Y-m'); + $date->modify('+'.$nth.' '.static::$days[$dayOfWeek]); - return $dt->format('Y-m') === $check ? $this->modify($dt) : false; + return $date->format('Y-m') === $check ? $this->modify($date) : false; } /** @@ -3183,7 +4353,7 @@ class Carbon extends DateTime * first day of the current quarter. Use the supplied constants * to indicate the desired dayOfWeek, ex. static::MONDAY. * - * @param int|null $dayOfWeek + * @param int|null $dayOfWeek day of the week default null * * @return static */ @@ -3198,7 +4368,7 @@ class Carbon extends DateTime * last day of the current quarter. Use the supplied constants * to indicate the desired dayOfWeek, ex. static::MONDAY. * - * @param int|null $dayOfWeek + * @param int|null $dayOfWeek day of the week default null * * @return static */ @@ -3220,12 +4390,12 @@ class Carbon extends DateTime */ public function nthOfQuarter($nth, $dayOfWeek) { - $dt = $this->copy()->day(1)->month($this->quarter * static::MONTHS_PER_QUARTER); - $lastMonth = $dt->month; - $year = $dt->year; - $dt->firstOfQuarter()->modify('+'.$nth.' '.static::$days[$dayOfWeek]); + $date = $this->copy()->day(1)->month($this->quarter * static::MONTHS_PER_QUARTER); + $lastMonth = $date->month; + $year = $date->year; + $date->firstOfQuarter()->modify('+'.$nth.' '.static::$days[$dayOfWeek]); - return ($lastMonth < $dt->month || $year !== $dt->year) ? false : $this->modify($dt); + return ($lastMonth < $date->month || $year !== $date->year) ? false : $this->modify($date); } /** @@ -3234,7 +4404,7 @@ class Carbon extends DateTime * first day of the current year. Use the supplied constants * to indicate the desired dayOfWeek, ex. static::MONDAY. * - * @param int|null $dayOfWeek + * @param int|null $dayOfWeek day of the week default null * * @return static */ @@ -3249,7 +4419,7 @@ class Carbon extends DateTime * last day of the current year. Use the supplied constants * to indicate the desired dayOfWeek, ex. static::MONDAY. * - * @param int|null $dayOfWeek + * @param int|null $dayOfWeek day of the week default null * * @return static */ @@ -3271,57 +4441,26 @@ class Carbon extends DateTime */ public function nthOfYear($nth, $dayOfWeek) { - $dt = $this->copy()->firstOfYear()->modify('+'.$nth.' '.static::$days[$dayOfWeek]); + $date = $this->copy()->firstOfYear()->modify('+'.$nth.' '.static::$days[$dayOfWeek]); - return $this->year === $dt->year ? $this->modify($dt) : false; + return $this->year === $date->year ? $this->modify($date) : false; } /** * Modify the current instance to the average of a given instance (default now) and the current instance. * - * @param \Carbon\Carbon|null $dt + * @param \Carbon\Carbon|\DateTimeInterface|null $date * * @return static */ - public function average(Carbon $dt = null) + public function average($date = null) { - $dt = $dt ?: static::now($this->getTimezone()); - - return $this->addSeconds((int) ($this->diffInSeconds($dt, false) / 2)); + return $this->addSeconds((int) ($this->diffInSeconds($this->resolveCarbon($date), false) / 2)); } - /** - * Check if its the birthday. Compares the date/month values of the two dates. - * - * @param \Carbon\Carbon|null $dt The instance to compare with or null to use current day. - * - * @return bool - */ - public function isBirthday(Carbon $dt = null) - { - return $this->isSameAs('md', $dt); - } - - /** - * Consider the timezone when modifying the instance. - * - * @param string $modify - * - * @return static - */ - public function modify($modify) - { - if ($this->local) { - return parent::modify($modify); - } - - $timezone = $this->getTimezone(); - $this->setTimezone('UTC'); - $instance = parent::modify($modify); - $this->setTimezone($timezone); - - return $instance; - } + /////////////////////////////////////////////////////////////////// + /////////////////////////// SERIALIZATION ///////////////////////// + /////////////////////////////////////////////////////////////////// /** * Return a serialized string of the instance. @@ -3334,7 +4473,7 @@ class Carbon extends DateTime } /** - * Create an instance form a serialized string. + * Create an instance from a serialized string. * * @param string $value * @@ -3352,4 +4491,155 @@ class Carbon extends DateTime return $instance; } + + /** + * The __set_state handler. + * + * @param array $array + * + * @return static + */ + public static function __set_state($array) + { + return static::instance(parent::__set_state($array)); + } + + /** + * Prepare the object for JSON serialization. + * + * @return array|string + */ + public function jsonSerialize() + { + if (static::$serializer) { + return call_user_func(static::$serializer, $this); + } + + $carbon = $this; + + return call_user_func(function () use ($carbon) { + return get_object_vars($carbon); + }); + } + + /** + * JSON serialize all Carbon instances using the given callback. + * + * @param callable $callback + * + * @return void + */ + public static function serializeUsing($callback) + { + static::$serializer = $callback; + } + + /////////////////////////////////////////////////////////////////// + /////////////////////////////// MACRO ///////////////////////////// + /////////////////////////////////////////////////////////////////// + + /** + * Register a custom macro. + * + * @param string $name + * @param object|callable $macro + * + * @return void + */ + public static function macro($name, $macro) + { + static::$localMacros[$name] = $macro; + } + + /** + * Mix another object into the class. + * + * @param object $mixin + * + * @return void + */ + public static function mixin($mixin) + { + $reflection = new \ReflectionClass($mixin); + $methods = $reflection->getMethods( + \ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED + ); + + foreach ($methods as $method) { + $method->setAccessible(true); + + static::macro($method->name, $method->invoke($mixin)); + } + } + + /** + * Checks if macro is registered. + * + * @param string $name + * + * @return bool + */ + public static function hasMacro($name) + { + return isset(static::$localMacros[$name]); + } + + /** + * Dynamically handle calls to the class. + * + * @param string $method + * @param array $parameters + * + * @throws \BadMethodCallException + * + * @return mixed + */ + public static function __callStatic($method, $parameters) + { + if (!static::hasMacro($method)) { + throw new \BadMethodCallException("Method $method does not exist."); + } + + if (static::$localMacros[$method] instanceof Closure && method_exists('Closure', 'bind')) { + return call_user_func_array(Closure::bind(static::$localMacros[$method], null, get_called_class()), $parameters); + } + + return call_user_func_array(static::$localMacros[$method], $parameters); + } + + /** + * Dynamically handle calls to the class. + * + * @param string $method + * @param array $parameters + * + * @throws \BadMethodCallException|\ReflectionException + * + * @return mixed + */ + public function __call($method, $parameters) + { + if (!static::hasMacro($method)) { + throw new \BadMethodCallException("Method $method does not exist."); + } + + $macro = static::$localMacros[$method]; + + $reflexion = new \ReflectionFunction($macro); + $reflectionParameters = $reflexion->getParameters(); + $expectedCount = count($reflectionParameters); + $actualCount = count($parameters); + if ($expectedCount > $actualCount && $reflectionParameters[$expectedCount - 1]->name === 'self') { + for ($i = $actualCount; $i < $expectedCount - 1; $i++) { + $parameters[] = $reflectionParameters[$i]->getDefaultValue(); + } + $parameters[] = $this; + } + + if ($macro instanceof Closure && method_exists($macro, 'bindTo')) { + return call_user_func_array($macro->bindTo($this, get_class($this)), $parameters); + } + + return call_user_func_array($macro, $parameters); + } } diff --git a/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php b/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php index 514ca6e8..ed64f030 100644 --- a/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php +++ b/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php @@ -11,10 +11,12 @@ namespace Carbon; +use Closure; use DateInterval; use InvalidArgumentException; -use Symfony\Component\Translation\Loader\ArrayLoader; -use Symfony\Component\Translation\Translator; +use ReflectionClass; +use ReflectionFunction; +use ReflectionMethod; use Symfony\Component\Translation\TranslatorInterface; /** @@ -31,6 +33,14 @@ use Symfony\Component\Translation\TranslatorInterface; * @property int $seconds Total seconds of the current interval. * @property-read int $dayzExcludeWeeks Total days remaining in the final week of the current instance (days % 7). * @property-read int $daysExcludeWeeks alias of dayzExcludeWeeks + * @property-read float $totalYears Number of years equivalent to the interval. + * @property-read float $totalMonths Number of months equivalent to the interval. + * @property-read float $totalWeeks Number of weeks equivalent to the interval. + * @property-read float $totalDays Number of days equivalent to the interval. + * @property-read float $totalDayz Alias for totalDays. + * @property-read float $totalHours Number of hours equivalent to the interval. + * @property-read float $totalMinutes Number of minutes equivalent to the interval. + * @property-read float $totalSeconds Number of seconds equivalent to the interval. * * @method static CarbonInterval years($years = 1) Create instance specifying a number of years. * @method static CarbonInterval year($years = 1) Alias for years() @@ -47,21 +57,21 @@ use Symfony\Component\Translation\TranslatorInterface; * @method static CarbonInterval minute($minutes = 1) Alias for minutes() * @method static CarbonInterval seconds($seconds = 1) Create instance specifying a number of seconds. * @method static CarbonInterval second($seconds = 1) Alias for seconds() - * @method CarbonInterval years() years($years = 1) Set the years portion of the current interval. - * @method CarbonInterval year() year($years = 1) Alias for years(). - * @method CarbonInterval months() months($months = 1) Set the months portion of the current interval. - * @method CarbonInterval month() month($months = 1) Alias for months(). - * @method CarbonInterval weeks() weeks($weeks = 1) Set the weeks portion of the current interval. Will overwrite dayz value. - * @method CarbonInterval week() week($weeks = 1) Alias for weeks(). - * @method CarbonInterval days() days($days = 1) Set the days portion of the current interval. - * @method CarbonInterval dayz() dayz($days = 1) Alias for days(). - * @method CarbonInterval day() day($days = 1) Alias for days(). - * @method CarbonInterval hours() hours($hours = 1) Set the hours portion of the current interval. - * @method CarbonInterval hour() hour($hours = 1) Alias for hours(). - * @method CarbonInterval minutes() minutes($minutes = 1) Set the minutes portion of the current interval. - * @method CarbonInterval minute() minute($minutes = 1) Alias for minutes(). - * @method CarbonInterval seconds() seconds($seconds = 1) Set the seconds portion of the current interval. - * @method CarbonInterval second() second($seconds = 1) Alias for seconds(). + * @method CarbonInterval years($years = 1) Set the years portion of the current interval. + * @method CarbonInterval year($years = 1) Alias for years(). + * @method CarbonInterval months($months = 1) Set the months portion of the current interval. + * @method CarbonInterval month($months = 1) Alias for months(). + * @method CarbonInterval weeks($weeks = 1) Set the weeks portion of the current interval. Will overwrite dayz value. + * @method CarbonInterval week($weeks = 1) Alias for weeks(). + * @method CarbonInterval days($days = 1) Set the days portion of the current interval. + * @method CarbonInterval dayz($days = 1) Alias for days(). + * @method CarbonInterval day($days = 1) Alias for days(). + * @method CarbonInterval hours($hours = 1) Set the hours portion of the current interval. + * @method CarbonInterval hour($hours = 1) Alias for hours(). + * @method CarbonInterval minutes($minutes = 1) Set the minutes portion of the current interval. + * @method CarbonInterval minute($minutes = 1) Alias for minutes(). + * @method CarbonInterval seconds($seconds = 1) Set the seconds portion of the current interval. + * @method CarbonInterval second($seconds = 1) Alias for seconds(). */ class CarbonInterval extends DateInterval { @@ -84,12 +94,77 @@ class CarbonInterval extends DateInterval */ protected static $translator; + /** + * @var array|null + */ + protected static $cascadeFactors; + + /** + * @var array|null + */ + private static $flipCascadeFactors; + + /** + * The registered macros. + * + * @var array + */ + protected static $macros = array(); + /** * Before PHP 5.4.20/5.5.4 instead of FALSE days will be set to -99999 when the interval instance - * was created by DateTime:diff(). + * was created by DateTime::diff(). */ const PHP_DAYS_FALSE = -99999; + /** + * Mapping of units and factors for cascading. + * + * Should only be modified by changing the factors or referenced constants. + * + * @return array + */ + public static function getCascadeFactors() + { + return static::$cascadeFactors ?: array( + 'minutes' => array(Carbon::SECONDS_PER_MINUTE, 'seconds'), + 'hours' => array(Carbon::MINUTES_PER_HOUR, 'minutes'), + 'dayz' => array(Carbon::HOURS_PER_DAY, 'hours'), + 'months' => array(Carbon::DAYS_PER_WEEK * Carbon::WEEKS_PER_MONTH, 'dayz'), + 'years' => array(Carbon::MONTHS_PER_YEAR, 'months'), + ); + } + + private static function standardizeUnit($unit) + { + $unit = rtrim($unit, 'sz').'s'; + + return $unit === 'days' ? 'dayz' : $unit; + } + + private static function getFlipCascadeFactors() + { + if (!self::$flipCascadeFactors) { + self::$flipCascadeFactors = array(); + foreach (static::getCascadeFactors() as $to => $tuple) { + list($factor, $from) = $tuple; + + self::$flipCascadeFactors[self::standardizeUnit($from)] = array(self::standardizeUnit($to), $factor); + } + } + + return self::$flipCascadeFactors; + } + + /** + * @param array $cascadeFactors + */ + public static function setCascadeFactors(array $cascadeFactors) + { + self::$flipCascadeFactors = null; + static::$cascadeFactors = $cascadeFactors; + } + /** * Determine if the interval was created via DateTime:diff() or not. * @@ -119,32 +194,99 @@ class CarbonInterval extends DateInterval */ public function __construct($years = 1, $months = null, $weeks = null, $days = null, $hours = null, $minutes = null, $seconds = null) { - $spec = static::PERIOD_PREFIX; + $spec = $years; - $spec .= $years > 0 ? $years.static::PERIOD_YEARS : ''; - $spec .= $months > 0 ? $months.static::PERIOD_MONTHS : ''; + if (!is_string($spec) || floatval($years) || preg_match('/^[0-9.]/', $years)) { + $spec = static::PERIOD_PREFIX; - $specDays = 0; - $specDays += $weeks > 0 ? $weeks * Carbon::DAYS_PER_WEEK : 0; - $specDays += $days > 0 ? $days : 0; + $spec .= $years > 0 ? $years.static::PERIOD_YEARS : ''; + $spec .= $months > 0 ? $months.static::PERIOD_MONTHS : ''; - $spec .= $specDays > 0 ? $specDays.static::PERIOD_DAYS : ''; + $specDays = 0; + $specDays += $weeks > 0 ? $weeks * static::getDaysPerWeek() : 0; + $specDays += $days > 0 ? $days : 0; - if ($hours > 0 || $minutes > 0 || $seconds > 0) { - $spec .= static::PERIOD_TIME_PREFIX; - $spec .= $hours > 0 ? $hours.static::PERIOD_HOURS : ''; - $spec .= $minutes > 0 ? $minutes.static::PERIOD_MINUTES : ''; - $spec .= $seconds > 0 ? $seconds.static::PERIOD_SECONDS : ''; - } + $spec .= $specDays > 0 ? $specDays.static::PERIOD_DAYS : ''; - if ($spec === static::PERIOD_PREFIX) { - // Allow the zero interval. - $spec .= '0'.static::PERIOD_YEARS; + if ($hours > 0 || $minutes > 0 || $seconds > 0) { + $spec .= static::PERIOD_TIME_PREFIX; + $spec .= $hours > 0 ? $hours.static::PERIOD_HOURS : ''; + $spec .= $minutes > 0 ? $minutes.static::PERIOD_MINUTES : ''; + $spec .= $seconds > 0 ? $seconds.static::PERIOD_SECONDS : ''; + } + + if ($spec === static::PERIOD_PREFIX) { + // Allow the zero interval. + $spec .= '0'.static::PERIOD_YEARS; + } } parent::__construct($spec); } + /** + * Returns the factor for a given source-to-target couple. + * + * @param string $source + * @param string $target + * + * @return int|null + */ + public static function getFactor($source, $target) + { + $source = self::standardizeUnit($source); + $target = self::standardizeUnit($target); + $factors = static::getFlipCascadeFactors(); + if (isset($factors[$source])) { + list($to, $factor) = $factors[$source]; + if ($to === $target) { + return $factor; + } + } + + return null; + } + + /** + * Returns current config for days per week. + * + * @return int + */ + public static function getDaysPerWeek() + { + return static::getFactor('dayz', 'weeks') ?: Carbon::DAYS_PER_WEEK; + } + + /** + * Returns current config for hours per day. + * + * @return int + */ + public static function getHoursPerDay() + { + return static::getFactor('hours', 'dayz') ?: Carbon::HOURS_PER_DAY; + } + + /** + * Returns current config for minutes per hour. + * + * @return int + */ + public static function getMinutesPerHours() + { + return static::getFactor('minutes', 'hours') ?: Carbon::MINUTES_PER_HOUR; + } + + /** + * Returns current config for seconds per minute. + * + * @return int + */ + public static function getSecondsPerMinutes() + { + return static::getFactor('seconds', 'minutes') ?: Carbon::SECONDS_PER_MINUTE; + } + /** * Create a new CarbonInterval instance from specific values. * This is an alias for the constructor that allows better fluent @@ -166,6 +308,19 @@ class CarbonInterval extends DateInterval return new static($years, $months, $weeks, $days, $hours, $minutes, $seconds); } + /** + * Get a copy of the instance. + * + * @return static + */ + public function copy() + { + $date = new static($this->spec()); + $date->invert = $this->invert; + + return $date; + } + /** * Provide static helpers to create instances. Allows CarbonInterval::years(3). * @@ -211,6 +366,123 @@ class CarbonInterval extends DateInterval case 'second': return new static(null, null, null, null, null, null, $arg); } + + if (static::hasMacro($name)) { + return call_user_func_array( + array(new static(0), $name), $args + ); + } + } + + /** + * Creates a CarbonInterval from string. + * + * Format: + * + * Suffix | Unit | Example | DateInterval expression + * -------|---------|---------|------------------------ + * y | years | 1y | P1Y + * mo | months | 3mo | P3M + * w | weeks | 2w | P2W + * d | days | 28d | P28D + * h | hours | 4h | PT4H + * m | minutes | 12m | PT12M + * s | seconds | 59s | PT59S + * + * e. g. `1w 3d 4h 32m 23s` is converted to 10 days 4 hours 32 minutes and 23 seconds. + * + * Special cases: + * - An empty string will return a zero interval + * - Fractions are allowed for weeks, days, hours and minutes and will be converted + * and rounded to the next smaller value (caution: 0.5w = 4d) + * + * @param string $intervalDefinition + * + * @return static + */ + public static function fromString($intervalDefinition) + { + if (empty($intervalDefinition)) { + return new static(0); + } + + $years = 0; + $months = 0; + $weeks = 0; + $days = 0; + $hours = 0; + $minutes = 0; + $seconds = 0; + + $pattern = '/(\d+(?:\.\d+)?)\h*([^\d\h]*)/i'; + preg_match_all($pattern, $intervalDefinition, $parts, PREG_SET_ORDER); + while ($match = array_shift($parts)) { + list($part, $value, $unit) = $match; + $intValue = intval($value); + $fraction = floatval($value) - $intValue; + switch (strtolower($unit)) { + case 'year': + case 'years': + case 'y': + $years += $intValue; + break; + + case 'month': + case 'months': + case 'mo': + $months += $intValue; + break; + + case 'week': + case 'weeks': + case 'w': + $weeks += $intValue; + if ($fraction) { + $parts[] = array(null, $fraction * static::getDaysPerWeek(), 'd'); + } + break; + + case 'day': + case 'days': + case 'd': + $days += $intValue; + if ($fraction) { + $parts[] = array(null, $fraction * static::getHoursPerDay(), 'h'); + } + break; + + case 'hour': + case 'hours': + case 'h': + $hours += $intValue; + if ($fraction) { + $parts[] = array(null, $fraction * static::getMinutesPerHours(), 'm'); + } + break; + + case 'minute': + case 'minutes': + case 'm': + $minutes += $intValue; + if ($fraction) { + $seconds += round($fraction * static::getSecondsPerMinutes()); + } + break; + + case 'second': + case 'seconds': + case 's': + $seconds += $intValue; + break; + + default: + throw new InvalidArgumentException( + sprintf('Invalid part %s in definition %s', $part, $intervalDefinition) + ); + } + } + + return new static($years, $months, $weeks, $days, $hours, $minutes, $seconds); } /** @@ -220,23 +492,45 @@ class CarbonInterval extends DateInterval * * @param DateInterval $di * - * @throws \InvalidArgumentException - * * @return static */ public static function instance(DateInterval $di) { - if (static::wasCreatedFromDiff($di)) { - throw new InvalidArgumentException('Can not instance a DateInterval object created from DateTime::diff().'); - } - - $instance = new static($di->y, $di->m, 0, $di->d, $di->h, $di->i, $di->s); + $instance = new static(static::getDateIntervalSpec($di)); $instance->invert = $di->invert; - $instance->days = $di->days; return $instance; } + /** + * Make a CarbonInterval instance from given variable if possible. + * + * Always return a new instance. Parse only strings and only these likely to be intervals (skip dates + * and recurrences). Throw an exception for invalid format, but otherwise return null. + * + * @param mixed $var + * + * @return static|null + */ + public static function make($var) + { + if ($var instanceof DateInterval) { + return static::instance($var); + } + + if (is_string($var)) { + $var = trim($var); + + if (substr($var, 0, 1) === 'P') { + return new static($var); + } + + if (preg_match('/^(?:\h*\d+(?:\.\d+)?\h*[a-z]+)+$/i', $var)) { + return static::fromString($var); + } + } + } + /////////////////////////////////////////////////////////////////// /////////////////////// LOCALIZATION ////////////////////////////// /////////////////////////////////////////////////////////////////// @@ -249,16 +543,14 @@ class CarbonInterval extends DateInterval protected static function translator() { if (static::$translator === null) { - static::$translator = new Translator('en'); - static::$translator->addLoader('array', new ArrayLoader()); - static::setLocale('en'); + static::$translator = Translator::get(); } return static::$translator; } /** - * Get the translator instance in use + * Get the translator instance in use. * * @return \Symfony\Component\Translation\TranslatorInterface */ @@ -268,7 +560,7 @@ class CarbonInterval extends DateInterval } /** - * Set the translator instance to use + * Set the translator instance to use. * * @param TranslatorInterface $translator */ @@ -278,7 +570,7 @@ class CarbonInterval extends DateInterval } /** - * Get the current translator locale + * Get the current translator locale. * * @return string */ @@ -288,16 +580,13 @@ class CarbonInterval extends DateInterval } /** - * Set the current translator locale + * Set the current translator locale. * * @param string $locale */ public static function setLocale($locale) { - static::translator()->setLocale($locale); - - // Ensure the locale has been loaded. - static::translator()->addResource('array', require __DIR__.'/Lang/'.$locale.'.php', $locale); + return static::translator()->setLocale($locale) !== false; } /////////////////////////////////////////////////////////////////// @@ -305,16 +594,20 @@ class CarbonInterval extends DateInterval /////////////////////////////////////////////////////////////////// /** - * Get a part of the CarbonInterval object + * Get a part of the CarbonInterval object. * * @param string $name * * @throws \InvalidArgumentException * - * @return int + * @return int|float */ public function __get($name) { + if (substr($name, 0, 5) === 'total') { + return $this->total(substr($name, 5)); + } + switch ($name) { case 'years': return $this->y; @@ -335,11 +628,11 @@ class CarbonInterval extends DateInterval return $this->s; case 'weeks': - return (int) floor($this->d / Carbon::DAYS_PER_WEEK); + return (int) floor($this->d / static::getDaysPerWeek()); case 'daysExcludeWeeks': case 'dayzExcludeWeeks': - return $this->d % Carbon::DAYS_PER_WEEK; + return $this->d % static::getDaysPerWeek(); default: throw new InvalidArgumentException(sprintf("Unknown getter '%s'", $name)); @@ -347,7 +640,7 @@ class CarbonInterval extends DateInterval } /** - * Set a part of the CarbonInterval object + * Set a part of the CarbonInterval object. * * @param string $name * @param int $val @@ -366,7 +659,7 @@ class CarbonInterval extends DateInterval break; case 'weeks': - $this->d = $val * Carbon::DAYS_PER_WEEK; + $this->d = $val * static::getDaysPerWeek(); break; case 'dayz': @@ -397,11 +690,94 @@ class CarbonInterval extends DateInterval */ public function weeksAndDays($weeks, $days) { - $this->dayz = ($weeks * Carbon::DAYS_PER_WEEK) + $days; + $this->dayz = ($weeks * static::getDaysPerWeek()) + $days; return $this; } + /** + * Register a custom macro. + * + * @param string $name + * @param object|callable $macro + * + * @return void + */ + public static function macro($name, $macro) + { + static::$macros[$name] = $macro; + } + + /** + * Register macros from a mixin object. + * + * @param object $mixin + * + * @throws \ReflectionException + * + * @return void + */ + public static function mixin($mixin) + { + $reflection = new ReflectionClass($mixin); + + $methods = $reflection->getMethods( + ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED + ); + + foreach ($methods as $method) { + $method->setAccessible(true); + + static::macro($method->name, $method->invoke($mixin)); + } + } + + /** + * Check if macro is registered. + * + * @param string $name + * + * @return bool + */ + public static function hasMacro($name) + { + return isset(static::$macros[$name]); + } + + /** + * Call given macro. + * + * @param string $name + * @param array $parameters + * + * @return mixed + */ + protected function callMacro($name, $parameters) + { + $macro = static::$macros[$name]; + + $reflection = new ReflectionFunction($macro); + + $reflectionParameters = $reflection->getParameters(); + + $expectedCount = count($reflectionParameters); + $actualCount = count($parameters); + + if ($expectedCount > $actualCount && $reflectionParameters[$expectedCount - 1]->name === 'self') { + for ($i = $actualCount; $i < $expectedCount - 1; $i++) { + $parameters[] = $reflectionParameters[$i]->getDefaultValue(); + } + + $parameters[] = $this; + } + + if ($macro instanceof Closure && method_exists($macro, 'bindTo')) { + $macro = $macro->bindTo($this, get_class($this)); + } + + return call_user_func_array($macro, $parameters); + } + /** * Allow fluent calls on the setters... CarbonInterval::years(3)->months(5)->day(). * @@ -415,6 +791,10 @@ class CarbonInterval extends DateInterval */ public function __call($name, $args) { + if (static::hasMacro($name)) { + return $this->callMacro($name, $args); + } + $arg = count($args) === 0 ? 1 : $args[0]; switch ($name) { @@ -430,7 +810,7 @@ class CarbonInterval extends DateInterval case 'weeks': case 'week': - $this->dayz = $arg * Carbon::DAYS_PER_WEEK; + $this->dayz = $arg * static::getDaysPerWeek(); break; case 'days': @@ -461,24 +841,27 @@ class CarbonInterval extends DateInterval /** * Get the current interval in a human readable format in the current locale. * + * @param bool $short (false by default), returns short units if true + * * @return string */ - public function forHumans() + public function forHumans($short = false) { $periods = array( - 'year' => $this->years, - 'month' => $this->months, - 'week' => $this->weeks, - 'day' => $this->daysExcludeWeeks, - 'hour' => $this->hours, - 'minute' => $this->minutes, - 'second' => $this->seconds, + 'year' => array('y', $this->years), + 'month' => array('m', $this->months), + 'week' => array('w', $this->weeks), + 'day' => array('d', $this->daysExcludeWeeks), + 'hour' => array('h', $this->hours), + 'minute' => array('min', $this->minutes), + 'second' => array('s', $this->seconds), ); $parts = array(); - foreach ($periods as $unit => $count) { + foreach ($periods as $unit => $options) { + list($shortUnit, $count) = $options; if ($count > 0) { - array_push($parts, static::translator()->transChoice($unit, $count, array(':count' => $count))); + $parts[] = static::translator()->transChoice($short ? $shortUnit : $unit, $count, array(':count' => $count)); } } @@ -496,7 +879,31 @@ class CarbonInterval extends DateInterval } /** - * Add the passed interval to the current instance + * Convert the interval to a CarbonPeriod. + * + * @return CarbonPeriod + */ + public function toPeriod() + { + return CarbonPeriod::createFromArray( + array_merge(array($this), func_get_args()) + ); + } + + /** + * Invert the interval. + * + * @return $this + */ + public function invert() + { + $this->invert = $this->invert ? 0 : 1; + + return $this; + } + + /** + * Add the passed interval to the current instance. * * @param DateInterval $interval * @@ -521,22 +928,48 @@ class CarbonInterval extends DateInterval } /** - * Get the interval_spec string + * Multiply current instance given number of times + * + * @param float $factor + * + * @return $this + */ + public function times($factor) + { + if ($factor < 0) { + $this->invert = $this->invert ? 0 : 1; + $factor = -$factor; + } + + $this->years = round($this->years * $factor); + $this->months = round($this->months * $factor); + $this->dayz = round($this->dayz * $factor); + $this->hours = round($this->hours * $factor); + $this->minutes = round($this->minutes * $factor); + $this->seconds = round($this->seconds * $factor); + + return $this; + } + + /** + * Get the interval_spec string of a date interval. + * + * @param DateInterval $interval * * @return string */ - public function spec() + public static function getDateIntervalSpec(DateInterval $interval) { $date = array_filter(array( - static::PERIOD_YEARS => $this->y, - static::PERIOD_MONTHS => $this->m, - static::PERIOD_DAYS => $this->d, + static::PERIOD_YEARS => $interval->y, + static::PERIOD_MONTHS => $interval->m, + static::PERIOD_DAYS => $interval->d, )); $time = array_filter(array( - static::PERIOD_HOURS => $this->h, - static::PERIOD_MINUTES => $this->i, - static::PERIOD_SECONDS => $this->s, + static::PERIOD_HOURS => $interval->h, + static::PERIOD_MINUTES => $interval->i, + static::PERIOD_SECONDS => $interval->s, )); $specString = static::PERIOD_PREFIX; @@ -554,4 +987,144 @@ class CarbonInterval extends DateInterval return $specString === static::PERIOD_PREFIX ? 'PT0S' : $specString; } + + /** + * Get the interval_spec string. + * + * @return string + */ + public function spec() + { + return static::getDateIntervalSpec($this); + } + + /** + * Comparing 2 date intervals. + * + * @param DateInterval $a + * @param DateInterval $b + * + * @return int + */ + public static function compareDateIntervals(DateInterval $a, DateInterval $b) + { + $current = Carbon::now(); + $passed = $current->copy()->add($b); + $current->add($a); + + if ($current < $passed) { + return -1; + } + if ($current > $passed) { + return 1; + } + + return 0; + } + + /** + * Comparing with passed interval. + * + * @param DateInterval $interval + * + * @return int + */ + public function compare(DateInterval $interval) + { + return static::compareDateIntervals($this, $interval); + } + + /** + * Convert overflowed values into bigger units. + * + * @return $this + */ + public function cascade() + { + foreach (static::getFlipCascadeFactors() as $source => $cascade) { + list($target, $factor) = $cascade; + + if ($source === 'dayz' && $target === 'weeks') { + continue; + } + + $value = $this->$source; + $this->$source = $modulo = $value % $factor; + $this->$target += ($value - $modulo) / $factor; + } + + return $this; + } + + /** + * Get amount of given unit equivalent to the interval. + * + * @param string $unit + * + * @throws \InvalidArgumentException + * + * @return float + */ + public function total($unit) + { + $realUnit = $unit = strtolower($unit); + + if (in_array($unit, array('days', 'weeks'))) { + $realUnit = 'dayz'; + } elseif (!in_array($unit, array('seconds', 'minutes', 'hours', 'dayz', 'months', 'years'))) { + throw new InvalidArgumentException("Unknown unit '$unit'."); + } + + $result = 0; + $cumulativeFactor = 0; + $unitFound = false; + + foreach (static::getFlipCascadeFactors() as $source => $cascade) { + list($target, $factor) = $cascade; + + if ($source === $realUnit) { + $unitFound = true; + $result += $this->$source; + $cumulativeFactor = 1; + } + + if ($factor === false) { + if ($unitFound) { + break; + } + + $result = 0; + $cumulativeFactor = 0; + + continue; + } + + if ($target === $realUnit) { + $unitFound = true; + } + + if ($cumulativeFactor) { + $cumulativeFactor *= $factor; + $result += $this->$target * $cumulativeFactor; + + continue; + } + + $result = ($result + $this->$source) / $factor; + } + + if (isset($target) && !$cumulativeFactor) { + $result += $this->$target; + } + + if (!$unitFound) { + throw new \InvalidArgumentException("Unit $unit have no configuration to get total from other units."); + } + + if ($unit === 'weeks') { + return $result / static::getDaysPerWeek(); + } + + return $result; + } } diff --git a/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php b/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php new file mode 100644 index 00000000..2adf1404 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php @@ -0,0 +1,1429 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Carbon; + +use BadMethodCallException; +use Closure; +use Countable; +use DateInterval; +use DateTime; +use DateTimeInterface; +use InvalidArgumentException; +use Iterator; +use ReflectionClass; +use ReflectionFunction; +use ReflectionMethod; +use RuntimeException; + +/** + * Substitution of DatePeriod with some modifications and many more features. + * Fully compatible with PHP 5.3+! + * + * @method static CarbonPeriod start($date, $inclusive = null) Create instance specifying start date. + * @method static CarbonPeriod since($date, $inclusive = null) Alias for start(). + * @method static CarbonPeriod sinceNow($inclusive = null) Create instance with start date set to now. + * @method static CarbonPeriod end($date = null, $inclusive = null) Create instance specifying end date. + * @method static CarbonPeriod until($date = null, $inclusive = null) Alias for end(). + * @method static CarbonPeriod untilNow($inclusive = null) Create instance with end date set to now. + * @method static CarbonPeriod dates($start, $end = null) Create instance with start and end date. + * @method static CarbonPeriod between($start, $end = null) Create instance with start and end date. + * @method static CarbonPeriod recurrences($recurrences = null) Create instance with maximum number of recurrences. + * @method static CarbonPeriod times($recurrences = null) Alias for recurrences(). + * @method static CarbonPeriod options($options = null) Create instance with options. + * @method static CarbonPeriod toggle($options, $state = null) Create instance with options toggled on or off. + * @method static CarbonPeriod filter($callback, $name = null) Create instance with filter added to the stack. + * @method static CarbonPeriod push($callback, $name = null) Alias for filter(). + * @method static CarbonPeriod prepend($callback, $name = null) Create instance with filter prepened to the stack. + * @method static CarbonPeriod filters(array $filters) Create instance with filters stack. + * @method static CarbonPeriod interval($interval) Create instance with given date interval. + * @method static CarbonPeriod each($interval) Create instance with given date interval. + * @method static CarbonPeriod every($interval) Create instance with given date interval. + * @method static CarbonPeriod step($interval) Create instance with given date interval. + * @method static CarbonPeriod stepBy($interval) Create instance with given date interval. + * @method static CarbonPeriod invert() Create instance with inverted date interval. + * @method static CarbonPeriod years($years = 1) Create instance specifying a number of years for date interval. + * @method static CarbonPeriod year($years = 1) Alias for years(). + * @method static CarbonPeriod months($months = 1) Create instance specifying a number of months for date interval. + * @method static CarbonPeriod month($months = 1) Alias for months(). + * @method static CarbonPeriod weeks($weeks = 1) Create instance specifying a number of weeks for date interval. + * @method static CarbonPeriod week($weeks = 1) Alias for weeks(). + * @method static CarbonPeriod days($days = 1) Create instance specifying a number of days for date interval. + * @method static CarbonPeriod dayz($days = 1) Alias for days(). + * @method static CarbonPeriod day($days = 1) Alias for days(). + * @method static CarbonPeriod hours($hours = 1) Create instance specifying a number of hours for date interval. + * @method static CarbonPeriod hour($hours = 1) Alias for hours(). + * @method static CarbonPeriod minutes($minutes = 1) Create instance specifying a number of minutes for date interval. + * @method static CarbonPeriod minute($minutes = 1) Alias for minutes(). + * @method static CarbonPeriod seconds($seconds = 1) Create instance specifying a number of seconds for date interval. + * @method static CarbonPeriod second($seconds = 1) Alias for seconds(). + * @method CarbonPeriod start($date, $inclusive = null) Change the period start date. + * @method CarbonPeriod since($date, $inclusive = null) Alias for start(). + * @method CarbonPeriod sinceNow($inclusive = null) Change the period start date to now. + * @method CarbonPeriod end($date = null, $inclusive = null) Change the period end date. + * @method CarbonPeriod until($date = null, $inclusive = null) Alias for end(). + * @method CarbonPeriod untilNow($inclusive = null) Change the period end date to now. + * @method CarbonPeriod dates($start, $end = null) Change the period start and end date. + * @method CarbonPeriod recurrences($recurrences = null) Change the maximum number of recurrences. + * @method CarbonPeriod times($recurrences = null) Alias for recurrences(). + * @method CarbonPeriod options($options = null) Change the period options. + * @method CarbonPeriod toggle($options, $state = null) Toggle given options on or off. + * @method CarbonPeriod filter($callback, $name = null) Add a filter to the stack. + * @method CarbonPeriod push($callback, $name = null) Alias for filter(). + * @method CarbonPeriod prepend($callback, $name = null) Prepend a filter to the stack. + * @method CarbonPeriod filters(array $filters = array()) Set filters stack. + * @method CarbonPeriod interval($interval) Change the period date interval. + * @method CarbonPeriod invert() Invert the period date interval. + * @method CarbonPeriod years($years = 1) Set the years portion of the date interval. + * @method CarbonPeriod year($years = 1) Alias for years(). + * @method CarbonPeriod months($months = 1) Set the months portion of the date interval. + * @method CarbonPeriod month($months = 1) Alias for months(). + * @method CarbonPeriod weeks($weeks = 1) Set the weeks portion of the date interval. + * @method CarbonPeriod week($weeks = 1) Alias for weeks(). + * @method CarbonPeriod days($days = 1) Set the days portion of the date interval. + * @method CarbonPeriod dayz($days = 1) Alias for days(). + * @method CarbonPeriod day($days = 1) Alias for days(). + * @method CarbonPeriod hours($hours = 1) Set the hours portion of the date interval. + * @method CarbonPeriod hour($hours = 1) Alias for hours(). + * @method CarbonPeriod minutes($minutes = 1) Set the minutes portion of the date interval. + * @method CarbonPeriod minute($minutes = 1) Alias for minutes(). + * @method CarbonPeriod seconds($seconds = 1) Set the seconds portion of the date interval. + * @method CarbonPeriod second($seconds = 1) Alias for seconds(). + */ +class CarbonPeriod implements Iterator, Countable +{ + /** + * Built-in filters. + * + * @var string + */ + const RECURRENCES_FILTER = 'Carbon\CarbonPeriod::filterRecurrences'; + const END_DATE_FILTER = 'Carbon\CarbonPeriod::filterEndDate'; + + /** + * Special value which can be returned by filters to end iteration. Also a filter. + * + * @var string + */ + const END_ITERATION = 'Carbon\CarbonPeriod::endIteration'; + + /** + * Available options. + * + * @var int + */ + const EXCLUDE_START_DATE = 1; + const EXCLUDE_END_DATE = 2; + + /** + * Number of maximum attempts before giving up on finding next valid date. + * + * @var int + */ + const NEXT_MAX_ATTEMPTS = 1000; + + /** + * The registered macros. + * + * @var array + */ + protected static $macros = array(); + + /** + * Underlying date interval instance. Always present, one day by default. + * + * @var CarbonInterval + */ + protected $dateInterval; + + /** + * Whether current date interval was set by default. + * + * @var bool + */ + protected $isDefaultInterval; + + /** + * The filters stack. + * + * @var array + */ + protected $filters = array(); + + /** + * Period start date. Applied on rewind. Always present, now by default. + * + * @var Carbon + */ + protected $startDate; + + /** + * Period end date. For inverted interval should be before the start date. Applied via a filter. + * + * @var Carbon|null + */ + protected $endDate; + + /** + * Limit for number of recurrences. Applied via a filter. + * + * @var int|null + */ + protected $recurrences; + + /** + * Iteration options. + * + * @var int + */ + protected $options; + + /** + * Index of current date. Always sequential, even if some dates are skipped by filters. + * Equal to null only before the first iteration. + * + * @var int + */ + protected $key; + + /** + * Current date. May temporarily hold unaccepted value when looking for a next valid date. + * Equal to null only before the first iteration. + * + * @var Carbon + */ + protected $current; + + /** + * Timezone of current date. Taken from the start date. + * + * @var \DateTimeZone|null + */ + protected $timezone; + + /** + * The cached validation result for current date. + * + * @var bool|static::END_ITERATION + */ + protected $validationResult; + + /** + * Create a new instance. + * + * @return static + */ + public static function create() + { + return static::createFromArray(func_get_args()); + } + + /** + * Create a new instance from an array of parameters. + * + * @param array $params + * + * @return static + */ + public static function createFromArray(array $params) + { + // PHP 5.3 equivalent of new static(...$params). + $reflection = new ReflectionClass(get_class()); + + return $reflection->newInstanceArgs($params); + } + + /** + * Create CarbonPeriod from ISO 8601 string. + * + * @param string $iso + * @param int|null $options + * + * @return static + */ + public static function createFromIso($iso, $options = null) + { + $params = static::parseIso8601($iso); + + $instance = static::createFromArray($params); + + if ($options !== null) { + $instance->setOptions($options); + } + + return $instance; + } + + /** + * Return whether given interval contains non zero value of any time unit. + * + * @param \DateInterval $interval + * + * @return bool + */ + protected static function intervalHasTime(DateInterval $interval) + { + // The array_key_exists and get_object_vars are used as a workaround to check microsecond support. + // Both isset and property_exists will fail on PHP 7.0.14 - 7.0.21 due to the following bug: + // https://bugs.php.net/bug.php?id=74852 + return $interval->h || $interval->i || $interval->s || array_key_exists('f', get_object_vars($interval)) && $interval->f; + } + + /** + * Return whether given callable is a string pointing to one of Carbon's is* methods + * and should be automatically converted to a filter callback. + * + * @param callable $callable + * + * @return bool + */ + protected static function isCarbonPredicateMethod($callable) + { + return is_string($callable) && substr($callable, 0, 2) === 'is' && (method_exists('Carbon\Carbon', $callable) || Carbon::hasMacro($callable)); + } + + /** + * Return whether given variable is an ISO 8601 specification. + * + * Note: Check is very basic, as actual validation will be done later when parsing. + * We just want to ensure that variable is not any other type of a valid parameter. + * + * @param mixed $var + * + * @return bool + */ + protected static function isIso8601($var) + { + if (!is_string($var)) { + return false; + } + + // Match slash but not within a timezone name. + $part = '[a-z]+(?:[_-][a-z]+)*'; + + preg_match("#\b$part/$part\b|(/)#i", $var, $match); + + return isset($match[1]); + } + + /** + * Parse given ISO 8601 string into an array of arguments. + * + * @param string $iso + * + * @return array + */ + protected static function parseIso8601($iso) + { + $result = array(); + + $interval = null; + $start = null; + $end = null; + + foreach (explode('/', $iso) as $key => $part) { + if ($key === 0 && preg_match('/^R([0-9]*)$/', $part, $match)) { + $parsed = strlen($match[1]) ? (int) $match[1] : null; + } elseif ($interval === null && $parsed = CarbonInterval::make($part)) { + $interval = $part; + } elseif ($start === null && $parsed = Carbon::make($part)) { + $start = $part; + } elseif ($end === null && $parsed = Carbon::make(static::addMissingParts($start, $part))) { + $end = $part; + } else { + throw new InvalidArgumentException("Invalid ISO 8601 specification: $iso."); + } + + $result[] = $parsed; + } + + return $result; + } + + /** + * Add missing parts of the target date from the soure date. + * + * @param string $source + * @param string $target + * + * @return string + */ + protected static function addMissingParts($source, $target) + { + $pattern = '/'.preg_replace('/[0-9]+/', '[0-9]+', preg_quote($target, '/')).'$/'; + + $result = preg_replace($pattern, $target, $source, 1, $count); + + return $count ? $result : $target; + } + + /** + * Register a custom macro. + * + * @param string $name + * @param object|callable $macro + * + * @return void + */ + public static function macro($name, $macro) + { + static::$macros[$name] = $macro; + } + + /** + * Register macros from a mixin object. + * + * @param object $mixin + * + * @throws \ReflectionException + * + * @return void + */ + public static function mixin($mixin) + { + $reflection = new ReflectionClass($mixin); + + $methods = $reflection->getMethods( + ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED + ); + + foreach ($methods as $method) { + $method->setAccessible(true); + + static::macro($method->name, $method->invoke($mixin)); + } + } + + /** + * Check if macro is registered. + * + * @param string $name + * + * @return bool + */ + public static function hasMacro($name) + { + return isset(static::$macros[$name]); + } + + /** + * Provide static proxy for instance aliases. + * + * @param string $method + * @param array $parameters + * + * @return mixed + */ + public static function __callStatic($method, $parameters) + { + return call_user_func_array( + array(new static, $method), $parameters + ); + } + + /** + * CarbonPeriod constructor. + * + * @throws InvalidArgumentException + */ + public function __construct() + { + // Parse and assign arguments one by one. First argument may be an ISO 8601 spec, + // which will be first parsed into parts and then processed the same way. + $arguments = func_get_args(); + + if (count($arguments) && static::isIso8601($iso = $arguments[0])) { + array_splice($arguments, 0, 1, static::parseIso8601($iso)); + } + + foreach ($arguments as $argument) { + if ($this->dateInterval === null && $parsed = CarbonInterval::make($argument)) { + $this->setDateInterval($parsed); + } elseif ($this->startDate === null && $parsed = Carbon::make($argument)) { + $this->setStartDate($parsed); + } elseif ($this->endDate === null && $parsed = Carbon::make($argument)) { + $this->setEndDate($parsed); + } elseif ($this->recurrences === null && $this->endDate === null && is_numeric($argument)) { + $this->setRecurrences($argument); + } elseif ($this->options === null && (is_int($argument) || $argument === null)) { + $this->setOptions($argument); + } else { + throw new InvalidArgumentException('Invalid constructor parameters.'); + } + } + + if ($this->startDate === null) { + $this->setStartDate(Carbon::now()); + } + + if ($this->dateInterval === null) { + $this->setDateInterval(CarbonInterval::day()); + + $this->isDefaultInterval = true; + } + + if ($this->options === null) { + $this->setOptions(0); + } + } + + /** + * Change the period date interval. + * + * @param DateInterval|string $interval + * + * @throws \InvalidArgumentException + * + * @return $this + */ + public function setDateInterval($interval) + { + if (!$interval = CarbonInterval::make($interval)) { + throw new InvalidArgumentException('Invalid interval.'); + } + + if ($interval->spec() === 'PT0S') { + throw new InvalidArgumentException('Empty interval is not accepted.'); + } + + $this->dateInterval = $interval; + + $this->isDefaultInterval = false; + + $this->handleChangedParameters(); + + return $this; + } + + /** + * Invert the period date interval. + * + * @return $this + */ + public function invertDateInterval() + { + $interval = $this->dateInterval->invert(); + + return $this->setDateInterval($interval); + } + + /** + * Set start and end date. + * + * @param DateTime|DateTimeInterface|string $start + * @param DateTime|DateTimeInterface|string|null $end + * + * @return $this + */ + public function setDates($start, $end) + { + $this->setStartDate($start); + $this->setEndDate($end); + + return $this; + } + + /** + * Change the period options. + * + * @param int|null $options + * + * @throws \InvalidArgumentException + * + * @return $this + */ + public function setOptions($options) + { + if (!is_int($options) && !is_null($options)) { + throw new InvalidArgumentException('Invalid options.'); + } + + $this->options = $options ?: 0; + + $this->handleChangedParameters(); + + return $this; + } + + /** + * Get the period options. + * + * @return int + */ + public function getOptions() + { + return $this->options; + } + + /** + * Toggle given options on or off. + * + * @param int $options + * @param bool|null $state + * + * @throws \InvalidArgumentException + * + * @return $this + */ + public function toggleOptions($options, $state = null) + { + if ($state === null) { + $state = ($this->options & $options) !== $options; + } + + return $this->setOptions($state ? + $this->options | $options : + $this->options & ~$options + ); + } + + /** + * Toggle EXCLUDE_START_DATE option. + * + * @param bool $state + * + * @return $this + */ + public function excludeStartDate($state = true) + { + return $this->toggleOptions(static::EXCLUDE_START_DATE, $state); + } + + /** + * Toggle EXCLUDE_END_DATE option. + * + * @param bool $state + * + * @return $this + */ + public function excludeEndDate($state = true) + { + return $this->toggleOptions(static::EXCLUDE_END_DATE, $state); + } + + /** + * Get the underlying date interval. + * + * @return CarbonInterval + */ + public function getDateInterval() + { + return $this->dateInterval->copy(); + } + + /** + * Get start date of the period. + * + * @return Carbon + */ + public function getStartDate() + { + return $this->startDate->copy(); + } + + /** + * Get end date of the period. + * + * @return Carbon|null + */ + public function getEndDate() + { + if ($this->endDate) { + return $this->endDate->copy(); + } + } + + /** + * Get number of recurrences. + * + * @return int|null + */ + public function getRecurrences() + { + return $this->recurrences; + } + + /** + * Returns true if the start date should be excluded. + * + * @return bool + */ + public function isStartExcluded() + { + return ($this->options & static::EXCLUDE_START_DATE) !== 0; + } + + /** + * Returns true if the end date should be excluded. + * + * @return bool + */ + public function isEndExcluded() + { + return ($this->options & static::EXCLUDE_END_DATE) !== 0; + } + + /** + * Add a filter to the stack. + * + * @param callable $callback + * @param string $name + * + * @return $this + */ + public function addFilter($callback, $name = null) + { + $tuple = $this->createFilterTuple(func_get_args()); + + $this->filters[] = $tuple; + + $this->handleChangedParameters(); + + return $this; + } + + /** + * Prepend a filter to the stack. + * + * @param callable $callback + * @param string $name + * + * @return $this + */ + public function prependFilter($callback, $name = null) + { + $tuple = $this->createFilterTuple(func_get_args()); + + array_unshift($this->filters, $tuple); + + $this->handleChangedParameters(); + + return $this; + } + + /** + * Create a filter tuple from raw parameters. + * + * Will create an automatic filter callback for one of Carbon's is* methods. + * + * @param array $parameters + * + * @return array + */ + protected function createFilterTuple(array $parameters) + { + $method = array_shift($parameters); + + if (!$this->isCarbonPredicateMethod($method)) { + return array($method, array_shift($parameters)); + } + + return array(function ($date) use ($method, $parameters) { + return call_user_func_array(array($date, $method), $parameters); + }, $method); + } + + /** + * Remove a filter by instance or name. + * + * @param callable|string $filter + * + * @return $this + */ + public function removeFilter($filter) + { + $key = is_callable($filter) ? 0 : 1; + + $this->filters = array_values(array_filter( + $this->filters, + function ($tuple) use ($key, $filter) { + return $tuple[$key] !== $filter; + } + )); + + $this->updateInternalState(); + + $this->handleChangedParameters(); + + return $this; + } + + /** + * Return whether given instance or name is in the filter stack. + * + * @param callable|string $filter + * + * @return bool + */ + public function hasFilter($filter) + { + $key = is_callable($filter) ? 0 : 1; + + foreach ($this->filters as $tuple) { + if ($tuple[$key] === $filter) { + return true; + } + } + + return false; + } + + /** + * Get filters stack. + * + * @return array + */ + public function getFilters() + { + return $this->filters; + } + + /** + * Set filters stack. + * + * @param array $filters + * + * @return $this + */ + public function setFilters(array $filters) + { + $this->filters = $filters; + + $this->updateInternalState(); + + $this->handleChangedParameters(); + + return $this; + } + + /** + * Reset filters stack. + * + * @return $this + */ + public function resetFilters() + { + $this->filters = array(); + + if ($this->endDate !== null) { + $this->filters[] = array(static::END_DATE_FILTER, null); + } + + if ($this->recurrences !== null) { + $this->filters[] = array(static::RECURRENCES_FILTER, null); + } + + $this->handleChangedParameters(); + + return $this; + } + + /** + * Update properties after removing built-in filters. + * + * @return void + */ + protected function updateInternalState() + { + if (!$this->hasFilter(static::END_DATE_FILTER)) { + $this->endDate = null; + } + + if (!$this->hasFilter(static::RECURRENCES_FILTER)) { + $this->recurrences = null; + } + } + + /** + * Add a recurrences filter (set maximum number of recurrences). + * + * @param int|null $recurrences + * + * @throws \InvalidArgumentException + * + * @return $this + */ + public function setRecurrences($recurrences) + { + if (!is_numeric($recurrences) && !is_null($recurrences) || $recurrences < 0) { + throw new InvalidArgumentException('Invalid number of recurrences.'); + } + + if ($recurrences === null) { + return $this->removeFilter(static::RECURRENCES_FILTER); + } + + $this->recurrences = (int) $recurrences; + + if (!$this->hasFilter(static::RECURRENCES_FILTER)) { + return $this->addFilter(static::RECURRENCES_FILTER); + } + + $this->handleChangedParameters(); + + return $this; + } + + /** + * Recurrences filter callback (limits number of recurrences). + * + * @param \Carbon\Carbon $current + * @param int $key + * + * @return bool|static::END_ITERATION + */ + protected function filterRecurrences($current, $key) + { + if ($key < $this->recurrences) { + return true; + } + + return static::END_ITERATION; + } + + /** + * Change the period start date. + * + * @param DateTime|DateTimeInterface|string $date + * @param bool|null $inclusive + * + * @throws \InvalidArgumentException + * + * @return $this + */ + public function setStartDate($date, $inclusive = null) + { + if (!$date = Carbon::make($date)) { + throw new InvalidArgumentException('Invalid start date.'); + } + + $this->startDate = $date; + + if ($inclusive !== null) { + $this->toggleOptions(static::EXCLUDE_START_DATE, !$inclusive); + } + + return $this; + } + + /** + * Change the period end date. + * + * @param DateTime|DateTimeInterface|string|null $date + * @param bool|null $inclusive + * + * @throws \InvalidArgumentException + * + * @return $this + */ + public function setEndDate($date, $inclusive = null) + { + if (!is_null($date) && !$date = Carbon::make($date)) { + throw new InvalidArgumentException('Invalid end date.'); + } + + if (!$date) { + return $this->removeFilter(static::END_DATE_FILTER); + } + + $this->endDate = $date; + + if ($inclusive !== null) { + $this->toggleOptions(static::EXCLUDE_END_DATE, !$inclusive); + } + + if (!$this->hasFilter(static::END_DATE_FILTER)) { + return $this->addFilter(static::END_DATE_FILTER); + } + + $this->handleChangedParameters(); + + return $this; + } + + /** + * End date filter callback. + * + * @param \Carbon\Carbon $current + * + * @return bool|static::END_ITERATION + */ + protected function filterEndDate($current) + { + if (!$this->isEndExcluded() && $current == $this->endDate) { + return true; + } + + if ($this->dateInterval->invert ? $current > $this->endDate : $current < $this->endDate) { + return true; + } + + return static::END_ITERATION; + } + + /** + * End iteration filter callback. + * + * @return static::END_ITERATION + */ + protected function endIteration() + { + return static::END_ITERATION; + } + + /** + * Handle change of the parameters. + * + * @return void + */ + protected function handleChangedParameters() + { + $this->validationResult = null; + } + + /** + * Validate current date and stop iteration when necessary. + * + * Returns true when current date is valid, false if it is not, or static::END_ITERATION + * when iteration should be stopped. + * + * @return bool|static::END_ITERATION + */ + protected function validateCurrentDate() + { + if ($this->current === null) { + $this->rewind(); + } + + // Check after the first rewind to avoid repeating the initial validation. + if ($this->validationResult !== null) { + return $this->validationResult; + } + + return $this->validationResult = $this->checkFilters(); + } + + /** + * Check whether current value and key pass all the filters. + * + * @return bool|static::END_ITERATION + */ + protected function checkFilters() + { + $current = $this->prepareForReturn($this->current); + + foreach ($this->filters as $tuple) { + $result = call_user_func( + $tuple[0], $current->copy(), $this->key, $this + ); + + if ($result === static::END_ITERATION) { + return static::END_ITERATION; + } + + if (!$result) { + return false; + } + } + + return true; + } + + /** + * Prepare given date to be returned to the external logic. + * + * @param Carbon $date + * + * @return Carbon + */ + protected function prepareForReturn(Carbon $date) + { + $date = $date->copy(); + + if ($this->timezone) { + $date->setTimezone($this->timezone); + } + + return $date; + } + + /** + * Check if the current position is valid. + * + * @return bool + */ + public function valid() + { + return $this->validateCurrentDate() === true; + } + + /** + * Return the current key. + * + * @return int|null + */ + public function key() + { + if ($this->valid()) { + return $this->key; + } + } + + /** + * Return the current date. + * + * @return Carbon|null + */ + public function current() + { + if ($this->valid()) { + return $this->prepareForReturn($this->current); + } + } + + /** + * Move forward to the next date. + * + * @throws \RuntimeException + * + * @return void + */ + public function next() + { + if ($this->current === null) { + $this->rewind(); + } + + if ($this->validationResult !== static::END_ITERATION) { + $this->key++; + + $this->incrementCurrentDateUntilValid(); + } + } + + /** + * Rewind to the start date. + * + * Iterating over a date in the UTC timezone avoids bug during backward DST change. + * + * @see https://bugs.php.net/bug.php?id=72255 + * @see https://bugs.php.net/bug.php?id=74274 + * @see https://wiki.php.net/rfc/datetime_and_daylight_saving_time + * + * @throws \RuntimeException + * + * @return void + */ + public function rewind() + { + $this->key = 0; + $this->current = $this->startDate->copy(); + $this->timezone = static::intervalHasTime($this->dateInterval) ? $this->current->getTimezone() : null; + + if ($this->timezone) { + $this->current->setTimezone('UTC'); + } + + $this->validationResult = null; + + if ($this->isStartExcluded() || $this->validateCurrentDate() === false) { + $this->incrementCurrentDateUntilValid(); + } + } + + /** + * Keep incrementing the current date until a valid date is found or the iteration is ended. + * + * @throws \RuntimeException + * + * @return void + */ + protected function incrementCurrentDateUntilValid() + { + $attempts = 0; + + do { + $this->current->add($this->dateInterval); + + $this->validationResult = null; + + if (++$attempts > static::NEXT_MAX_ATTEMPTS) { + throw new RuntimeException('Could not find next valid date.'); + } + } while ($this->validateCurrentDate() === false); + } + + /** + * Format the date period as ISO 8601. + * + * @return string + */ + public function toIso8601String() + { + $parts = array(); + + if ($this->recurrences !== null) { + $parts[] = 'R'.$this->recurrences; + } + + $parts[] = $this->startDate->toIso8601String(); + + $parts[] = $this->dateInterval->spec(); + + if ($this->endDate !== null) { + $parts[] = $this->endDate->toIso8601String(); + } + + return implode('/', $parts); + } + + /** + * Convert the date period into a string. + * + * @return string + */ + public function toString() + { + $translator = Carbon::getTranslator(); + + $parts = array(); + + $format = !$this->startDate->isStartOfDay() || $this->endDate && !$this->endDate->isStartOfDay() + ? 'Y-m-d H:i:s' + : 'Y-m-d'; + + if ($this->recurrences !== null) { + $parts[] = $translator->transChoice('period_recurrences', $this->recurrences, array(':count' => $this->recurrences)); + } + + $parts[] = $translator->trans('period_interval', array(':interval' => $this->dateInterval->forHumans())); + + $parts[] = $translator->trans('period_start_date', array(':date' => $this->startDate->format($format))); + + if ($this->endDate !== null) { + $parts[] = $translator->trans('period_end_date', array(':date' => $this->endDate->format($format))); + } + + $result = implode(' ', $parts); + + return mb_strtoupper(mb_substr($result, 0, 1)).mb_substr($result, 1); + } + + /** + * Format the date period as ISO 8601. + * + * @return string + */ + public function spec() + { + return $this->toIso8601String(); + } + + /** + * Convert the date period into an array without changing current iteration state. + * + * @return array + */ + public function toArray() + { + $state = array( + $this->key, + $this->current ? $this->current->copy() : null, + $this->validationResult, + ); + + $result = iterator_to_array($this); + + list( + $this->key, + $this->current, + $this->validationResult + ) = $state; + + return $result; + } + + /** + * Count dates in the date period. + * + * @return int + */ + public function count() + { + return count($this->toArray()); + } + + /** + * Return the first date in the date period. + * + * @return Carbon|null + */ + public function first() + { + if ($array = $this->toArray()) { + return $array[0]; + } + } + + /** + * Return the last date in the date period. + * + * @return Carbon|null + */ + public function last() + { + if ($array = $this->toArray()) { + return $array[count($array) - 1]; + } + } + + /** + * Call given macro. + * + * @param string $name + * @param array $parameters + * + * @return mixed + */ + protected function callMacro($name, $parameters) + { + $macro = static::$macros[$name]; + + $reflection = new ReflectionFunction($macro); + + $reflectionParameters = $reflection->getParameters(); + + $expectedCount = count($reflectionParameters); + $actualCount = count($parameters); + + if ($expectedCount > $actualCount && $reflectionParameters[$expectedCount - 1]->name === 'self') { + for ($i = $actualCount; $i < $expectedCount - 1; $i++) { + $parameters[] = $reflectionParameters[$i]->getDefaultValue(); + } + + $parameters[] = $this; + } + + if ($macro instanceof Closure && method_exists($macro, 'bindTo')) { + $macro = $macro->bindTo($this, get_class($this)); + } + + return call_user_func_array($macro, $parameters); + } + + /** + * Convert the date period into a string. + * + * @return string + */ + public function __toString() + { + return $this->toString(); + } + + /** + * Add aliases for setters. + * + * CarbonPeriod::days(3)->hours(5)->invert() + * ->sinceNow()->until('2010-01-10') + * ->filter(...) + * ->count() + * + * Note: We use magic method to let static and instance aliases with the same names. + * + * @param string $method + * @param array $parameters + * + * @return mixed + */ + public function __call($method, $parameters) + { + if (static::hasMacro($method)) { + return $this->callMacro($method, $parameters); + } + + $first = count($parameters) >= 1 ? $parameters[0] : null; + $second = count($parameters) >= 2 ? $parameters[1] : null; + + switch ($method) { + case 'start': + case 'since': + return $this->setStartDate($first, $second); + + case 'sinceNow': + return $this->setStartDate(new Carbon, $first); + + case 'end': + case 'until': + return $this->setEndDate($first, $second); + + case 'untilNow': + return $this->setEndDate(new Carbon, $first); + + case 'dates': + case 'between': + return $this->setDates($first, $second); + + case 'recurrences': + case 'times': + return $this->setRecurrences($first); + + case 'options': + return $this->setOptions($first); + + case 'toggle': + return $this->toggleOptions($first, $second); + + case 'filter': + case 'push': + return $this->addFilter($first, $second); + + case 'prepend': + return $this->prependFilter($first, $second); + + case 'filters': + return $this->setFilters($first ?: array()); + + case 'interval': + case 'each': + case 'every': + case 'step': + case 'stepBy': + return $this->setDateInterval($first); + + case 'invert': + return $this->invertDateInterval(); + + case 'years': + case 'year': + case 'months': + case 'month': + case 'weeks': + case 'week': + case 'days': + case 'dayz': + case 'day': + case 'hours': + case 'hour': + case 'minutes': + case 'minute': + case 'seconds': + case 'second': + return $this->setDateInterval(call_user_func( + // Override default P1D when instantiating via fluent setters. + array($this->isDefaultInterval ? new CarbonInterval('PT0S') : $this->dateInterval, $method), + count($parameters) === 0 ? 1 : $first + )); + } + + throw new BadMethodCallException("Method $method does not exist."); + } +} diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/af.php b/vendor/nesbot/carbon/src/Carbon/Lang/af.php index a8610d6d..5cf6a8d9 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/af.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/af.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 jaar|:count jare', - 'y' => '1 jaar|:count jare', - 'month' => '1 maand|:count maande', - 'm' => '1 maand|:count maande', - 'week' => '1 week|:count weke', - 'w' => '1 week|:count weke', - 'day' => '1 dag|:count dae', - 'd' => '1 dag|:count dae', - 'hour' => '1 uur|:count ure', - 'h' => '1 uur|:count ure', - 'minute' => '1 minuut|:count minute', - 'min' => '1 minuut|:count minute', - 'second' => '1 sekond|:count sekondes', - 's' => '1 sekond|:count sekondes', + 'year' => ':count jaar|:count jare', + 'y' => ':count jaar|:count jare', + 'month' => ':count maand|:count maande', + 'm' => ':count maand|:count maande', + 'week' => ':count week|:count weke', + 'w' => ':count week|:count weke', + 'day' => ':count dag|:count dae', + 'd' => ':count dag|:count dae', + 'hour' => ':count uur|:count ure', + 'h' => ':count uur|:count ure', + 'minute' => ':count minuut|:count minute', + 'min' => ':count minuut|:count minute', + 'second' => ':count sekond|:count sekondes', + 's' => ':count sekond|:count sekondes', 'ago' => ':time terug', 'from_now' => ':time van nou af', 'after' => ':time na', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ar.php b/vendor/nesbot/carbon/src/Carbon/Lang/ar.php index 253cf503..de8f6b85 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/ar.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/ar.php @@ -14,8 +14,8 @@ return array( 'y' => '{0}سنة|{1}سنة|{2}سنتين|[3,10]:count سنوات|[11,Inf]:count سنة', 'month' => '{0}شهر|{1} شهر|{2}شهرين|[3,10]:count أشهر|[11,Inf]:count شهر', 'm' => '{0}شهر|{1} شهر|{2}شهرين|[3,10]:count أشهر|[11,Inf]:count شهر', - 'week' => '{0}إسبوع|{1}إسبوع|{2}إسبوعين|[3,10]:count أسابيع|[11,Inf]:count إسبوع', - 'w' => '{0}إسبوع|{1}إسبوع|{2}إسبوعين|[3,10]:count أسابيع|[11,Inf]:count إسبوع', + 'week' => '{0}أسبوع|{1}أسبوع|{2}أسبوعين|[3,10]:count أسابيع|[11,Inf]:count أسبوع', + 'w' => '{0}أسبوع|{1}أسبوع|{2}أسبوعين|[3,10]:count أسابيع|[11,Inf]:count أسبوع', 'day' => '{0}يوم|{1}يوم|{2}يومين|[3,10]:count أيام|[11,Inf] يوم', 'd' => '{0}يوم|{1}يوم|{2}يومين|[3,10]:count أيام|[11,Inf] يوم', 'hour' => '{0}ساعة|{1}ساعة|{2}ساعتين|[3,10]:count ساعات|[11,Inf]:count ساعة', @@ -25,7 +25,7 @@ return array( 'second' => '{0}ثانية|{1}ثانية|{2}ثانيتين|[3,10]:count ثوان|[11,Inf]:count ثانية', 's' => '{0}ثانية|{1}ثانية|{2}ثانيتين|[3,10]:count ثوان|[11,Inf]:count ثانية', 'ago' => 'منذ :time', - 'from_now' => 'من الآن :time', + 'from_now' => ':time من الآن', 'after' => 'بعد :time', 'before' => 'قبل :time', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php b/vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php new file mode 100644 index 00000000..846ae024 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => '[0,1] سَنَة|{2} سَنَتَيْن|[3,10]:count سَنَوَات|[11,Inf]:count سَنَة', + 'y' => '[0,1] سَنَة|{2} سَنَتَيْن|[3,10]:count سَنَوَات|[11,Inf]:count سَنَة', + 'month' => '[0,1] شَهْرَ|{2} شَهْرَيْن|[3,10]:count أَشْهُر|[11,Inf]:count شَهْرَ', + 'm' => '[0,1] شَهْرَ|{2} شَهْرَيْن|[3,10]:count أَشْهُر|[11,Inf]:count شَهْرَ', + 'week' => '[0,1] أُسْبُوع|{2} أُسْبُوعَيْن|[3,10]:count أَسَابِيع|[11,Inf]:count أُسْبُوع', + 'w' => '[0,1] أُسْبُوع|{2} أُسْبُوعَيْن|[3,10]:count أَسَابِيع|[11,Inf]:count أُسْبُوع', + 'day' => '[0,1] يَوْم|{2} يَوْمَيْن|[3,10]:count أَيَّام|[11,Inf] يَوْم', + 'd' => '[0,1] يَوْم|{2} يَوْمَيْن|[3,10]:count أَيَّام|[11,Inf] يَوْم', + 'hour' => '[0,1] سَاعَة|{2} سَاعَتَيْن|[3,10]:count سَاعَات|[11,Inf]:count سَاعَة', + 'h' => '[0,1] سَاعَة|{2} سَاعَتَيْن|[3,10]:count سَاعَات|[11,Inf]:count سَاعَة', + 'minute' => '[0,1] دَقِيقَة|{2} دَقِيقَتَيْن|[3,10]:count دَقَائِق|[11,Inf]:count دَقِيقَة', + 'min' => '[0,1] دَقِيقَة|{2} دَقِيقَتَيْن|[3,10]:count دَقَائِق|[11,Inf]:count دَقِيقَة', + 'second' => '[0,1] ثَانِيَة|{2} ثَانِيَتَيْن|[3,10]:count ثَوَان|[11,Inf]:count ثَانِيَة', + 's' => '[0,1] ثَانِيَة|{2} ثَانِيَتَيْن|[3,10]:count ثَوَان|[11,Inf]:count ثَانِيَة', + 'ago' => 'مُنْذُ :time', + 'from_now' => 'مِنَ الْآن :time', + 'after' => 'بَعْدَ :time', + 'before' => 'قَبْلَ :time', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/az.php b/vendor/nesbot/carbon/src/Carbon/Lang/az.php index e4f3789a..d567c63c 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/az.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/az.php @@ -24,8 +24,8 @@ return array( 'min' => ':count dəqiqə', 'second' => ':count saniyə', 's' => ':count saniyə', - 'ago' => ':time öncə', + 'ago' => ':time əvvəl', 'from_now' => ':time sonra', 'after' => ':time sonra', - 'before' => ':time öncə', + 'before' => ':time əvvəl', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/bg.php b/vendor/nesbot/carbon/src/Carbon/Lang/bg.php index 309934b5..d9e510be 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/bg.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/bg.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 година|:count години', - 'y' => '1 година|:count години', - 'month' => '1 месец|:count месеца', - 'm' => '1 месец|:count месеца', - 'week' => '1 седмица|:count седмици', - 'w' => '1 седмица|:count седмици', - 'day' => '1 ден|:count дни', - 'd' => '1 ден|:count дни', - 'hour' => '1 час|:count часа', - 'h' => '1 час|:count часа', - 'minute' => '1 минута|:count минути', - 'm' => '1 минута|:count минути', - 'second' => '1 секунда|:count секунди', - 's' => '1 секунда|:count секунди', + 'year' => ':count година|:count години', + 'y' => ':count година|:count години', + 'month' => ':count месец|:count месеца', + 'm' => ':count месец|:count месеца', + 'week' => ':count седмица|:count седмици', + 'w' => ':count седмица|:count седмици', + 'day' => ':count ден|:count дни', + 'd' => ':count ден|:count дни', + 'hour' => ':count час|:count часа', + 'h' => ':count час|:count часа', + 'minute' => ':count минута|:count минути', + 'min' => ':count минута|:count минути', + 'second' => ':count секунда|:count секунди', + 's' => ':count секунда|:count секунди', 'ago' => 'преди :time', 'from_now' => ':time от сега', 'after' => 'след :time', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/bs_BA.php b/vendor/nesbot/carbon/src/Carbon/Lang/bs_BA.php new file mode 100644 index 00000000..7a9b05aa --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/bs_BA.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => ':count godina|:count godine|:count godina', + 'y' => ':count godina|:count godine|:count godina', + 'month' => ':count mjesec|:count mjeseca|:count mjeseci', + 'm' => ':count mjesec|:count mjeseca|:count mjeseci', + 'week' => ':count nedjelja|:count nedjelje|:count nedjelja', + 'w' => ':count nedjelja|:count nedjelje|:count nedjelja', + 'day' => ':count dan|:count dana|:count dana', + 'd' => ':count dan|:count dana|:count dana', + 'hour' => ':count sat|:count sata|:count sati', + 'h' => ':count sat|:count sata|:count sati', + 'minute' => ':count minut|:count minuta|:count minuta', + 'min' => ':count minut|:count minuta|:count minuta', + 'second' => ':count sekund|:count sekunda|:count sekundi', + 's' => ':count sekund|:count sekunda|:count sekundi', + 'ago' => 'prije :time', + 'from_now' => 'za :time', + 'after' => 'nakon :time', + 'before' => ':time ranije', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ca.php b/vendor/nesbot/carbon/src/Carbon/Lang/ca.php index 91262e76..0a016700 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/ca.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/ca.php @@ -10,22 +10,27 @@ */ return array( - 'year' => '1 any|:count anys', - 'y' => '1 any|:count anys', - 'month' => '1 mes|:count mesos', - 'm' => '1 mes|:count mesos', - 'week' => '1 setmana|:count setmanes', - 'w' => '1 setmana|:count setmanes', - 'day' => '1 dia|:count dies', - 'd' => '1 dia|:count dies', - 'hour' => '1 hora|:count hores', - 'h' => '1 hora|:count hores', - 'minute' => '1 minut|:count minuts', - 'min' => '1 minut|:count minuts', - 'second' => '1 segon|:count segons', - 's' => '1 segon|:count segons', + 'year' => ':count any|:count anys', + 'y' => ':count any|:count anys', + 'month' => ':count mes|:count mesos', + 'm' => ':count mes|:count mesos', + 'week' => ':count setmana|:count setmanes', + 'w' => ':count setmana|:count setmanes', + 'day' => ':count dia|:count dies', + 'd' => ':count dia|:count dies', + 'hour' => ':count hora|:count hores', + 'h' => ':count hora|:count hores', + 'minute' => ':count minut|:count minuts', + 'min' => ':count minut|:count minuts', + 'second' => ':count segon|:count segons', + 's' => ':count segon|:count segons', 'ago' => 'fa :time', 'from_now' => 'dins de :time', 'after' => ':time després', 'before' => ':time abans', + 'diff_now' => 'ara mateix', + 'diff_yesterday' => 'ahir', + 'diff_tomorrow' => 'demà', + 'diff_before_yesterday' => "abans d'ahir", + 'diff_after_tomorrow' => 'demà passat', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/cs.php b/vendor/nesbot/carbon/src/Carbon/Lang/cs.php index f4aba76c..a447ce29 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/cs.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/cs.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 rok|:count roky|:count let', - 'y' => '1 rok|:count roky|:count let', - 'month' => '1 měsíc|:count měsíce|:count měsíců', - 'm' => '1 měsíc|:count měsíce|:count měsíců', - 'week' => '1 týden|:count týdny|:count týdnů', - 'w' => '1 týden|:count týdny|:count týdnů', - 'day' => '1 den|:count dny|:count dní', - 'd' => '1 den|:count dny|:count dní', - 'hour' => '1 hodinu|:count hodiny|:count hodin', - 'h' => '1 hodinu|:count hodiny|:count hodin', - 'minute' => '1 minutu|:count minuty|:count minut', - 'min' => '1 minutu|:count minuty|:count minut', - 'second' => '1 sekundu|:count sekundy|:count sekund', - 's' => '1 sekundu|:count sekundy|:count sekund', + 'year' => ':count rok|:count roky|:count let', + 'y' => ':count rok|:count roky|:count let', + 'month' => ':count měsíc|:count měsíce|:count měsíců', + 'm' => ':count měsíc|:count měsíce|:count měsíců', + 'week' => ':count týden|:count týdny|:count týdnů', + 'w' => ':count týden|:count týdny|:count týdnů', + 'day' => ':count den|:count dny|:count dní', + 'd' => ':count den|:count dny|:count dní', + 'hour' => ':count hodinu|:count hodiny|:count hodin', + 'h' => ':count hodinu|:count hodiny|:count hodin', + 'minute' => ':count minutu|:count minuty|:count minut', + 'min' => ':count minutu|:count minuty|:count minut', + 'second' => ':count sekundu|:count sekundy|:count sekund', + 's' => ':count sekundu|:count sekundy|:count sekund', 'ago' => ':time nazpět', 'from_now' => 'za :time', 'after' => ':time později', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/cy.php b/vendor/nesbot/carbon/src/Carbon/Lang/cy.php new file mode 100644 index 00000000..c93750e2 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/cy.php @@ -0,0 +1,29 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +return array( + 'year' => '1 flwyddyn|:count blynedd', + 'y' => ':countbl', + 'month' => '1 mis|:count fis', + 'm' => ':countmi', + 'week' => ':count wythnos', + 'w' => ':countw', + 'day' => ':count diwrnod', + 'd' => ':countd', + 'hour' => ':count awr', + 'h' => ':counth', + 'minute' => ':count munud', + 'min' => ':countm', + 'second' => ':count eiliad', + 's' => ':counts', + 'ago' => ':time yn ôl', + 'from_now' => ':time o hyn ymlaen', + 'after' => ':time ar ôl', + 'before' => ':time o\'r blaen', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/da.php b/vendor/nesbot/carbon/src/Carbon/Lang/da.php index 67104741..86507b0f 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/da.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/da.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 år|:count år', - 'y' => '1 år|:count år', - 'month' => '1 måned|:count måneder', - 'm' => '1 måned|:count måneder', - 'week' => '1 uge|:count uger', - 'w' => '1 uge|:count uger', - 'day' => '1 dag|:count dage', - 'd' => '1 dag|:count dage', - 'hour' => '1 time|:count timer', - 'h' => '1 time|:count timer', - 'minute' => '1 minut|:count minutter', - 'min' => '1 minut|:count minutter', - 'second' => '1 sekund|:count sekunder', - 's' => '1 sekund|:count sekunder', + 'year' => ':count år|:count år', + 'y' => ':count år|:count år', + 'month' => ':count måned|:count måneder', + 'm' => ':count måned|:count måneder', + 'week' => ':count uge|:count uger', + 'w' => ':count uge|:count uger', + 'day' => ':count dag|:count dage', + 'd' => ':count dag|:count dage', + 'hour' => ':count time|:count timer', + 'h' => ':count time|:count timer', + 'minute' => ':count minut|:count minutter', + 'min' => ':count minut|:count minutter', + 'second' => ':count sekund|:count sekunder', + 's' => ':count sekund|:count sekunder', 'ago' => ':time siden', 'from_now' => 'om :time', 'after' => ':time efter', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/de.php b/vendor/nesbot/carbon/src/Carbon/Lang/de.php index d1c572ac..5ea2a03a 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/de.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/de.php @@ -10,31 +10,37 @@ */ return array( - 'year' => '1 Jahr|:count Jahre', - 'y' => '1J|:countJ', - 'month' => '1 Monat|:count Monate', - 'm' => '1Mon|:countMon', - 'week' => '1 Woche|:count Wochen', - 'w' => '1Wo|:countWo', - 'day' => '1 Tag|:count Tage', - 'd' => '1Tg|:countTg', - 'hour' => '1 Stunde|:count Stunden', - 'h' => '1Std|:countStd', - 'minute' => '1 Minute|:count Minuten', - 'min' => '1Min|:countMin', - 'second' => '1 Sekunde|:count Sekunden', - 's' => '1Sek|:countSek', + 'year' => ':count Jahr|:count Jahre', + 'y' => ':countJ|:countJ', + 'month' => ':count Monat|:count Monate', + 'm' => ':countMon|:countMon', + 'week' => ':count Woche|:count Wochen', + 'w' => ':countWo|:countWo', + 'day' => ':count Tag|:count Tage', + 'd' => ':countTg|:countTg', + 'hour' => ':count Stunde|:count Stunden', + 'h' => ':countStd|:countStd', + 'minute' => ':count Minute|:count Minuten', + 'min' => ':countMin|:countMin', + 'second' => ':count Sekunde|:count Sekunden', + 's' => ':countSek|:countSek', 'ago' => 'vor :time', 'from_now' => 'in :time', 'after' => ':time später', 'before' => ':time zuvor', - 'year_from_now' => '1 Jahr|:count Jahren', - 'month_from_now' => '1 Monat|:count Monaten', - 'week_from_now' => '1 Woche|:count Wochen', - 'day_from_now' => '1 Tag|:count Tagen', - 'year_ago' => '1 Jahr|:count Jahren', - 'month_ago' => '1 Monat|:count Monaten', - 'week_ago' => '1 Woche|:count Wochen', - 'day_ago' => '1 Tag|:count Tagen', + 'year_from_now' => ':count Jahr|:count Jahren', + 'month_from_now' => ':count Monat|:count Monaten', + 'week_from_now' => ':count Woche|:count Wochen', + 'day_from_now' => ':count Tag|:count Tagen', + 'year_ago' => ':count Jahr|:count Jahren', + 'month_ago' => ':count Monat|:count Monaten', + 'week_ago' => ':count Woche|:count Wochen', + 'day_ago' => ':count Tag|:count Tagen', + + 'diff_now' => 'Gerade eben', + 'diff_yesterday' => 'Gestern', + 'diff_tomorrow' => 'Heute', + 'diff_before_yesterday' => 'Vorgestern', + 'diff_after_tomorrow' => 'Übermorgen', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/dv_MV.php b/vendor/nesbot/carbon/src/Carbon/Lang/dv_MV.php new file mode 100644 index 00000000..e3c50b39 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/dv_MV.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => '{0}އަހަރެއް|[1,Inf]:count އަހަރު', + 'y' => '{0}އަހަރެއް|[1,Inf]:count އަހަރު', + 'month' => '{0}މައްސަރެއް|[1,Inf]:count މަސް', + 'm' => '{0}މައްސަރެއް|[1,Inf]:count މަސް', + 'week' => '{0}ހަފްތާއެއް|[1,Inf]:count ހަފްތާ', + 'w' => '{0}ހަފްތާއެއް|[1,Inf]:count ހަފްތާ', + 'day' => '{0}ދުވަސް|[1,Inf]:count ދުވަސް', + 'd' => '{0}ދުވަސް|[1,Inf]:count ދުވަސް', + 'hour' => '{0}ގަޑިއިރެއް|[1,Inf]:count ގަޑި', + 'h' => '{0}ގަޑިއިރެއް|[1,Inf]:count ގަޑި', + 'minute' => '{0}މިނެޓެއް|[1,Inf]:count މިނެޓް', + 'min' => '{0}މިނެޓެއް|[1,Inf]:count މިނެޓް', + 'second' => '{0}ސިކުންތެއް|[1,Inf]:count ސިކުންތު', + 's' => '{0}ސިކުންތެއް|[1,Inf]:count ސިކުންތު', + 'ago' => ':time ކުރިން', + 'from_now' => ':time ފަހުން', + 'after' => ':time ފަހުން', + 'before' => ':time ކުރި', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/el.php b/vendor/nesbot/carbon/src/Carbon/Lang/el.php index 6028074d..16b3f442 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/el.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/el.php @@ -10,22 +10,22 @@ */ return array( - 'year' => '1 χρόνος|:count χρόνια', - 'y' => '1 χρόνος|:count χρόνια', - 'month' => '1 μήνας|:count μήνες', - 'm' => '1 μήνας|:count μήνες', - 'week' => '1 εβδομάδα|:count εβδομάδες', - 'w' => '1 εβδομάδα|:count εβδομάδες', - 'day' => '1 μέρα|:count μέρες', - 'd' => '1 μέρα|:count μέρες', - 'hour' => '1 ώρα|:count ώρες', - 'h' => '1 ώρα|:count ώρες', - 'minute' => '1 λεπτό|:count λεπτά', - 'min' => '1 λεπτό|:count λεπτά', - 'second' => '1 δευτερόλεπτο|:count δευτερόλεπτα', - 's' => '1 δευτερόλεπτο|:count δευτερόλεπτα', - 'ago' => 'πρίν απο :time', - 'from_now' => 'σε :time απο τώρα', + 'year' => ':count χρόνος|:count χρόνια', + 'y' => ':count χρόνος|:count χρόνια', + 'month' => ':count μήνας|:count μήνες', + 'm' => ':count μήνας|:count μήνες', + 'week' => ':count εβδομάδα|:count εβδομάδες', + 'w' => ':count εβδομάδα|:count εβδομάδες', + 'day' => ':count μέρα|:count μέρες', + 'd' => ':count μέρα|:count μέρες', + 'hour' => ':count ώρα|:count ώρες', + 'h' => ':count ώρα|:count ώρες', + 'minute' => ':count λεπτό|:count λεπτά', + 'min' => ':count λεπτό|:count λεπτά', + 'second' => ':count δευτερόλεπτο|:count δευτερόλεπτα', + 's' => ':count δευτερόλεπτο|:count δευτερόλεπτα', + 'ago' => 'πριν από :time', + 'from_now' => 'σε :time από τώρα', 'after' => ':time μετά', - 'before' => ':time πρίν', + 'before' => ':time πριν', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/en.php b/vendor/nesbot/carbon/src/Carbon/Lang/en.php index 181c59be..a15c131f 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/en.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/en.php @@ -10,22 +10,31 @@ */ return array( - 'year' => '1 year|:count years', - 'y' => '1yr|:countyrs', - 'month' => '1 month|:count months', - 'm' => '1mo|:countmos', - 'week' => '1 week|:count weeks', - 'w' => '1w|:countw', - 'day' => '1 day|:count days', - 'd' => '1d|:countd', - 'hour' => '1 hour|:count hours', - 'h' => '1h|:counth', - 'minute' => '1 minute|:count minutes', - 'min' => '1m|:countm', - 'second' => '1 second|:count seconds', - 's' => '1s|:counts', + 'year' => ':count year|:count years', + 'y' => ':countyr|:countyrs', + 'month' => ':count month|:count months', + 'm' => ':countmo|:countmos', + 'week' => ':count week|:count weeks', + 'w' => ':countw|:countw', + 'day' => ':count day|:count days', + 'd' => ':countd|:countd', + 'hour' => ':count hour|:count hours', + 'h' => ':counth|:counth', + 'minute' => ':count minute|:count minutes', + 'min' => ':countm|:countm', + 'second' => ':count second|:count seconds', + 's' => ':counts|:counts', 'ago' => ':time ago', 'from_now' => ':time from now', 'after' => ':time after', 'before' => ':time before', + 'diff_now' => 'just now', + 'diff_yesterday' => 'yesterday', + 'diff_tomorrow' => 'tomorrow', + 'diff_before_yesterday' => 'before yesterday', + 'diff_after_tomorrow' => 'after tomorrow', + 'period_recurrences' => 'once|:count times', + 'period_interval' => 'every :interval', + 'period_start_date' => 'from :date', + 'period_end_date' => 'to :date', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/eo.php b/vendor/nesbot/carbon/src/Carbon/Lang/eo.php index ff1f5311..c5b90b3e 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/eo.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/eo.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 jaro|:count jaroj', - 'y' => '1 jaro|:count jaroj', - 'month' => '1 monato|:count monatoj', - 'm' => '1 monato|:count monatoj', - 'week' => '1 semajno|:count semajnoj', - 'w' => '1 semajno|:count semajnoj', - 'day' => '1 tago|:count tagoj', - 'd' => '1 tago|:count tagoj', - 'hour' => '1 horo|:count horoj', - 'h' => '1 horo|:count horoj', - 'minute' => '1 minuto|:count minutoj', - 'min' => '1 minuto|:count minutoj', - 'second' => '1 sekundo|:count sekundoj', - 's' => '1 sekundo|:count sekundoj', + 'year' => ':count jaro|:count jaroj', + 'y' => ':count jaro|:count jaroj', + 'month' => ':count monato|:count monatoj', + 'm' => ':count monato|:count monatoj', + 'week' => ':count semajno|:count semajnoj', + 'w' => ':count semajno|:count semajnoj', + 'day' => ':count tago|:count tagoj', + 'd' => ':count tago|:count tagoj', + 'hour' => ':count horo|:count horoj', + 'h' => ':count horo|:count horoj', + 'minute' => ':count minuto|:count minutoj', + 'min' => ':count minuto|:count minutoj', + 'second' => ':count sekundo|:count sekundoj', + 's' => ':count sekundo|:count sekundoj', 'ago' => 'antaŭ :time', 'from_now' => 'je :time', 'after' => ':time poste', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/es.php b/vendor/nesbot/carbon/src/Carbon/Lang/es.php index fb0aff19..607a6b0b 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/es.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/es.php @@ -10,22 +10,27 @@ */ return array( - 'year' => '1 año|:count años', - 'y' => '1 año|:count años', - 'month' => '1 mes|:count meses', - 'm' => '1 mes|:count meses', - 'week' => '1 semana|:count semanas', - 'w' => '1 semana|:count semanas', - 'day' => '1 día|:count días', - 'd' => '1 día|:count días', - 'hour' => '1 hora|:count horas', - 'h' => '1 hora|:count horas', - 'minute' => '1 minuto|:count minutos', - 'min' => '1 minuto|:count minutos', - 'second' => '1 segundo|:count segundos', - 's' => '1 segundo|:count segundos', + 'year' => ':count año|:count años', + 'y' => ':count año|:count años', + 'month' => ':count mes|:count meses', + 'm' => ':count mes|:count meses', + 'week' => ':count semana|:count semanas', + 'w' => ':count semana|:count semanas', + 'day' => ':count día|:count días', + 'd' => ':count día|:count días', + 'hour' => ':count hora|:count horas', + 'h' => ':count hora|:count horas', + 'minute' => ':count minuto|:count minutos', + 'min' => ':count minuto|:count minutos', + 'second' => ':count segundo|:count segundos', + 's' => ':count segundo|:count segundos', 'ago' => 'hace :time', 'from_now' => 'dentro de :time', 'after' => ':time después', 'before' => ':time antes', + 'diff_now' => 'ahora mismo', + 'diff_yesterday' => 'ayer', + 'diff_tomorrow' => 'mañana', + 'diff_before_yesterday' => 'anteayer', + 'diff_after_tomorrow' => 'pasado mañana', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/et.php b/vendor/nesbot/carbon/src/Carbon/Lang/et.php index 70d682de..2d9291e0 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/et.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/et.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 aasta|:count aastat', - 'y' => '1 aasta|:count aastat', - 'month' => '1 kuu|:count kuud', - 'm' => '1 kuu|:count kuud', - 'week' => '1 nädal|:count nädalat', - 'w' => '1 nädal|:count nädalat', - 'day' => '1 päev|:count päeva', - 'd' => '1 päev|:count päeva', - 'hour' => '1 tund|:count tundi', - 'h' => '1 tund|:count tundi', - 'minute' => '1 minut|:count minutit', - 'min' => '1 minut|:count minutit', - 'second' => '1 sekund|:count sekundit', - 's' => '1 sekund|:count sekundit', + 'year' => ':count aasta|:count aastat', + 'y' => ':count aasta|:count aastat', + 'month' => ':count kuu|:count kuud', + 'm' => ':count kuu|:count kuud', + 'week' => ':count nädal|:count nädalat', + 'w' => ':count nädal|:count nädalat', + 'day' => ':count päev|:count päeva', + 'd' => ':count päev|:count päeva', + 'hour' => ':count tund|:count tundi', + 'h' => ':count tund|:count tundi', + 'minute' => ':count minut|:count minutit', + 'min' => ':count minut|:count minutit', + 'second' => ':count sekund|:count sekundit', + 's' => ':count sekund|:count sekundit', 'ago' => ':time tagasi', 'from_now' => ':time pärast', 'after' => ':time pärast', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/fi.php b/vendor/nesbot/carbon/src/Carbon/Lang/fi.php index 46794fa5..48188044 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/fi.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/fi.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 vuosi|:count vuotta', - 'y' => '1 vuosi|:count vuotta', - 'month' => '1 kuukausi|:count kuukautta', - 'm' => '1 kuukausi|:count kuukautta', - 'week' => '1 viikko|:count viikkoa', - 'w' => '1 viikko|:count viikkoa', - 'day' => '1 päivä|:count päivää', - 'd' => '1 päivä|:count päivää', - 'hour' => '1 tunti|:count tuntia', - 'h' => '1 tunti|:count tuntia', - 'minute' => '1 minuutti|:count minuuttia', - 'min' => '1 minuutti|:count minuuttia', - 'second' => '1 sekunti|:count sekuntia', - 's' => '1 sekunti|:count sekuntia', + 'year' => ':count vuosi|:count vuotta', + 'y' => ':count vuosi|:count vuotta', + 'month' => ':count kuukausi|:count kuukautta', + 'm' => ':count kuukausi|:count kuukautta', + 'week' => ':count viikko|:count viikkoa', + 'w' => ':count viikko|:count viikkoa', + 'day' => ':count päivä|:count päivää', + 'd' => ':count päivä|:count päivää', + 'hour' => ':count tunti|:count tuntia', + 'h' => ':count tunti|:count tuntia', + 'minute' => ':count minuutti|:count minuuttia', + 'min' => ':count minuutti|:count minuuttia', + 'second' => ':count sekunti|:count sekuntia', + 's' => ':count sekunti|:count sekuntia', 'ago' => ':time sitten', 'from_now' => ':time tästä hetkestä', 'after' => ':time sen jälkeen', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/fo.php b/vendor/nesbot/carbon/src/Carbon/Lang/fo.php index d4d68232..d91104b7 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/fo.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/fo.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 ár|:count ár', - 'y' => '1 ár|:count ár', - 'month' => '1 mánaður|:count mánaðir', - 'm' => '1 mánaður|:count mánaðir', - 'week' => '1 vika|:count vikur', - 'w' => '1 vika|:count vikur', - 'day' => '1 dag|:count dagar', - 'd' => '1 dag|:count dagar', - 'hour' => '1 tími|:count tímar', - 'h' => '1 tími|:count tímar', - 'minute' => '1 minutt|:count minuttir', - 'min' => '1 minutt|:count minuttir', - 'second' => '1 sekund|:count sekundir', - 's' => '1 sekund|:count sekundir', + 'year' => ':count ár|:count ár', + 'y' => ':count ár|:count ár', + 'month' => ':count mánaður|:count mánaðir', + 'm' => ':count mánaður|:count mánaðir', + 'week' => ':count vika|:count vikur', + 'w' => ':count vika|:count vikur', + 'day' => ':count dag|:count dagar', + 'd' => ':count dag|:count dagar', + 'hour' => ':count tími|:count tímar', + 'h' => ':count tími|:count tímar', + 'minute' => ':count minutt|:count minuttir', + 'min' => ':count minutt|:count minuttir', + 'second' => ':count sekund|:count sekundir', + 's' => ':count sekund|:count sekundir', 'ago' => ':time síðan', 'from_now' => 'um :time', 'after' => ':time aftaná', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/fr.php b/vendor/nesbot/carbon/src/Carbon/Lang/fr.php index be79738c..5436d21c 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/fr.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/fr.php @@ -10,22 +10,27 @@ */ return array( - 'year' => '1 an|:count ans', - 'y' => '1 an|:count ans', + 'year' => ':count an|:count ans', + 'y' => ':count an|:count ans', 'month' => ':count mois', 'm' => ':count mois', - 'week' => '1 semaine|:count semaines', - 'w' => '1 semaine|:count semaines', - 'day' => '1 jour|:count jours', - 'd' => '1 jour|:count jours', - 'hour' => '1 heure|:count heures', - 'h' => '1 heure|:count heures', - 'minute' => '1 minute|:count minutes', - 'min' => '1 minute|:count minutes', - 'second' => '1 seconde|:count secondes', - 's' => '1 seconde|:count secondes', + 'week' => ':count semaine|:count semaines', + 'w' => ':count sem.', + 'day' => ':count jour|:count jours', + 'd' => ':count j.', + 'hour' => ':count heure|:count heures', + 'h' => ':count h.', + 'minute' => ':count minute|:count minutes', + 'min' => ':count min.', + 'second' => ':count seconde|:count secondes', + 's' => ':count sec.', 'ago' => 'il y a :time', 'from_now' => 'dans :time', 'after' => ':time après', 'before' => ':time avant', + 'diff_now' => "à l'instant", + 'diff_yesterday' => 'hier', + 'diff_tomorrow' => 'demain', + 'diff_before_yesterday' => 'avant-hier', + 'diff_after_tomorrow' => 'après-demain', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/gl.php b/vendor/nesbot/carbon/src/Carbon/Lang/gl.php index 609bf752..cd22a31e 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/gl.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/gl.php @@ -10,13 +10,13 @@ */ return array( - 'year' => '1 ano|:count anos', - 'month' => '1 mes|:count meses', - 'week' => '1 semana|:count semanas', - 'day' => '1 día|:count días', - 'hour' => '1 hora|:count horas', - 'minute' => '1 minuto|:count minutos', - 'second' => '1 segundo|:count segundos', + 'year' => ':count ano|:count anos', + 'month' => ':count mes|:count meses', + 'week' => ':count semana|:count semanas', + 'day' => ':count día|:count días', + 'hour' => ':count hora|:count horas', + 'minute' => ':count minuto|:count minutos', + 'second' => ':count segundo|:count segundos', 'ago' => 'fai :time', 'from_now' => 'dentro de :time', 'after' => ':time despois', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/gu.php b/vendor/nesbot/carbon/src/Carbon/Lang/gu.php new file mode 100644 index 00000000..7759dfcb --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/gu.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => ':count વર્ષ|:count વર્ષો', + 'y' => ':countવર્ષ|:countવર્ષો', + 'month' => ':count મહિનો|:count મહિના', + 'm' => ':countમહિનો|:countમહિના', + 'week' => ':count અઠવાડિયું|:count અઠવાડિયા', + 'w' => ':countઅઠ.|:countઅઠ.', + 'day' => ':count દિવસ|:count દિવસો', + 'd' => ':countદિ.|:countદિ.', + 'hour' => ':count કલાક|:count કલાકો', + 'h' => ':countક.|:countક.', + 'minute' => ':count મિનિટ|:count મિનિટ', + 'min' => ':countમિ.|:countમિ.', + 'second' => ':count સેકેન્ડ|:count સેકેન્ડ', + 's' => ':countસે.|:countસે.', + 'ago' => ':time પહેલા', + 'from_now' => ':time અત્યારથી', + 'after' => ':time પછી', + 'before' => ':time પહેલા', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/hi.php b/vendor/nesbot/carbon/src/Carbon/Lang/hi.php new file mode 100644 index 00000000..6c670ee8 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/hi.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => '1 वर्ष|:count वर्षों', + 'y' => '1 वर्ष|:count वर्षों', + 'month' => '1 माह|:count महीने', + 'm' => '1 माह|:count महीने', + 'week' => '1 सप्ताह|:count सप्ताह', + 'w' => '1 सप्ताह|:count सप्ताह', + 'day' => '1 दिन|:count दिनों', + 'd' => '1 दिन|:count दिनों', + 'hour' => '1 घंटा|:count घंटे', + 'h' => '1 घंटा|:count घंटे', + 'minute' => '1 मिनट|:count मिनटों', + 'min' => '1 मिनट|:count मिनटों', + 'second' => '1 सेकंड|:count सेकंड', + 's' => '1 सेकंड|:count सेकंड', + 'ago' => ':time पूर्व', + 'from_now' => ':time से', + 'after' => ':time के बाद', + 'before' => ':time के पहले', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/hy.php b/vendor/nesbot/carbon/src/Carbon/Lang/hy.php index 4b4545d7..d2665f27 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/hy.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/hy.php @@ -11,21 +11,21 @@ return array( 'year' => ':count տարի', - 'y' => ':count տարի', + 'y' => ':countտ', 'month' => ':count ամիս', - 'm' => ':count ամիս', + 'm' => ':countամ', 'week' => ':count շաբաթ', - 'w' => ':count շաբաթ', + 'w' => ':countշ', 'day' => ':count օր', - 'd' => ':count օր', + 'd' => ':countօր', 'hour' => ':count ժամ', - 'h' => ':count ժամ', + 'h' => ':countժ', 'minute' => ':count րոպե', - 'min' => ':count րոպե', - 'second' => ':count վայրկյան', - 's' => ':count վայրկյան', + 'min' => ':countր', + 'second' => ':count վարկյան', + 's' => ':countվրկ', 'ago' => ':time առաջ', - 'from_now' => ':time հետո', + 'from_now' => ':time ներկա պահից', 'after' => ':time հետո', 'before' => ':time առաջ', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/is.php b/vendor/nesbot/carbon/src/Carbon/Lang/is.php new file mode 100644 index 00000000..94c76a7f --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/is.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => '1 ár|:count ár', + 'y' => '1 ár|:count ár', + 'month' => '1 mánuður|:count mánuðir', + 'm' => '1 mánuður|:count mánuðir', + 'week' => '1 vika|:count vikur', + 'w' => '1 vika|:count vikur', + 'day' => '1 dagur|:count dagar', + 'd' => '1 dagur|:count dagar', + 'hour' => '1 klukkutími|:count klukkutímar', + 'h' => '1 klukkutími|:count klukkutímar', + 'minute' => '1 mínúta|:count mínútur', + 'min' => '1 mínúta|:count mínútur', + 'second' => '1 sekúnda|:count sekúndur', + 's' => '1 sekúnda|:count sekúndur', + 'ago' => ':time síðan', + 'from_now' => ':time síðan', + 'after' => ':time eftir', + 'before' => ':time fyrir', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/it.php b/vendor/nesbot/carbon/src/Carbon/Lang/it.php index 19eedafa..70bc6d7b 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/it.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/it.php @@ -10,22 +10,27 @@ */ return array( - 'year' => '1 anno|:count anni', - 'y' => '1 anno|:count anni', - 'month' => '1 mese|:count mesi', - 'm' => '1 mese|:count mesi', - 'week' => '1 settimana|:count settimane', - 'w' => '1 settimana|:count settimane', - 'day' => '1 giorno|:count giorni', - 'd' => '1 giorno|:count giorni', - 'hour' => '1 ora|:count ore', - 'h' => '1 ora|:count ore', - 'minute' => '1 minuto|:count minuti', - 'min' => '1 minuto|:count minuti', - 'second' => '1 secondo|:count secondi', - 's' => '1 secondo|:count secondi', + 'year' => ':count anno|:count anni', + 'y' => ':count anno|:count anni', + 'month' => ':count mese|:count mesi', + 'm' => ':count mese|:count mesi', + 'week' => ':count settimana|:count settimane', + 'w' => ':count settimana|:count settimane', + 'day' => ':count giorno|:count giorni', + 'd' => ':count giorno|:count giorni', + 'hour' => ':count ora|:count ore', + 'h' => ':count ora|:count ore', + 'minute' => ':count minuto|:count minuti', + 'min' => ':count minuto|:count minuti', + 'second' => ':count secondo|:count secondi', + 's' => ':count secondo|:count secondi', 'ago' => ':time fa', - 'from_now' => ':time da adesso', + 'from_now' => 'tra :time', 'after' => ':time dopo', 'before' => ':time prima', + 'diff_now' => 'proprio ora', + 'diff_yesterday' => 'ieri', + 'diff_tomorrow' => 'domani', + 'diff_before_yesterday' => "l'altro ieri", + 'diff_after_tomorrow' => 'dopodomani', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ja.php b/vendor/nesbot/carbon/src/Carbon/Lang/ja.php index c12c1994..71195475 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/ja.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/ja.php @@ -10,22 +10,22 @@ */ return array( - 'year' => ':count 年', - 'y' => ':count 年', - 'month' => ':count ヶ月', - 'm' => ':count ヶ月', - 'week' => ':count 週間', - 'w' => ':count 週間', - 'day' => ':count 日', - 'd' => ':count 日', - 'hour' => ':count 時間', - 'h' => ':count 時間', - 'minute' => ':count 分', - 'min' => ':count 分', - 'second' => ':count 秒', - 's' => ':count 秒', - 'ago' => ':time 前', - 'from_now' => '今から :time', - 'after' => ':time 後', - 'before' => ':time 前', + 'year' => ':count年', + 'y' => ':count年', + 'month' => ':countヶ月', + 'm' => ':countヶ月', + 'week' => ':count週間', + 'w' => ':count週間', + 'day' => ':count日', + 'd' => ':count日', + 'hour' => ':count時間', + 'h' => ':count時間', + 'minute' => ':count分', + 'min' => ':count分', + 'second' => ':count秒', + 's' => ':count秒', + 'ago' => ':time前', + 'from_now' => '今から:time', + 'after' => ':time後', + 'before' => ':time前', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/kk.php b/vendor/nesbot/carbon/src/Carbon/Lang/kk.php new file mode 100644 index 00000000..8d113afe --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/kk.php @@ -0,0 +1,29 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +return array( + 'year' => ':count жыл', + 'y' => ':count жыл', + 'month' => ':count ай', + 'm' => ':count ай', + 'week' => ':count апта', + 'w' => ':count апта', + 'day' => ':count күн', + 'd' => ':count күн', + 'hour' => ':count сағат', + 'h' => ':count сағат', + 'minute' => ':count минут', + 'min' => ':count минут', + 'second' => ':count секунд', + 's' => ':count секунд', + 'ago' => ':time бұрын', + 'from_now' => ':time кейін', + 'after' => ':time кейін', + 'before' => ':time бұрын', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ko.php b/vendor/nesbot/carbon/src/Carbon/Lang/ko.php index 9eac8c9f..02091644 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/ko.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/ko.php @@ -26,6 +26,6 @@ return array( 's' => ':count 초', 'ago' => ':time 전', 'from_now' => ':time 후', - 'after' => ':time 뒤', - 'before' => ':time 앞', + 'after' => ':time 이후', + 'before' => ':time 이전', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/mk.php b/vendor/nesbot/carbon/src/Carbon/Lang/mk.php index 51e661d6..c5ec12df 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/mk.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/mk.php @@ -10,13 +10,13 @@ */ return array( - 'year' => '1 година|:count години', - 'month' => '1 месец|:count месеци', - 'week' => '1 седмица|:count седмици', - 'day' => '1 ден|:count дена', - 'hour' => '1 час|:count часа', - 'minute' => '1 минута|:count минути', - 'second' => '1 секунда|:count секунди', + 'year' => ':count година|:count години', + 'month' => ':count месец|:count месеци', + 'week' => ':count седмица|:count седмици', + 'day' => ':count ден|:count дена', + 'hour' => ':count час|:count часа', + 'minute' => ':count минута|:count минути', + 'second' => ':count секунда|:count секунди', 'ago' => 'пред :time', 'from_now' => ':time од сега', 'after' => 'по :time', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/mn.php b/vendor/nesbot/carbon/src/Carbon/Lang/mn.php new file mode 100644 index 00000000..b26dce55 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/mn.php @@ -0,0 +1,62 @@ + + * + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @translator Batmandakh Erdenebileg + */ + +return array( + 'year' => ':count жил', + 'y' => ':count жил', + 'month' => ':count сар', + 'm' => ':count сар', + 'week' => ':count долоо хоног', + 'w' => ':count долоо хоног', + 'day' => ':count өдөр', + 'd' => ':count өдөр', + 'hour' => ':count цаг', + 'h' => ':countц', + 'minute' => ':count минут', + 'min' => ':countм', + 'second' => ':count секунд', + 's' => ':countс', + + 'ago' => ':timeн өмнө', + 'year_ago' => ':count жилий', + 'month_ago' => ':count сары', + 'day_ago' => ':count хоногий', + 'hour_ago' => ':count цагий', + 'minute_ago' => ':count минуты', + 'second_ago' => ':count секунды', + + 'from_now' => 'одоогоос :time', + 'year_from_now' => ':count жилийн дараа', + 'month_from_now' => ':count сарын дараа', + 'day_from_now' => ':count хоногийн дараа', + 'hour_from_now' => ':count цагийн дараа', + 'minute_from_now' => ':count минутын дараа', + 'second_from_now' => ':count секундын дараа', + + // Does it required to make translation for before, after as follows? hmm, I think we've made it with ago and from now keywords already. Anyway, I've included it just in case of undesired action... + 'after' => ':timeн дараа', + 'year_after' => ':count жилий', + 'month_after' => ':count сары', + 'day_after' => ':count хоногий', + 'hour_after' => ':count цагий', + 'minute_after' => ':count минуты', + 'second_after' => ':count секунды', + 'before' => ':timeн өмнө', + 'year_before' => ':count жилий', + 'month_before' => ':count сары', + 'day_before' => ':count хоногий', + 'hour_before' => ':count цагий', + 'minute_before' => ':count минуты', + 'second_before' => ':count секунды', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ne.php b/vendor/nesbot/carbon/src/Carbon/Lang/ne.php new file mode 100644 index 00000000..0b528dfa --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/ne.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => ':count वर्ष', + 'y' => ':count वर्ष', + 'month' => ':count महिना', + 'm' => ':count महिना', + 'week' => ':count हप्ता', + 'w' => ':count हप्ता', + 'day' => ':count दिन', + 'd' => ':count दिन', + 'hour' => ':count घण्टा', + 'h' => ':count घण्टा', + 'minute' => ':count मिनेट', + 'min' => ':count मिनेट', + 'second' => ':count सेकेण्ड', + 's' => ':count सेकेण्ड', + 'ago' => ':time पहिले', + 'from_now' => ':time देखि', + 'after' => ':time पछि', + 'before' => ':time अघि', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/nl.php b/vendor/nesbot/carbon/src/Carbon/Lang/nl.php index a398ca9d..ec5a88ed 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/nl.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/nl.php @@ -12,20 +12,25 @@ return array( 'year' => ':count jaar', 'y' => ':count jaar', - 'month' => '1 maand|:count maanden', - 'm' => '1 maand|:count maanden', - 'week' => '1 week|:count weken', - 'w' => '1 week|:count weken', - 'day' => '1 dag|:count dagen', - 'd' => '1 dag|:count dagen', + 'month' => ':count maand|:count maanden', + 'm' => ':count maand|:count maanden', + 'week' => ':count week|:count weken', + 'w' => ':count week|:count weken', + 'day' => ':count dag|:count dagen', + 'd' => ':count dag|:count dagen', 'hour' => ':count uur', 'h' => ':count uur', - 'minute' => '1 minuut|:count minuten', - 'min' => '1 minuut|:count minuten', - 'second' => '1 seconde|:count seconden', - 's' => '1 seconde|:count seconden', + 'minute' => ':count minuut|:count minuten', + 'min' => ':count minuut|:count minuten', + 'second' => ':count seconde|:count seconden', + 's' => ':count seconde|:count seconden', 'ago' => ':time geleden', 'from_now' => 'over :time', 'after' => ':time later', 'before' => ':time eerder', + 'diff_now' => 'nu', + 'diff_yesterday' => 'gisteren', + 'diff_tomorrow' => 'morgen', + 'diff_after_tomorrow' => 'overmorgen', + 'diff_before_yesterday' => 'eergisteren', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/no.php b/vendor/nesbot/carbon/src/Carbon/Lang/no.php index 178fbdcd..a6ece06a 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/no.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/no.php @@ -10,22 +10,27 @@ */ return array( - 'year' => '1 år|:count år', - 'y' => '1 år|:count år', - 'month' => '1 måned|:count måneder', - 'm' => '1 måned|:count måneder', - 'week' => '1 uke|:count uker', - 'w' => '1 uke|:count uker', - 'day' => '1 dag|:count dager', - 'd' => '1 dag|:count dager', - 'hour' => '1 time|:count timer', - 'h' => '1 time|:count timer', - 'minute' => '1 minutt|:count minutter', - 'min' => '1 minutt|:count minutter', - 'second' => '1 sekund|:count sekunder', - 's' => '1 sekund|:count sekunder', + 'year' => ':count år|:count år', + 'y' => ':count år|:count år', + 'month' => ':count måned|:count måneder', + 'm' => ':count måned|:count måneder', + 'week' => ':count uke|:count uker', + 'w' => ':count uke|:count uker', + 'day' => ':count dag|:count dager', + 'd' => ':count dag|:count dager', + 'hour' => ':count time|:count timer', + 'h' => ':count time|:count timer', + 'minute' => ':count minutt|:count minutter', + 'min' => ':count minutt|:count minutter', + 'second' => ':count sekund|:count sekunder', + 's' => ':count sekund|:count sekunder', 'ago' => ':time siden', 'from_now' => 'om :time', 'after' => ':time etter', 'before' => ':time før', + 'diff_now' => 'akkurat nå', + 'diff_yesterday' => 'i går', + 'diff_tomorrow' => 'i morgen', + 'diff_before_yesterday' => 'i forgårs', + 'diff_after_tomorrow' => 'i overmorgen', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/oc.php b/vendor/nesbot/carbon/src/Carbon/Lang/oc.php new file mode 100644 index 00000000..6271a429 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/oc.php @@ -0,0 +1,40 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +\Symfony\Component\Translation\PluralizationRules::set(function ($number) { + return $number == 1 ? 0 : 1; +}, 'oc'); + +return array( + 'year' => ':count an|:count ans', + 'y' => ':count an|:count ans', + 'month' => ':count mes|:count meses', + 'm' => ':count mes|:count meses', + 'week' => ':count setmana|:count setmanas', + 'w' => ':count setmana|:count setmanas', + 'day' => ':count jorn|:count jorns', + 'd' => ':count jorn|:count jorns', + 'hour' => ':count ora|:count oras', + 'h' => ':count ora|:count oras', + 'minute' => ':count minuta|:count minutas', + 'min' => ':count minuta|:count minutas', + 'second' => ':count segonda|:count segondas', + 's' => ':count segonda|:count segondas', + 'ago' => 'fa :time', + 'from_now' => 'dins :time', + 'after' => ':time aprèp', + 'before' => ':time abans', + 'diff_now' => 'ara meteis', + 'diff_yesterday' => 'ièr', + 'diff_tomorrow' => 'deman', + 'diff_before_yesterday' => 'ièr delà', + 'diff_after_tomorrow' => 'deman passat', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/pl.php b/vendor/nesbot/carbon/src/Carbon/Lang/pl.php index bca2d7fb..2308af2d 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/pl.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/pl.php @@ -10,22 +10,27 @@ */ return array( - 'year' => '1 rok|:count lata|:count lat', - 'y' => '1 rok|:count lata|:count lat', - 'month' => '1 miesiąc|:count miesiące|:count miesięcy', - 'm' => '1 miesiąc|:count miesiące|:count miesięcy', - 'week' => '1 tydzień|:count tygodnie|:count tygodni', - 'w' => '1 tydzień|:count tygodnie|:count tygodni', - 'day' => '1 dzień|:count dni|:count dni', - 'd' => '1 dzień|:count dni|:count dni', - 'hour' => '1 godzina|:count godziny|:count godzin', - 'h' => '1 godzina|:count godziny|:count godzin', - 'minute' => '1 minuta|:count minuty|:count minut', - 'min' => '1 minuta|:count minuty|:count minut', - 'second' => '1 sekunda|:count sekundy|:count sekund', - 's' => '1 sekunda|:count sekundy|:count sekund', + 'year' => ':count rok|:count lata|:count lat', + 'y' => ':countr|:countl', + 'month' => ':count miesiąc|:count miesiące|:count miesięcy', + 'm' => ':countmies', + 'week' => ':count tydzień|:count tygodnie|:count tygodni', + 'w' => ':counttyg', + 'day' => ':count dzień|:count dni|:count dni', + 'd' => ':countd', + 'hour' => ':count godzina|:count godziny|:count godzin', + 'h' => ':countg', + 'minute' => ':count minuta|:count minuty|:count minut', + 'min' => ':countm', + 'second' => ':count sekunda|:count sekundy|:count sekund', + 's' => ':counts', 'ago' => ':time temu', 'from_now' => ':time od teraz', - 'after' => ':time przed', - 'before' => ':time po', + 'after' => ':time po', + 'before' => ':time przed', + 'diff_now' => 'przed chwilą', + 'diff_yesterday' => 'wczoraj', + 'diff_tomorrow' => 'jutro', + 'diff_before_yesterday' => 'przedwczoraj', + 'diff_after_tomorrow' => 'pojutrze', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ps.php b/vendor/nesbot/carbon/src/Carbon/Lang/ps.php new file mode 100644 index 00000000..15c3296e --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/ps.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => ':count کال|:count کاله', + 'y' => ':countکال|:countکاله', + 'month' => ':count مياشت|:count مياشتي', + 'm' => ':countمياشت|:countمياشتي', + 'week' => ':count اونۍ|:count اونۍ', + 'w' => ':countاونۍ|:countاونۍ', + 'day' => ':count ورځ|:count ورځي', + 'd' => ':countورځ|:countورځي', + 'hour' => ':count ساعت|:count ساعته', + 'h' => ':countساعت|:countساعته', + 'minute' => ':count دقيقه|:count دقيقې', + 'min' => ':countدقيقه|:countدقيقې', + 'second' => ':count ثانيه|:count ثانيې', + 's' => ':countثانيه|:countثانيې', + 'ago' => ':time دمخه', + 'from_now' => ':time له اوس څخه', + 'after' => ':time وروسته', + 'before' => ':time دمخه', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/pt.php b/vendor/nesbot/carbon/src/Carbon/Lang/pt.php index f1706487..392b1215 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/pt.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/pt.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 ano|:count anos', - 'y' => '1 ano|:count anos', - 'month' => '1 mês|:count meses', - 'm' => '1 mês|:count meses', - 'week' => '1 semana|:count semanas', - 'w' => '1 semana|:count semanas', - 'day' => '1 dia|:count dias', - 'd' => '1 dia|:count dias', - 'hour' => '1 hora|:count horas', - 'h' => '1 hora|:count horas', - 'minute' => '1 minuto|:count minutos', - 'min' => '1 minuto|:count minutos', - 'second' => '1 segundo|:count segundos', - 's' => '1 segundo|:count segundos', + 'year' => ':count ano|:count anos', + 'y' => ':count ano|:count anos', + 'month' => ':count mês|:count meses', + 'm' => ':count mês|:count meses', + 'week' => ':count semana|:count semanas', + 'w' => ':count semana|:count semanas', + 'day' => ':count dia|:count dias', + 'd' => ':count dia|:count dias', + 'hour' => ':count hora|:count horas', + 'h' => ':count hora|:count horas', + 'minute' => ':count minuto|:count minutos', + 'min' => ':count minuto|:count minutos', + 'second' => ':count segundo|:count segundos', + 's' => ':count segundo|:count segundos', 'ago' => ':time atrás', 'from_now' => 'em :time', 'after' => ':time depois', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php b/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php index f9cbdc7a..22d12201 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 ano|:count anos', - 'y' => '1 ano|:count anos', - 'month' => '1 mês|:count meses', - 'm' => '1 mês|:count meses', - 'week' => '1 semana|:count semanas', - 'w' => '1 semana|:count semanas', - 'day' => '1 dia|:count dias', - 'd' => '1 dia|:count dias', - 'hour' => '1 hora|:count horas', - 'h' => '1 hora|:count horas', - 'minute' => '1 minuto|:count minutos', - 'min' => '1 minuto|:count minutos', - 'second' => '1 segundo|:count segundos', - 's' => '1 segundo|:count segundos', + 'year' => ':count ano|:count anos', + 'y' => ':count ano|:count anos', + 'month' => ':count mês|:count meses', + 'm' => ':count mês|:count meses', + 'week' => ':count semana|:count semanas', + 'w' => ':count semana|:count semanas', + 'day' => ':count dia|:count dias', + 'd' => ':count dia|:count dias', + 'hour' => ':count hora|:count horas', + 'h' => ':count hora|:count horas', + 'minute' => ':count minuto|:count minutos', + 'min' => ':count minuto|:count minutos', + 'second' => ':count segundo|:count segundos', + 's' => ':count segundo|:count segundos', 'ago' => 'há :time', 'from_now' => 'em :time', 'after' => 'após :time', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sh.php b/vendor/nesbot/carbon/src/Carbon/Lang/sh.php new file mode 100644 index 00000000..d520cf03 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sh.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => ':count godina|:count godine|:count godina', + 'y' => ':count godina|:count godine|:count godina', + 'month' => ':count mesec|:count meseca|:count meseci', + 'm' => ':count mesec|:count meseca|:count meseci', + 'week' => ':count nedelja|:count nedelje|:count nedelja', + 'w' => ':count nedelja|:count nedelje|:count nedelja', + 'day' => ':count dan|:count dana|:count dana', + 'd' => ':count dan|:count dana|:count dana', + 'hour' => ':count čas|:count časa|:count časova', + 'h' => ':count čas|:count časa|:count časova', + 'minute' => ':count minut|:count minuta|:count minuta', + 'min' => ':count minut|:count minuta|:count minuta', + 'second' => ':count sekund|:count sekunda|:count sekundi', + 's' => ':count sekund|:count sekunda|:count sekundi', + 'ago' => 'pre :time', + 'from_now' => 'za :time', + 'after' => 'nakon :time', + 'before' => ':time raniјe', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sk.php b/vendor/nesbot/carbon/src/Carbon/Lang/sk.php index 45c8f76d..61013448 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/sk.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sk.php @@ -26,6 +26,13 @@ return array( 's' => 'sekundu|:count sekundy|:count sekúnd', 'ago' => 'pred :time', 'from_now' => 'za :time', - 'after' => ':time neskôr', + 'after' => 'o :time neskôr', 'before' => ':time predtým', + 'year_ago' => 'rokom|:count rokmi|:count rokmi', + 'month_ago' => 'mesiacom|:count mesiacmi|:count mesiacmi', + 'week_ago' => 'týždňom|:count týždňami|:count týždňami', + 'day_ago' => 'dňom|:count dňami|:count dňami', + 'hour_ago' => 'hodinou|:count hodinami|:count hodinami', + 'minute_ago' => 'minútou|:count minútami|:count minútami', + 'second_ago' => 'sekundou|:count sekundami|:count sekundami', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sl.php b/vendor/nesbot/carbon/src/Carbon/Lang/sl.php index fcef085e..06686d13 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/sl.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sl.php @@ -35,4 +35,9 @@ return array( 'from_now' => 'čez :time', 'after' => 'čez :time', 'before' => 'pred :time', + 'diff_now' => 'ravnokar', + 'diff_yesterday' => 'včeraj', + 'diff_tomorrow' => 'jutri', + 'diff_before_yesterday' => 'predvčerajšnjim', + 'diff_after_tomorrow' => 'pojutrišnjem', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sq.php b/vendor/nesbot/carbon/src/Carbon/Lang/sq.php index 41be2513..6e138a04 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/sq.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sq.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 vit|:count vjet', - 'y' => '1 vit|:count vjet', - 'month' => '1 muaj|:count muaj', - 'm' => '1 muaj|:count muaj', - 'week' => '1 javë|:count javë', - 'w' => '1 javë|:count javë', - 'day' => '1 ditë|:count ditë', - 'd' => '1 ditë|:count ditë', - 'hour' => '1 orë|:count orë', - 'h' => '1 orë|:count orë', - 'minute' => '1 minutë|:count minuta', - 'min' => '1 minutë|:count minuta', - 'second' => '1 sekondë|:count sekonda', - 's' => '1 sekondë|:count sekonda', + 'year' => ':count vit|:count vjet', + 'y' => ':count vit|:count vjet', + 'month' => ':count muaj|:count muaj', + 'm' => ':count muaj|:count muaj', + 'week' => ':count javë|:count javë', + 'w' => ':count javë|:count javë', + 'day' => ':count ditë|:count ditë', + 'd' => ':count ditë|:count ditë', + 'hour' => ':count orë|:count orë', + 'h' => ':count orë|:count orë', + 'minute' => ':count minutë|:count minuta', + 'min' => ':count minutë|:count minuta', + 'second' => ':count sekondë|:count sekonda', + 's' => ':count sekondë|:count sekonda', 'ago' => ':time më parë', 'from_now' => ':time nga tani', 'after' => ':time pas', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sr.php b/vendor/nesbot/carbon/src/Carbon/Lang/sr.php index 70915a27..5a106421 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/sr.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sr.php @@ -28,4 +28,10 @@ return array( 'from_now' => ':time od sada', 'after' => 'nakon :time', 'before' => 'pre :time', + + 'year_from_now' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina', + 'year_ago' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina', + + 'week_from_now' => '{1} :count nedelju|{2,3,4} :count nedelje|[5,Inf[ :count nedelja', + 'week_ago' => '{1} :count nedelju|{2,3,4} :count nedelje|[5,Inf[ :count nedelja', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php b/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php new file mode 100644 index 00000000..2db83edd --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => '{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count године|[0,Inf[ :count година', + 'y' => ':count г.', + 'month' => '{1} :count месец|{2,3,4}:count месеца|[5,Inf[ :count месеци', + 'm' => ':count м.', + 'week' => '{1} :count недеља|{2,3,4}:count недеље|[5,Inf[ :count недеља', + 'w' => ':count нед.', + 'day' => '{1,21,31} :count дан|[2,Inf[ :count дана', + 'd' => ':count д.', + 'hour' => '{1,21} :count сат|{2,3,4,22,23,24}:count сата|[5,Inf[ :count сати', + 'h' => ':count ч.', + 'minute' => '{1,21,31,41,51} :count минут|[2,Inf[ :count минута', + 'min' => ':count мин.', + 'second' => '{1,21,31,41,51} :count секунд|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count секунде|[5,Inf[:count секунди', + 's' => ':count сек.', + 'ago' => 'пре :time', + 'from_now' => 'за :time', + 'after' => ':time након', + 'before' => ':time пре', + + 'year_from_now' => '{1,21,31,41,51} :count годину|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count године|[5,Inf[ :count година', + 'year_ago' => '{1,21,31,41,51} :count годину|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count године|[5,Inf[ :count година', + + 'week_from_now' => '{1} :count недељу|{2,3,4} :count недеље|[5,Inf[ :count недеља', + 'week_ago' => '{1} :count недељу|{2,3,4} :count недеље|[5,Inf[ :count недеља', + + 'diff_now' => 'управо сада', + 'diff_yesterday' => 'јуче', + 'diff_tomorrow' => 'сутра', + 'diff_before_yesterday' => 'прекјуче', + 'diff_after_tomorrow' => 'прекосутра', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php b/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php index 9b67838a..18214c44 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php @@ -35,4 +35,9 @@ return array( 'week_from_now' => '{1} :count недјељу|{2,3,4} :count недјеље|[5,Inf[ :count недјеља', 'week_ago' => '{1} :count недјељу|{2,3,4} :count недјеље|[5,Inf[ :count недјеља', + 'diff_now' => 'управо сада', + 'diff_yesterday' => 'јуче', + 'diff_tomorrow' => 'сутра', + 'diff_before_yesterday' => 'прекјуче', + 'diff_after_tomorrow' => 'прекосјутра', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php b/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php index d0aaee37..2d2e2881 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php @@ -35,4 +35,9 @@ return array( 'week_from_now' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja', 'week_ago' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja', + 'diff_now' => 'upravo sada', + 'diff_yesterday' => 'juče', + 'diff_tomorrow' => 'sutra', + 'diff_before_yesterday' => 'prekjuče', + 'diff_after_tomorrow' => 'preksutra', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php b/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php index d0aaee37..7ebf6f04 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php @@ -9,30 +9,4 @@ * file that was distributed with this source code. */ -return array( - 'year' => '{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count godine|[0,Inf[ :count godina', - 'y' => ':count g.', - 'month' => '{1} :count mjesec|{2,3,4}:count mjeseca|[5,Inf[ :count mjeseci', - 'm' => ':count mj.', - 'week' => '{1} :count nedjelja|{2,3,4}:count nedjelje|[5,Inf[ :count nedjelja', - 'w' => ':count ned.', - 'day' => '{1,21,31} :count dan|[2,Inf[ :count dana', - 'd' => ':count d.', - 'hour' => '{1,21} :count sat|{2,3,4,22,23,24}:count sata|[5,Inf[ :count sati', - 'h' => ':count č.', - 'minute' => '{1,21,31,41,51} :count minut|[2,Inf[ :count minuta', - 'min' => ':count min.', - 'second' => '{1,21,31,41,51} :count sekund|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count sekunde|[5,Inf[:count sekundi', - 's' => ':count sek.', - 'ago' => 'prije :time', - 'from_now' => 'za :time', - 'after' => ':time nakon', - 'before' => ':time prije', - - 'year_from_now' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina', - 'year_ago' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina', - - 'week_from_now' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja', - 'week_ago' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja', - -); +return require __DIR__.'/sr_Latn_ME.php'; diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sv.php b/vendor/nesbot/carbon/src/Carbon/Lang/sv.php index 6bebf7b8..89a03b43 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/sv.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sv.php @@ -10,20 +10,20 @@ */ return array( - 'year' => '1 år|:count år', - 'y' => '1 år|:count år', - 'month' => '1 månad|:count månader', - 'm' => '1 månad|:count månader', - 'week' => '1 vecka|:count veckor', - 'w' => '1 vecka|:count veckor', - 'day' => '1 dag|:count dagar', - 'd' => '1 dag|:count dagar', - 'hour' => '1 timme|:count timmar', - 'h' => '1 timme|:count timmar', - 'minute' => '1 minut|:count minuter', - 'min' => '1 minut|:count minuter', - 'second' => '1 sekund|:count sekunder', - 's' => '1 sekund|:count sekunder', + 'year' => ':count år|:count år', + 'y' => ':count år|:count år', + 'month' => ':count månad|:count månader', + 'm' => ':count månad|:count månader', + 'week' => ':count vecka|:count veckor', + 'w' => ':count vecka|:count veckor', + 'day' => ':count dag|:count dagar', + 'd' => ':count dag|:count dagar', + 'hour' => ':count timme|:count timmar', + 'h' => ':count timme|:count timmar', + 'minute' => ':count minut|:count minuter', + 'min' => ':count minut|:count minuter', + 'second' => ':count sekund|:count sekunder', + 's' => ':count sekund|:count sekunder', 'ago' => ':time sedan', 'from_now' => 'om :time', 'after' => ':time efter', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sw.php b/vendor/nesbot/carbon/src/Carbon/Lang/sw.php new file mode 100644 index 00000000..52f03429 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Lang/sw.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +return array( + 'year' => 'mwaka 1|miaka :count', + 'y' => 'mwaka 1|miaka :count', + 'month' => 'mwezi 1|miezi :count', + 'm' => 'mwezi 1|miezi :count', + 'week' => 'wiki 1|wiki :count', + 'w' => 'wiki 1|wiki :count', + 'day' => 'siku 1|siku :count', + 'd' => 'siku 1|siku :count', + 'hour' => 'saa 1|masaa :count', + 'h' => 'saa 1|masaa :count', + 'minute' => 'dakika 1|dakika :count', + 'min' => 'dakika 1|dakika :count', + 'second' => 'sekunde 1|sekunde :count', + 's' => 'sekunde 1|sekunde :count', + 'ago' => ':time ziliyopita', + 'from_now' => ':time kwanzia sasa', + 'after' => ':time baada', + 'before' => ':time kabla', +); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/th.php b/vendor/nesbot/carbon/src/Carbon/Lang/th.php index c4c402ef..88bb4ac4 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/th.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/th.php @@ -10,22 +10,22 @@ */ return array( - 'year' => '1 ปี|:count ปี', - 'y' => '1 ปี|:count ปี', - 'month' => '1 เดือน|:count เดือน', - 'm' => '1 เดือน|:count เดือน', - 'week' => '1 สัปดาห์|:count สัปดาห์', - 'w' => '1 สัปดาห์|:count สัปดาห์', - 'day' => '1 วัน|:count วัน', - 'd' => '1 วัน|:count วัน', - 'hour' => '1 ชั่วโมง|:count ชั่วโมง', - 'h' => '1 ชั่วโมง|:count ชั่วโมง', - 'minute' => '1 นาที|:count นาที', - 'min' => '1 นาที|:count นาที', - 'second' => '1 วินาที|:count วินาที', - 's' => '1 วินาที|:count วินาที', - 'ago' => ':time ที่แล้ว', - 'from_now' => ':time จากนี้', - 'after' => 'หลัง:time', - 'before' => 'ก่อน:time', + 'year' => ':count ปี', + 'y' => ':count ปี', + 'month' => ':count เดือน', + 'm' => ':count เดือน', + 'week' => ':count สัปดาห์', + 'w' => ':count สัปดาห์', + 'day' => ':count วัน', + 'd' => ':count วัน', + 'hour' => ':count ชั่วโมง', + 'h' => ':count ชั่วโมง', + 'minute' => ':count นาที', + 'min' => ':count นาที', + 'second' => ':count วินาที', + 's' => ':count วินาที', + 'ago' => ':timeที่แล้ว', + 'from_now' => ':timeต่อจากนี้', + 'after' => ':timeหลังจากนี้', + 'before' => ':timeก่อน', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/uk.php b/vendor/nesbot/carbon/src/Carbon/Lang/uk.php index aeebca3d..eaba601b 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/uk.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/uk.php @@ -24,7 +24,7 @@ return array( 'min' => ':count хвилину|:count хвилини|:count хвилин', 'second' => ':count секунду|:count секунди|:count секунд', 's' => ':count секунду|:count секунди|:count секунд', - 'ago' => ':time назад', + 'ago' => ':time тому', 'from_now' => 'через :time', 'after' => ':time після', 'before' => ':time до', diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/uz.php b/vendor/nesbot/carbon/src/Carbon/Lang/uz.php index c997f29d..1cb6f713 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/uz.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/uz.php @@ -10,22 +10,22 @@ */ return array( - 'year' => ':count yil|:count yil|:count yil', - 'y' => ':count yil|:count yil|:count yil', - 'month' => ':count oy|:count oy|:count oylar', - 'm' => ':count oy|:count oy|:count oylar', - 'week' => ':count hafta|:count hafta|:count hafta', - 'w' => ':count hafta|:count hafta|:count hafta', - 'day' => ':count kun|:count kun|:count kun', - 'd' => ':count kun|:count kun|:count kun', - 'hour' => ':count soat|:count soat|:count soat', - 'h' => ':count soat|:count soat|:count soat', - 'minute' => ':count minut|:count minut|:count minut', - 'min' => ':count minut|:count minut|:count minut', - 'second' => ':count sekund|:count sekund|:count sekund', - 's' => ':count sekund|:count sekund|:count sekund', + 'year' => ':count yil', + 'y' => ':count yil', + 'month' => ':count oy', + 'm' => ':count oy', + 'week' => ':count hafta', + 'w' => ':count hafta', + 'day' => ':count kun', + 'd' => ':count kun', + 'hour' => ':count soat', + 'h' => ':count soat', + 'minute' => ':count daqiqa', + 'min' => ':count daq', + 'second' => ':count soniya', + 's' => ':count s', 'ago' => ':time avval', - 'from_now' => ':time keyin', + 'from_now' => ':time dan keyin', 'after' => ':time keyin', 'before' => ':time oldin', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php b/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php index 6c1d417f..c848723b 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php @@ -10,22 +10,22 @@ */ return array( - 'year' => ':count 年', - 'y' => ':count 年', - 'month' => ':count 月', - 'm' => ':count 月', - 'week' => ':count 周', - 'w' => ':count 周', - 'day' => ':count 天', - 'd' => ':count 天', - 'hour' => ':count 小時', - 'h' => ':count 小時', - 'minute' => ':count 分鐘', - 'min' => ':count 分鐘', - 'second' => ':count 秒', - 's' => ':count 秒', + 'year' => ':count年', + 'y' => ':count年', + 'month' => ':count月', + 'm' => ':count月', + 'week' => ':count週', + 'w' => ':count週', + 'day' => ':count天', + 'd' => ':count天', + 'hour' => ':count小時', + 'h' => ':count小時', + 'minute' => ':count分鐘', + 'min' => ':count分鐘', + 'second' => ':count秒', + 's' => ':count秒', 'ago' => ':time前', - 'from_now' => '距現在 :time', + 'from_now' => '距現在:time', 'after' => ':time後', 'before' => ':time前', ); diff --git a/vendor/nesbot/carbon/src/Carbon/Translator.php b/vendor/nesbot/carbon/src/Carbon/Translator.php new file mode 100644 index 00000000..12115b00 --- /dev/null +++ b/vendor/nesbot/carbon/src/Carbon/Translator.php @@ -0,0 +1,143 @@ +addLoader('array', new Translation\Loader\ArrayLoader()); + parent::__construct($locale, $formatter, $cacheDir, $debug); + } + + /** + * Reset messages of a locale (all locale if no locale passed). + * Remove custom messages and reload initial messages from matching + * file in Lang directory. + * + * @param string|null $locale + * + * @return bool + */ + public function resetMessages($locale = null) + { + if ($locale === null) { + static::$messages = array(); + + return true; + } + + if (file_exists($filename = __DIR__.'/Lang/'.$locale.'.php')) { + static::$messages[$locale] = require $filename; + $this->addResource('array', static::$messages[$locale], $locale); + + return true; + } + + return false; + } + + /** + * Init messages language from matching file in Lang directory. + * + * @param string $locale + * + * @return bool + */ + protected function loadMessagesFromFile($locale) + { + if (isset(static::$messages[$locale])) { + return true; + } + + return $this->resetMessages($locale); + } + + /** + * Set messages of a locale and take file first if present. + * + * @param string $locale + * @param array $messages + * + * @return $this + */ + public function setMessages($locale, $messages) + { + $this->loadMessagesFromFile($locale); + $this->addResource('array', $messages, $locale); + static::$messages[$locale] = array_merge( + isset(static::$messages[$locale]) ? static::$messages[$locale] : array(), + $messages + ); + + return $this; + } + + /** + * Get messages of a locale, if none given, return all the + * languages. + * + * @param string|null $locale + * + * @return array + */ + public function getMessages($locale = null) + { + return $locale === null ? static::$messages : static::$messages[$locale]; + } + + /** + * Set the current translator locale and indicate if the source locale file exists + * + * @param string $locale locale ex. en + * + * @return bool + */ + public function setLocale($locale) + { + $locale = preg_replace_callback('/[-_]([a-z]{2,})/', function ($matches) { + // _2-letters is a region, _3+-letters is a variant + return '_'.call_user_func(strlen($matches[1]) > 2 ? 'ucfirst' : 'strtoupper', $matches[1]); + }, strtolower($locale)); + + if ($this->loadMessagesFromFile($locale)) { + parent::setLocale($locale); + + return true; + } + + return false; + } +} diff --git a/vendor/nesbot/carbon/src/JsonSerializable.php b/vendor/nesbot/carbon/src/JsonSerializable.php new file mode 100644 index 00000000..b678e736 --- /dev/null +++ b/vendor/nesbot/carbon/src/JsonSerializable.php @@ -0,0 +1,16 @@ +json_encode, + * which is a value of any type other than a resource. + * + * @since 5.4.0 + */ + public function jsonSerialize(); +} diff --git a/vendor/nikic/php-parser/.travis.yml b/vendor/nikic/php-parser/.travis.yml index 9cd00253..989d7a04 100644 --- a/vendor/nikic/php-parser/.travis.yml +++ b/vendor/nikic/php-parser/.travis.yml @@ -7,14 +7,13 @@ cache: - $HOME/.composer/cache php: - - 5.5 - - 5.6 - 7.0 + - 7.1 + - 7.2 - nightly - - hhvm install: - - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then composer require satooshi/php-coveralls '~1.0'; fi + - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then composer require satooshi/php-coveralls '~1.0'; fi - composer install --prefer-dist matrix: @@ -23,9 +22,8 @@ matrix: fast_finish: true script: - - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi - - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then test_old/run-php-src.sh; fi + - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi + - if [ $TRAVIS_PHP_VERSION = '7.1' ]; then test_old/run-php-src.sh; fi after_success: - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then php vendor/bin/coveralls; fi - + - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then php vendor/bin/coveralls; fi diff --git a/vendor/nikic/php-parser/CHANGELOG.md b/vendor/nikic/php-parser/CHANGELOG.md index dcec1ff3..3c812a28 100644 --- a/vendor/nikic/php-parser/CHANGELOG.md +++ b/vendor/nikic/php-parser/CHANGELOG.md @@ -1,8 +1,153 @@ -Version 3.1.5-dev +Version 4.0.3-dev ----------------- Nothing yet. +Version 4.0.2 (2018-06-03) +-------------------------- + +### Added + +* Improved error recovery inside classes. +* Support error recovery for `foreach` without `as`. +* Support error recovery for parameters without variable (`function (Type ) {}`). +* Support error recovery for functions without body (`function ($foo)`). + +Version 4.0.1 (2018-03-25) +-------------------------- + +### Added + +* [PHP 7.3] Added support for trailing commas in function calls. +* [PHP 7.3] Added support for by-reference array destructuring. +* Added checks to node traverser to prevent replacing a statement with an expression or vice versa. + This should prevent common mistakes in the implementation of node visitors. +* Added the following methods to `BuilderFactory`, to simplify creation of expressions: + * `funcCall()` + * `methodCall()` + * `staticCall()` + * `new()` + * `constFetch()` + * `classConstFetch()` + +Version 4.0.0 (2018-02-28) +-------------------------- + +* No significant code changes since the beta 1 release. + +Version 4.0.0-beta1 (2018-01-27) +-------------------------------- + +### Fixed + +* In formatting-preserving pretty printer: Fixed indentation when inserting into lists. (#466) + +### Added + +* In formatting-preserving pretty printer: Improved formatting of elements inserted into multi-line + arrays. + +### Removed + +* The `Autoloader` class has been removed. It is now required to use the Composer autoloader. + +Version 4.0.0-alpha3 (2017-12-26) +--------------------------------- + +### Fixed + +* In the formatting-preserving pretty printer: + * Fixed comment indentation. + * Fixed handling of inline HTML in the fallback case. + * Fixed insertion into list nodes that require creation of a code block. + +### Added + +* Added support for inserting at the start of list nodes in formatting-preserving pretty printer. + +Version 4.0.0-alpha2 (2017-11-10) +--------------------------------- + +### Added + +* In the formatting-preserving pretty printer: + * Added support for changing modifiers. + * Added support for anonymous classes. + * Added support for removing from list nodes. + * Improved support for changing comments. +* Added start token offsets to comments. + +Version 4.0.0-alpha1 (2017-10-18) +--------------------------------- + +### Added + +* Added experimental support for format-preserving pretty-printing. In this mode formatting will be + preserved for parts of the code which have not been modified. +* Added `replaceNodes` option to `NameResolver`, defaulting to true. If this option is disabled, + resolved names will be added as `resolvedName` attributes, instead of replacing the original + names. +* Added `NodeFinder` class, which can be used to find nodes based on a callback or class name. This + is a utility to avoid custom node visitor implementations for simple search operations. +* Added `ClassMethod::isMagic()` method. +* Added `BuilderFactory` methods: `val()` method for creating an AST for a simple value, `concat()` + for creating concatenation trees, `args()` for preparing function arguments. +* Added `NameContext` class, which encapsulates the `NameResolver` logic independently of the actual + AST traversal. This facilitates use in other context, such as class names in doc comments. + Additionally it provides an API for getting the shortest representation of a name. +* Added `Node::setAttributes()` method. +* Added `JsonDecoder`. This allows conversion JSON back into an AST. +* Added `Name` methods `toLowerString()` and `isSpecialClassName()`. +* Added `Identifier` and `VarLikeIdentifier` nodes, which are used in place of simple strings in + many places. +* Added `getComments()`, `getStartLine()`, `getEndLine()`, `getStartTokenPos()`, `getEndTokenPos()`, + `getStartFilePos()` and `getEndFilePos()` methods to `Node`. These provide a more obvious access + point for the already existing attributes of the same name. +* Added `ConstExprEvaluator` to evaluate constant expressions to PHP values. +* Added `Expr\BinaryOp::getOperatorSigil()`, returning `+` for `Expr\BinaryOp\Plus`, etc. + +### Changed + +* Many subnodes that previously held simple strings now use `Identifier` (or `VarLikeIdentifier`) + nodes. Please see the UPGRADE-4.0 file for an exhaustive list of affected nodes and some notes on + possible impact. +* Expression statements (`expr;`) are now represented using a `Stmt\Expression` node. Previously + these statements were directly represented as their constituent expression. +* The `name` subnode of `Param` has been renamed to `var` and now contains a `Variable` rather than + a plain string. +* The `name` subnode of `StaticVar` has been renamed to `var` and now contains a `Variable` rather + than a plain string. +* The `var` subnode of `ClosureUse` now contains a `Variable` rather than a plain string. +* The `var` subnode of `Catch` now contains a `Variable` rather than a plain string. +* The `alias` subnode of `UseUse` is now `null` if no explicit alias is given. As such, + `use Foo\Bar` and `use Foo\Bar as Bar` are now represented differently. The `getAlias()` method + can be used to get the effective alias, even if it is not explicitly given. + +### Removed + +* Support for running on PHP 5 and HHVM has been removed. You can however still parse code of old + PHP versions (such as PHP 5.2), while running on PHP 7. +* Removed `type` subnode on `Class`, `ClassMethod` and `Property` nodes. Use `flags` instead. +* The `ClassConst::isStatic()` method has been removed. Constants cannot have a static modifier. +* The `NodeTraverser` no longer accepts `false` as a return value from a `leaveNode()` method. + `NodeTraverser::REMOVE_NODE` should be returned instead. +* The `Node::setLine()` method has been removed. If you really need to, you can use `setAttribute()` + instead. +* The misspelled `Class_::VISIBILITY_MODIFER_MASK` constant has been dropped in favor of + `Class_::VISIBILITY_MODIFIER_MASK`. +* The XML serializer has been removed. As such, the classes `Serializer\XML`, and + `Unserializer\XML`, as well as the interfaces `Serializer` and `Unserializer` no longer exist. +* The `BuilderAbstract` class has been removed. It's functionality is moved into `BuilderHelpers`. + However, this is an internal class and should not be used directly. + +Version 3.1.5 (2018-02-28) +-------------------------- + +### Fixed + +* Fixed duplicate comment assignment in switch statements. (#469) +* Improve compatibility with PHP-Scoper. (#477) + Version 3.1.4 (2018-01-25) -------------------------- @@ -47,7 +192,7 @@ Version 3.1.0 (2017-07-28) * [PHP 7.2] Added support for trailing comma in group use statements. * [PHP 7.2] Added support for `object` type. This means `object` types will now be represented as a builtin type (a simple `"object"` string), rather than a class `Name`. - + ### Fixed * Floating-point numbers are now printed correctly if the LC_NUMERIC locale uses a comma as decimal @@ -167,7 +312,7 @@ This release primarily improves our support for error recovery. `NameResolver::__construct()`. * The `NameResolver` now adds a `namespacedName` attribute on name nodes that cannot be statically resolved (unqualified unaliased function or constant names in namespaces). - + ### Fixed * Fixed attribute assignment for `GroupUse` prefix and variables in interpolated strings. @@ -257,7 +402,7 @@ Additionally the following changes were made: takes an array of subnodes. Unlike classes/interfaces, traits can only have a `stmts` subnode. * The `NodeDumper` now prints class/method/property/constant modifiers, as well as the include and use type in a textual representation, instead of only showing the number. -* All methods on `PrettyPrinter\Standard` are now protected. Previoulsy most of them were public. +* All methods on `PrettyPrinter\Standard` are now protected. Previously most of them were public. ### Removed @@ -295,7 +440,7 @@ Version 2.1.0 (2016-04-19) * Added `kind` attribute to `Expr\Exit` to distinguish between `exit` and `die`. * Added `kind` attribute to `Scalar\LNumber` to distinguish between decimal, binary, octal and hexadecimal numbers. -* Added `kind` attribtue to `Expr\Array` to distinguish between `array()` and `[]`. +* Added `kind` attribute to `Expr\Array` to distinguish between `array()` and `[]`. * Added `kind` attribute to `Scalar\String` and `Scalar\Encapsed` to distinguish between single-quoted, double-quoted, heredoc and nowdoc string. * Added `docLabel` attribute to `Scalar\String` and `Scalar\Encapsed`, if it is a heredoc or @@ -411,4 +556,4 @@ A more detailed description of backwards incompatible changes can be found in th **This changelog only includes changes from the 2.0 series. For older changes see the [1.x series changelog](https://github.com/nikic/PHP-Parser/blob/1.x/CHANGELOG.md) and the -[0.9 series changelog](https://github.com/nikic/PHP-Parser/blob/0.9/CHANGELOG.md).** \ No newline at end of file +[0.9 series changelog](https://github.com/nikic/PHP-Parser/blob/0.9/CHANGELOG.md).** diff --git a/vendor/nikic/php-parser/README.md b/vendor/nikic/php-parser/README.md index 2f62754c..7b1fedab 100644 --- a/vendor/nikic/php-parser/README.md +++ b/vendor/nikic/php-parser/README.md @@ -3,97 +3,223 @@ PHP Parser [![Build Status](https://travis-ci.org/nikic/PHP-Parser.svg?branch=master)](https://travis-ci.org/nikic/PHP-Parser) [![Coverage Status](https://coveralls.io/repos/github/nikic/PHP-Parser/badge.svg?branch=master)](https://coveralls.io/github/nikic/PHP-Parser?branch=master) -This is a PHP 5.2 to PHP 7.1 parser written in PHP. Its purpose is to simplify static code analysis and +This is a PHP 5.2 to PHP 7.2 parser written in PHP. Its purpose is to simplify static code analysis and manipulation. -[**Documentation for version 3.x**][doc_master] (stable; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.1). +[**Documentation for version 4.x**][doc_master] (stable; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 7.2). -[Documentation for version 2.x][doc_2_x] (stable; for running on PHP >= 5.4; for parsing PHP 5.2 to PHP 7.0). +[Documentation for version 3.x][doc_3_x] (stable; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2). -[Documentation for version 1.x][doc_1_x] (unsupported; for running on PHP >= 5.3; for parsing PHP 5.2 to PHP 5.6). +Features +-------- -In a Nutshell -------------- +The main features provided by this library are: -The parser turns PHP source code into an abstract syntax tree. For example, if you pass the following code into the -parser: + * Parsing PHP 5 and PHP 7 code into an abstract syntax tree (AST). + * Invalid code can be parsed into a partial AST. + * The AST contains accurate location information. + * Dumping the AST in human-readable form. + * Converting an AST back to PHP code. + * Experimental: Formatting can be preserved for partially changed ASTs. + * Infrastructure to traverse and modify ASTs. + * Resolution of namespaced names. + * Evaluation of constant expressions. + * Builders to simplify AST construction for code generation. + * Converting an AST into JSON and back. + +Quick Start +----------- + +Install the library using [composer](https://getcomposer.org): + + php composer.phar require nikic/php-parser + +Parse some PHP code into an AST and dump the result in human-readable form: ```php create(ParserFactory::PREFER_PHP7); +try { + $ast = $parser->parse($code); +} catch (Error $error) { + echo "Parse error: {$error->getMessage()}\n"; + return; +} + +$dumper = new NodeDumper; +echo $dumper->dump($ast) . "\n"; ``` -You'll get a syntax tree looking roughly like this: +This dumps an AST looking something like this: -```php +``` array( - 0: Stmt_Echo( - exprs: array( - 0: Scalar_String( - value: Hi - ) - 1: Scalar_String( - value: World + 0: Stmt_Function( + byRef: false + name: Identifier( + name: test + ) + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: foo + ) + default: null ) ) - ) - 1: Expr_FuncCall( - name: Name( - parts: array( - 0: hello - 1: world - ) - ) - args: array( - 0: Arg( - value: Scalar_String( - value: foo - ) - byRef: false - ) - 1: Arg( - value: Expr_Concat( - left: Scalar_String( - value: bar + returnType: null + stmts: array( + 0: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: var_dump + ) ) - right: Scalar_String( - value: baz + args: array( + 0: Arg( + value: Expr_Variable( + name: foo + ) + byRef: false + unpack: false + ) ) ) - byRef: false ) ) ) ) ``` -You can then work with this syntax tree, for example to statically analyze the code (e.g. to find -programming errors or security issues). +Let's traverse the AST and perform some kind of modification. For example, drop all function bodies: -Additionally, you can convert a syntax tree back to PHP code. This allows you to do code preprocessing -(like automatedly porting code to older PHP versions). +```php +use PhpParser\Node; +use PhpParser\Node\Stmt\Function_; +use PhpParser\NodeTraverser; +use PhpParser\NodeVisitorAbstract; -Installation ------------- +$traverser = new NodeTraverser(); +$traverser->addVisitor(new class extends NodeVisitorAbstract { + public function enterNode(Node $node) { + if ($node instanceof Function_) { + // Clean out the function body + $node->stmts = []; + } + } +}); -The preferred installation method is [composer](https://getcomposer.org): +$ast = $traverser->traverse($ast); +echo $dumper->dump($ast) . "\n"; +``` - php composer.phar require nikic/php-parser +This gives us an AST where the `Function_::$stmts` are empty: + +``` +array( + 0: Stmt_Function( + byRef: false + name: Identifier( + name: test + ) + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: foo + ) + default: null + ) + ) + returnType: null + stmts: array( + ) + ) +) +``` + +Finally, we can convert the new AST back to PHP code: + +```php +use PhpParser\PrettyPrinter; + +$prettyPrinter = new PrettyPrinter\Standard; +echo $prettyPrinter->prettyPrintFile($ast); +``` + +This gives us our original code, minus the `var_dump()` call inside the function: + +```php +nl`. + +### Removed functionality + +* Removed `type` subnode on `Class_`, `ClassMethod` and `Property` nodes. Use `flags` instead. +* The `ClassConst::isStatic()` method has been removed. Constants cannot have a static modifier. +* The `NodeTraverser` no longer accepts `false` as a return value from a `leaveNode()` method. + `NodeTraverser::REMOVE_NODE` should be returned instead. +* The `Node::setLine()` method has been removed. If you really need to, you can use `setAttribute()` + instead. +* The misspelled `Class_::VISIBILITY_MODIFER_MASK` constant has been dropped in favor of + `Class_::VISIBILITY_MODIFIER_MASK`. +* The XML serializer has been removed. As such, the classes `Serializer\XML`, and + `Unserializer\XML`, as well as the interfaces `Serializer` and `Unserializer` no longer exist. +* The `BuilderAbstract` class has been removed. It's functionality is moved into `BuilderHelpers`. + However, this is an internal class and should not be used directly. +* The `Autoloader` class has been removed in favor of relying on the Composer autoloader. diff --git a/vendor/nikic/php-parser/bin/php-parse b/vendor/nikic/php-parser/bin/php-parse index 1760e758..5dd01ba1 100755 --- a/vendor/nikic/php-parser/bin/php-parse +++ b/vendor/nikic/php-parser/bin/php-parse @@ -26,9 +26,9 @@ if (empty($files)) { showHelp("Must specify at least one file."); } -$lexer = new PhpParser\Lexer\Emulative(array('usedAttributes' => array( +$lexer = new PhpParser\Lexer\Emulative(['usedAttributes' => [ 'startLine', 'endLine', 'startFilePos', 'endFilePos', 'comments' -))); +]]); $parser = (new PhpParser\ParserFactory)->create( PhpParser\ParserFactory::PREFER_PHP7, $lexer @@ -38,7 +38,6 @@ $dumper = new PhpParser\NodeDumper([ 'dumpPositions' => $attributes['with-positions'], ]); $prettyPrinter = new PhpParser\PrettyPrinter\Standard; -$serializer = new PhpParser\Serializer\XML; $traverser = new PhpParser\NodeTraverser(); $traverser->addVisitor(new PhpParser\NodeVisitor\NameResolver); @@ -82,9 +81,9 @@ foreach ($files as $file) { } elseif ('pretty-print' === $operation) { echo "==> Pretty print:\n"; echo $prettyPrinter->prettyPrintFile($stmts), "\n"; - } elseif ('serialize-xml' === $operation) { - echo "==> Serialized XML:\n"; - echo $serializer->serialize($stmts), "\n"; + } elseif ('json-dump' === $operation) { + echo "==> JSON dump:\n"; + echo json_encode($stmts, JSON_PRETTY_PRINT), "\n"; } elseif ('var-dump' === $operation) { echo "==> var_dump():\n"; var_dump($stmts); @@ -116,7 +115,7 @@ Operations is a list of the following options (--dump by default): -d, --dump Dump nodes using NodeDumper -p, --pretty-print Pretty print file using PrettyPrinter\Standard - --serialize-xml Serialize nodes using Serializer\XML + -j, --json-dump Print json_encode() result --var-dump var_dump() nodes (for exact structure) -N, --resolve-names Resolve names using NodeVisitor\NameResolver -c, --with-column-info Show column-numbers for errors (if available) @@ -135,13 +134,13 @@ OUTPUT } function parseArgs($args) { - $operations = array(); - $files = array(); - $attributes = array( + $operations = []; + $files = []; + $attributes = [ 'with-column-info' => false, 'with-positions' => false, 'with-recovery' => false, - ); + ]; array_shift($args); $parseOptions = true; @@ -160,8 +159,9 @@ function parseArgs($args) { case '-p': $operations[] = 'pretty-print'; break; - case '--serialize-xml': - $operations[] = 'serialize-xml'; + case '--json-dump': + case '-j': + $operations[] = 'json-dump'; break; case '--var-dump': $operations[] = 'var-dump'; @@ -198,5 +198,5 @@ function parseArgs($args) { } } - return array($operations, $files, $attributes); + return [$operations, $files, $attributes]; } diff --git a/vendor/nikic/php-parser/composer.json b/vendor/nikic/php-parser/composer.json index 66df90a8..7ae425ff 100644 --- a/vendor/nikic/php-parser/composer.json +++ b/vendor/nikic/php-parser/composer.json @@ -10,11 +10,11 @@ } ], "require": { - "php": ">=5.5", + "php": ">=7.0", "ext-tokenizer": "*" }, "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" + "phpunit/phpunit": "^6.5 || ^7.0" }, "autoload": { "psr-4": { @@ -24,7 +24,7 @@ "bin": ["bin/php-parse"], "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } } } diff --git a/vendor/nikic/php-parser/doc/0_Introduction.markdown b/vendor/nikic/php-parser/doc/0_Introduction.markdown index ca1ceb2e..240f7fde 100644 --- a/vendor/nikic/php-parser/doc/0_Introduction.markdown +++ b/vendor/nikic/php-parser/doc/0_Introduction.markdown @@ -1,7 +1,7 @@ Introduction ============ -This project is a PHP 5.2 to PHP 7.1 parser **written in PHP itself**. +This project is a PHP 5.2 to PHP 7.2 parser **written in PHP itself**. What is this for? ----------------- @@ -14,7 +14,7 @@ There are other ways of processing source code. One that PHP supports natively i token stream generated by [`token_get_all`][2]. The token stream is much more low level than the AST and thus has different applications: It allows to also analyze the exact formatting of a file. On the other hand the token stream is much harder to deal with for more complex analysis. -For example an AST abstracts away the fact that in PHP variables can be written as `$foo`, but also +For example, an AST abstracts away the fact that, in PHP, variables can be written as `$foo`, but also as `$$bar`, `${'foobar'}` or even `${!${''}=barfoo()}`. You don't have to worry about recognizing all the different syntaxes from a stream of tokens. @@ -26,17 +26,17 @@ programmatic PHP code analysis are incidentally PHP developers, not C developers What can it parse? ------------------ -The parser supports parsing PHP 5.2-5.6 and PHP 7. +The parser supports parsing PHP 5.2-7.2. As the parser is based on the tokens returned by `token_get_all` (which is only able to lex the PHP version it runs on), additionally a wrapper for emulating tokens from newer versions is provided. -This allows to parse PHP 7.1 source code running on PHP 5.5, for example. This emulation is somewhat +This allows to parse PHP 7.2 source code running on PHP 5.5, for example. This emulation is somewhat hacky and not perfect, but it should work well on any sane code. What output does it produce? ---------------------------- -The parser produces an [Abstract Syntax Tree][1] (AST) also known as a node tree. How this looks like +The parser produces an [Abstract Syntax Tree][1] (AST) also known as a node tree. How this looks can best be seen in an example. The program `create(ParserFactory::PREFER_PHP7); try { @@ -66,27 +74,68 @@ try { A parser instance can be reused to parse multiple files. -Node tree ---------- +Node dumping +------------ -If you use the above code with `$code = "dump($stmts), "\n"; +``` + +For the sample code from the previous section, this will produce the following output: ``` array( - 0: Stmt_Echo( - exprs: array( - 0: Scalar_String( - value: Hi + 0: Stmt_Function( + byRef: false + name: Identifier( + name: printLine + ) + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: msg + ) + default: null ) - 1: Expr_FuncCall( - name: Name( - parts: array( - 0: hi - 1: getTarget + ) + returnType: null + stmts: array( + 0: Stmt_Echo( + exprs: array( + 0: Expr_Variable( + name: msg + ) + 1: Scalar_String( + value: + ) ) - args: array( + ) + ) + ) + 1: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: printLine + ) + ) + args: array( + 0: Arg( + value: Scalar_String( + value: Hello World!!! + ) + byRef: false + unpack: false ) ) ) @@ -94,10 +143,30 @@ array( ) ``` -Thus `$stmts` will contain an array with only one node, with this node being an instance of -`PhpParser\Node\Stmt\Echo_`. +You can also use the `php-parse` script to obtain such a node dump by calling it either with a file +name or code string: -As PHP is a large language there are approximately 140 different nodes. In order to make work +```sh +vendor/bin/php-parse file.php +vendor/bin/php-parse " PhpParser\Node\Stmt\Function_` + * `Stmt_Expression -> PhpParser\Node\Stmt\Expression` + +The additional `_` at the end of the first class name is necessary, because `Function` is a +reserved keyword. Many node class names in this library have a trailing `_` to avoid clashing with +a keyword. + +As PHP is a large language there are approximately 140 different nodes. In order to make working with them easier they are grouped into three categories: * `PhpParser\Node\Stmt`s are statement nodes, i.e. language constructs that do not return @@ -113,8 +182,9 @@ with them easier they are grouped into three categories: * There are some nodes not in either of these groups, for example names (`PhpParser\Node\Name`) and call arguments (`PhpParser\Node\Arg`). -Some node class names have a trailing `_`. This is used whenever the class name would otherwise clash -with a PHP keyword. +The `Node\Stmt\Expression` node is somewhat confusing in that it contains both the terms "statement" +and "expression". This node distinguishes `expr`, which is a `Node\Expr`, from `expr;`, which is +an "expression statement" represented by `Node\Stmt\Expression` and containing `expr` as a sub-node. Every node has a (possibly zero) number of subnodes. You can access subnodes by writing `$node->subNodeName`. The `Stmt\Echo_` node has only one subnode `exprs`. So in order to access it @@ -173,7 +243,7 @@ try { The above code will output: - parse()`, then changed and then again converted to code using `PhpParser\PrettyPrinter\Standard->prettyPrint()`. @@ -184,6 +254,8 @@ single expression using `prettyPrintExpr()`. The `prettyPrintFile()` method can be used to print an entire file. This will include the opening ` Read more: [Pretty printing documentation](component/Pretty_printing.markdown) + Node traversation ----------------- @@ -278,10 +350,12 @@ be `array(A, X, Y, Z, C)`. Instead of manually implementing the `NodeVisitor` interface you can also extend the `NodeVisitorAbstract` class, which will define empty default implementations for all the above methods. +> Read more: [Walking the AST](component/Walking_the_AST.markdown) + The NameResolver node visitor ----------------------------- -One visitor is already bundled with the package: `PhpParser\NodeVisitor\NameResolver`. This visitor +One visitor that is already bundled with the package is `PhpParser\NodeVisitor\NameResolver`. This visitor helps you work with namespaced code by trying to resolve most names to fully qualified ones. For example, consider the following code: @@ -292,7 +366,7 @@ For example, consider the following code: In order to know that `B\C` really is `A\C` you would need to track aliases and namespaces yourself. The `NameResolver` takes care of that and resolves names as far as possible. -After running it most names will be fully qualified. The only names that will stay unqualified are +After running it, most names will be fully qualified. The only names that will stay unqualified are unqualified function and constant names. These are resolved at runtime and thus the visitor can't know which function they are referring to. In most cases this is a non-issue as the global functions are meant. @@ -300,6 +374,8 @@ are meant. Also the `NameResolver` adds a `namespacedName` subnode to class, function and constant declarations that contains the namespaced name instead of only the shortname that is available via `name`. +> Read more: [Name resolution documentation](component/Name_resolution.markdown) + Example: Converting namespaced code to pseudo namespaces -------------------------------------------------------- @@ -333,7 +409,7 @@ $files = new \RegexIterator($files, '/\.php$/'); foreach ($files as $file) { try { // read the file that should be converted - $code = file_get_contents($file); + $code = file_get_contents($file->getPathName()); // parse $stmts = $parser->parse($code); @@ -365,7 +441,7 @@ class NamespaceConverter extends \PhpParser\NodeVisitorAbstract { public function leaveNode(Node $node) { if ($node instanceof Node\Name) { - return new Node\Name($node->toString('_')); + return new Node\Name(str_replace('\\', '_', $node->toString())); } } } @@ -373,7 +449,7 @@ class NamespaceConverter extends \PhpParser\NodeVisitorAbstract The above code profits from the fact that the `NameResolver` already resolved all names as far as possible, so we don't need to do that. We only need to create a string with the name parts separated -by underscores instead of backslashes. This is what `$node->toString('_')` does. (If you want to +by underscores instead of backslashes. This is what `str_replace('\\', '_', $node->toString())` does. (If you want to create a name with backslashes either write `$node->toString()` or `(string) $node`.) Then we create a new name from the string and return it. Returning a new node replaces the old node. @@ -389,14 +465,14 @@ class NodeVisitor_NamespaceConverter extends \PhpParser\NodeVisitorAbstract { public function leaveNode(Node $node) { if ($node instanceof Node\Name) { - return new Node\Name($node->toString('_')); + return new Node\Name(str_replace('\\', '_', $node->toString())); } elseif ($node instanceof Stmt\Class_ || $node instanceof Stmt\Interface_ || $node instanceof Stmt\Function_) { - $node->name = $node->namespacedName->toString('_'); + $node->name = str_replace('\\', '_', $node->namespacedName->toString()); } elseif ($node instanceof Stmt\Const_) { foreach ($node->consts as $const) { - $const->name = $const->namespacedName->toString('_'); + $const->name = str_replace('\\', '_', $const->namespacedName->toString()); } } } @@ -410,26 +486,27 @@ The last thing we need to do is remove the `namespace` and `use` statements: ```php use PhpParser\Node; use PhpParser\Node\Stmt; +use PhpParser\NodeTraverser; class NodeVisitor_NamespaceConverter extends \PhpParser\NodeVisitorAbstract { public function leaveNode(Node $node) { if ($node instanceof Node\Name) { - return new Node\Name($node->toString('_')); + return new Node\Name(str_replace('\\', '_', $node->toString())); } elseif ($node instanceof Stmt\Class_ || $node instanceof Stmt\Interface_ || $node instanceof Stmt\Function_) { - $node->name = $node->namespacedName->toString('_'); + $node->name = str_replace('\\', '_', $node->namespacedName->toString(); } elseif ($node instanceof Stmt\Const_) { foreach ($node->consts as $const) { - $const->name = $const->namespacedName->toString('_'); + $const->name = str_replace('\\', '_', $const->namespacedName->toString()); } } elseif ($node instanceof Stmt\Namespace_) { // returning an array merges is into the parent array return $node->stmts; } elseif ($node instanceof Stmt\Use_) { - // returning false removed the node altogether - return false; + // remove use nodes altogether + return NodeTraverser::REMOVE_NODE; } } } diff --git a/vendor/nikic/php-parser/doc/3_Other_node_tree_representations.markdown b/vendor/nikic/php-parser/doc/3_Other_node_tree_representations.markdown deleted file mode 100644 index 0830f399..00000000 --- a/vendor/nikic/php-parser/doc/3_Other_node_tree_representations.markdown +++ /dev/null @@ -1,330 +0,0 @@ -Other node tree representations -=============================== - -It is possible to convert the AST into several textual representations, which serve different uses. - -Simple serialization --------------------- - -It is possible to serialize the node tree using `serialize()` and also unserialize it using -`unserialize()`. The output is not human readable and not easily processable from anything -but PHP, but it is compact and generates quickly. The main application thus is in caching. - -Human readable dumping ----------------------- - -Furthermore it is possible to dump nodes into a human readable format using the `dump` method of -`PhpParser\NodeDumper`. This can be used for debugging. - -```php -$code = <<<'CODE' -create(PhpParser\ParserFactory::PREFER_PHP7); -$nodeDumper = new PhpParser\NodeDumper; - -try { - $stmts = $parser->parse($code); - - echo $nodeDumper->dump($stmts), "\n"; -} catch (PhpParser\Error $e) { - echo 'Parse Error: ', $e->getMessage(); -} -``` - -The above script will have an output looking roughly like this: - -``` -array( - 0: Stmt_Function( - byRef: false - params: array( - 0: Param( - name: msg - default: null - type: null - byRef: false - ) - ) - stmts: array( - 0: Stmt_Echo( - exprs: array( - 0: Expr_Variable( - name: msg - ) - 1: Scalar_String( - value: - - ) - ) - ) - ) - name: printLine - ) - 1: Expr_FuncCall( - name: Name( - parts: array( - 0: printLine - ) - ) - args: array( - 0: Arg( - value: Scalar_String( - value: Hello World!!! - ) - byRef: false - ) - ) - ) -) -``` - -JSON encoding -------------- - -Nodes (and comments) implement the `JsonSerializable` interface. As such, it is possible to JSON -encode the AST directly using `json_encode()`: - -```php -$code = <<<'CODE' -create(PhpParser\ParserFactory::PREFER_PHP7); -$nodeDumper = new PhpParser\NodeDumper; - -try { - $stmts = $parser->parse($code); - - echo json_encode($stmts, JSON_PRETTY_PRINT), "\n"; -} catch (PhpParser\Error $e) { - echo 'Parse Error: ', $e->getMessage(); -} -``` - -This will result in the following output (which includes attributes): - -```json -[ - { - "nodeType": "Stmt_Function", - "byRef": false, - "name": "printLine", - "params": [ - { - "nodeType": "Param", - "type": null, - "byRef": false, - "variadic": false, - "name": "msg", - "default": null, - "attributes": { - "startLine": 3, - "endLine": 3 - } - } - ], - "returnType": null, - "stmts": [ - { - "nodeType": "Stmt_Echo", - "exprs": [ - { - "nodeType": "Expr_Variable", - "name": "msg", - "attributes": { - "startLine": 4, - "endLine": 4 - } - }, - { - "nodeType": "Scalar_String", - "value": "\n", - "attributes": { - "startLine": 4, - "endLine": 4, - "kind": 2 - } - } - ], - "attributes": { - "startLine": 4, - "endLine": 4 - } - } - ], - "attributes": { - "startLine": 3, - "endLine": 5 - } - }, - { - "nodeType": "Expr_FuncCall", - "name": { - "nodeType": "Name", - "parts": [ - "printLine" - ], - "attributes": { - "startLine": 7, - "endLine": 7 - } - }, - "args": [ - { - "nodeType": "Arg", - "value": { - "nodeType": "Scalar_String", - "value": "Hello World!!!", - "attributes": { - "startLine": 7, - "endLine": 7, - "kind": 1 - } - }, - "byRef": false, - "unpack": false, - "attributes": { - "startLine": 7, - "endLine": 7 - } - } - ], - "attributes": { - "startLine": 7, - "endLine": 7 - } - } -] -``` - -There is currently no mechanism to convert JSON back into a node tree. Furthermore, not all ASTs -can be JSON encoded. In particular, JSON only supports UTF-8 strings. - -Serialization to XML --------------------- - -It is also possible to serialize the node tree to XML using `PhpParser\Serializer\XML->serialize()` -and to unserialize it using `PhpParser\Unserializer\XML->unserialize()`. This is useful for -interfacing with other languages and applications or for doing transformation using XSLT. - -```php -create(PhpParser\ParserFactory::PREFER_PHP7); -$serializer = new PhpParser\Serializer\XML; - -try { - $stmts = $parser->parse($code); - - echo $serializer->serialize($stmts); -} catch (PhpParser\Error $e) { - echo 'Parse Error: ', $e->getMessage(); -} -``` - -Produces: - -```xml - - - - - - - - - - - - msg - - - - - - - - - - - - - - - - - - - - - msg - - - - - - - - - - - - - - - printLine - - - - - - - - printLine - - - - - - - - - - - Hello World!!! - - - - - - - - - - - - -``` \ No newline at end of file diff --git a/vendor/nikic/php-parser/doc/4_Code_generation.markdown b/vendor/nikic/php-parser/doc/4_Code_generation.markdown deleted file mode 100644 index 2c0aa0ed..00000000 --- a/vendor/nikic/php-parser/doc/4_Code_generation.markdown +++ /dev/null @@ -1,84 +0,0 @@ -Code generation -=============== - -It is also possible to generate code using the parser, by first creating an Abstract Syntax Tree and then using the -pretty printer to convert it to PHP code. To simplify code generation, the project comes with builders which allow -creating node trees using a fluid interface, instead of instantiating all nodes manually. Builders are available for -the following syntactic elements: - - * namespaces and use statements - * classes, interfaces and traits - * methods, functions and parameters - * properties - -Here is an example: - -```php -use PhpParser\BuilderFactory; -use PhpParser\PrettyPrinter; -use PhpParser\Node; - -$factory = new BuilderFactory; -$node = $factory->namespace('Name\Space') - ->addStmt($factory->use('Some\Other\Thingy')->as('SomeOtherClass')) - ->addStmt($factory->class('SomeClass') - ->extend('SomeOtherClass') - ->implement('A\Few', '\Interfaces') - ->makeAbstract() // ->makeFinal() - - ->addStmt($factory->method('someMethod') - ->makePublic() - ->makeAbstract() // ->makeFinal() - ->setReturnType('bool') - ->addParam($factory->param('someParam')->setTypeHint('SomeClass')) - ->setDocComment('/** - * This method does something. - * - * @param SomeClass And takes a parameter - */') - ) - - ->addStmt($factory->method('anotherMethod') - ->makeProtected() // ->makePublic() [default], ->makePrivate() - ->addParam($factory->param('someParam')->setDefault('test')) - // it is possible to add manually created nodes - ->addStmt(new Node\Expr\Print_(new Node\Expr\Variable('someParam'))) - ) - - // properties will be correctly reordered above the methods - ->addStmt($factory->property('someProperty')->makeProtected()) - ->addStmt($factory->property('anotherProperty')->makePrivate()->setDefault(array(1, 2, 3))) - ) - - ->getNode() -; - -$stmts = array($node); -$prettyPrinter = new PrettyPrinter\Standard(); -echo $prettyPrinter->prettyPrintFile($stmts); -``` - -This will produce the following output with the standard pretty printer: - -```php -namespace('Name\Space') + ->addStmt($factory->use('Some\Other\Thingy')->as('SomeOtherClass')) + ->addStmt($factory->class('SomeOtherClass') + ->extend('SomeClass') + ->implement('A\Few', '\Interfaces') + ->makeAbstract() // ->makeFinal() + + ->addStmt($factory->method('someMethod') + ->makePublic() + ->makeAbstract() // ->makeFinal() + ->setReturnType('bool') + ->addParam($factory->param('someParam')->setTypeHint('SomeClass')) + ->setDocComment('/** + * This method does something. + * + * @param SomeClass And takes a parameter + */') + ) + + ->addStmt($factory->method('anotherMethod') + ->makeProtected() // ->makePublic() [default], ->makePrivate() + ->addParam($factory->param('someParam')->setDefault('test')) + // it is possible to add manually created nodes + ->addStmt(new Node\Expr\Print_(new Node\Expr\Variable('someParam'))) + ) + + // properties will be correctly reordered above the methods + ->addStmt($factory->property('someProperty')->makeProtected()) + ->addStmt($factory->property('anotherProperty')->makePrivate()->setDefault(array(1, 2, 3))) + ) + + ->getNode() +; + +$stmts = array($node); +$prettyPrinter = new PrettyPrinter\Standard(); +echo $prettyPrinter->prettyPrintFile($stmts); +``` + +This will produce the following output with the standard pretty printer: + +```php +evaluateSilently($someExpr); +} catch (ConstExprEvaluationException $e) { + // Either the expression contains unsupported expression types, + // or an error occurred during evaluation +} +``` + +Error handling +-------------- + +The constant evaluator provides two methods, `evaluateDirectly()` and `evaluateSilently()`, which +differ in error behavior. `evaluateDirectly()` will evaluate the expression as PHP would, including +any generated warnings or Errors. `evaluateSilently()` will instead convert warnings and Errors into +a `ConstExprEvaluationException`. For example: + +```php +evaluateDirectly($expr)); // float(INF) +// Warning: Division by zero + +try { + $evaluator->evaluateSilently($expr); +} catch (ConstExprEvaluationException $e) { + var_dump($e->getPrevious()->getMessage()); // Division by zero +} +``` + +For the purposes of static analysis, you will likely want to use `evaluateSilently()` and leave +erroring expressions unevaluated. + +Unsupported expressions and evaluator fallback +---------------------------------------------- + +The constant expression evaluator supports all expression types that are permitted in constant +expressions, apart from the following: + + * `Scalar\MagicConst\*` + * `Expr\ConstFetch` (only null/false/true are handled) + * `Expr\ClassConstFetch` + +Handling these expression types requires non-local information, such as which global constants are +defined. By default, the evaluator will throw a `ConstExprEvaluationException` when it encounters +an unsupported expression type. + +It is possible to override this behavior and support resolution for these expression types by +specifying an evaluation fallback function: + +```php +getType()} cannot be evaluated"); +}); + +try { + $evalutator->evaluateSilently($someExpr); +} catch (ConstExprEvaluationException $e) { + // Handle exception +} +``` + +Implementers are advised to ensure that evaluation of indirect constant references cannot lead to +infinite recursion. For example, the following code could lead to infinite recursion if constant +lookup is implemented naively. + +```php +hasColumnInfo()`, as the precise +Before using column information, its availability needs to be checked with `$e->hasColumnInfo()`, as the precise location of an error cannot always be determined. The methods for retrieving column information also have to be passed the source code of the parsed file. An example for printing an error: diff --git a/vendor/nikic/php-parser/doc/component/FAQ.markdown b/vendor/nikic/php-parser/doc/component/FAQ.markdown new file mode 100644 index 00000000..b8bf834b --- /dev/null +++ b/vendor/nikic/php-parser/doc/component/FAQ.markdown @@ -0,0 +1,68 @@ +Frequently Asked Questions +========================== + + * [How can the parent of a node be obtained?](#how-can-the-parent-of-a-node-be-obtained) + * [How can the next/previous sibling of a node be obtained?](#how-can-the-nextprevious-sibling-of-a-node-be-obtained) + +How can the parent of a node be obtained? +----- + +The AST does not store parent nodes by default. However, it is easy to add a custom parent node +attribute using a custom node visitor: + +```php +use PhpParser\Node; +use PhpParser\NodeVisitorAbstract; + +class ParentConnector extends NodeVisitorAbstract { + private $stack; + public function beforeTraverse(array $nodes) { + $this->stack = []; + } + public function enterNode(Node $node) { + if (!empty($this->stack)) { + $node->setAttribute('parent', $this->stack[count($this->stack)-1]); + } + $this->stack[] = $node; + } + public function leaveNode(Node $node) { + array_pop($this->stack); + } +} +``` + +After running this visitor, the parent node can be obtained through `$node->getAttribute('parent')`. + +How can the next/previous sibling of a node be obtained? +----- + +Again, siblings are not stored by default, but the visitor from the previous entry can be easily +extended to store the previous / next node with a common parent as well: + +```php +use PhpParser\Node; +use PhpParser\NodeVisitorAbstract; + +class NodeConnector extends NodeVisitorAbstract { + private $stack; + private $prev; + public function beforeTraverse(array $nodes) { + $this->stack = []; + $this->prev = null; + } + public function enterNode(Node $node) { + if (!empty($this->stack)) { + $node->setAttribute('parent', $this->stack[count($this->stack)-1]); + } + if ($this->prev && $this->prev->getAttribute('parent') == $node->getAttribute('parent')) { + $node->setAttribute('prev', $this->prev); + $this->prev->setAttribute('next', $node); + } + $this->stack[] = $node; + } + public function leaveNode(Node $node) { + $this->prev = $node; + array_pop($this->stack); + } +} +``` diff --git a/vendor/nikic/php-parser/doc/component/JSON_representation.markdown b/vendor/nikic/php-parser/doc/component/JSON_representation.markdown new file mode 100644 index 00000000..a4d39335 --- /dev/null +++ b/vendor/nikic/php-parser/doc/component/JSON_representation.markdown @@ -0,0 +1,131 @@ +JSON representation +=================== + +Nodes (and comments) implement the `JsonSerializable` interface. As such, it is possible to JSON +encode the AST directly using `json_encode()`: + +```php +create(ParserFactory::PREFER_PHP7); + +try { + $stmts = $parser->parse($code); + + echo json_encode($stmts, JSON_PRETTY_PRINT), "\n"; +} catch (PhpParser\Error $e) { + echo 'Parse Error: ', $e->getMessage(); +} +``` + +This will result in the following output (which includes attributes): + +```json +[ + { + "nodeType": "Stmt_Function", + "byRef": false, + "name": { + "nodeType": "Identifier", + "name": "printLine", + "attributes": { + "startLine": 4, + "endLine": 4 + } + }, + "params": [ + { + "nodeType": "Param", + "type": null, + "byRef": false, + "variadic": false, + "var": { + "nodeType": "Expr_Variable", + "name": "msg", + "attributes": { + "startLine": 4, + "endLine": 4 + } + }, + "default": null, + "attributes": { + "startLine": 4, + "endLine": 4 + } + } + ], + "returnType": null, + "stmts": [ + { + "nodeType": "Stmt_Echo", + "exprs": [ + { + "nodeType": "Expr_Variable", + "name": "msg", + "attributes": { + "startLine": 5, + "endLine": 5 + } + }, + { + "nodeType": "Scalar_String", + "value": "\n", + "attributes": { + "startLine": 5, + "endLine": 5, + "kind": 2 + } + } + ], + "attributes": { + "startLine": 5, + "endLine": 5 + } + } + ], + "attributes": { + "startLine": 4, + "comments": [ + { + "nodeType": "Comment_Doc", + "text": "\/** @param string $msg *\/", + "line": 3, + "filePos": 9, + "tokenPos": 2 + } + ], + "endLine": 6 + } + } +] +``` + +The JSON representation may be converted back into an AST using the `JsonDecoder`: + +```php +decode($json); +``` + +Note that not all ASTs can be represented using JSON. In particular: + + * JSON only supports UTF-8 strings. + * JSON does not support non-finite floating-point numbers. This can occur if the original source + code contains non-representable floating-pointing literals such as `1e1000`. + +If the node tree is not representable in JSON, the initial `json_encode()` call will fail. + +From the command line, a JSON dump can be obtained using `vendor/bin/php-parse -j file.php`. \ No newline at end of file diff --git a/vendor/nikic/php-parser/doc/component/Lexer.markdown b/vendor/nikic/php-parser/doc/component/Lexer.markdown index b22942dd..be26e381 100644 --- a/vendor/nikic/php-parser/doc/component/Lexer.markdown +++ b/vendor/nikic/php-parser/doc/component/Lexer.markdown @@ -27,18 +27,23 @@ The attributes used in this example match the default behavior of the lexer. The * `comments`: Array of `PhpParser\Comment` or `PhpParser\Comment\Doc` instances, representing all comments that occurred between the previous non-discarded token and the current one. Use of this attribute is required for the - `$node->getDocComment()` method to work. The attribute is also needed if you wish the pretty printer to retain - comments present in the original code. + `$node->getComments()` and `$node->getDocComment()` methods to work. The attribute is also needed if you wish the pretty + printer to retain comments present in the original code. * `startLine`: Line in which the node starts. This attribute is required for the `$node->getLine()` to work. It is also required if syntax errors should contain line number information. - * `endLine`: Line in which the node ends. - * `startTokenPos`: Offset into the token array of the first token in the node. - * `endTokenPos`: Offset into the token array of the last token in the node. - * `startFilePos`: Offset into the code string of the first character that is part of the node. - * `endFilePos`: Offset into the code string of the last character that is part of the node. + * `endLine`: Line in which the node ends. Required for `$node->getEndLine()`. + * `startTokenPos`: Offset into the token array of the first token in the node. Required for `$node->getStartTokenPos()`. + * `endTokenPos`: Offset into the token array of the last token in the node. Required for `$node->getEndTokenPos()`. + * `startFilePos`: Offset into the code string of the first character that is part of the node. Required for `$node->getStartFilePos()`. + * `endFilePos`: Offset into the code string of the last character that is part of the node. Required for `$node->getEndFilePos()`. ### Using token positions +> **Note:** The example in this section is outdated in that this information is directly available in the AST: While +> `$property->isPublic()` does not distinguish between `public` and `var`, directly checking `$property->flags` for +> the `$property->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0` allows making this distinction without resorting to +> tokens. However the general idea behind the example still applies in other cases. + The token offset information is useful if you wish to examine the exact formatting used for a node. For example the AST does not distinguish whether a property was declared using `public` or using `var`, but you can retrieve this information based on the token position: @@ -72,7 +77,7 @@ $lexer = new PhpParser\Lexer(array( 'comments', 'startLine', 'endLine', 'startTokenPos', 'endTokenPos' ) )); -$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::PREFER_PHP7, $lexer); +$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::ONLY_PHP7, $lexer); $visitor = new MyNodeVisitor(); $traverser = new PhpParser\NodeTraverser(); @@ -95,14 +100,16 @@ Lexer extension A lexer has to define the following public interface: - void startLexing(string $code, ErrorHandler $errorHandler = null); - array getTokens(); - string handleHaltCompiler(); - int getNextToken(string &$value = null, array &$startAttributes = null, array &$endAttributes = null); +```php +function startLexing(string $code, ErrorHandler $errorHandler = null): void; +function getTokens(): array; +function handleHaltCompiler(): string; +function getNextToken(string &$value = null, array &$startAttributes = null, array &$endAttributes = null): int; +``` -The `startLexing()` method is invoked with the source code that is to be lexed (including the opening tag) whenever the -`parse()` method of the parser is called. It can be used to reset state or preprocess the source code or tokens. The -passes `ErrorHandler` should be used to report lexing errors. +The `startLexing()` method is invoked whenever the `parse()` method of the parser is called and is passed the source +code that is to be lexed (including the opening tag). It can be used to reset state or preprocess the source code or tokens. The +passed `ErrorHandler` should be used to report lexing errors. The `getTokens()` method returns the current token array, in the usual `token_get_all()` format. This method is not used by the parser (which uses `getNextToken()`), but is useful in combination with the token position attributes. diff --git a/vendor/nikic/php-parser/doc/component/Name_resolution.markdown b/vendor/nikic/php-parser/doc/component/Name_resolution.markdown new file mode 100644 index 00000000..2a7eb603 --- /dev/null +++ b/vendor/nikic/php-parser/doc/component/Name_resolution.markdown @@ -0,0 +1,87 @@ +Name resolution +=============== + +Since the introduction of namespaces in PHP 5.3, literal names in PHP code are subject to a +relatively complex name resolution process, which is based on the current namespace, the current +import table state, as well the type of the referenced symbol. PHP-Parser implements name +resolution and related functionality, both as reusable logic (NameContext), as well as a node +visitor (NameResolver) based on it. + +The NameResolver visitor +------------------------ + +The `NameResolver` visitor can (and for nearly all uses of the AST, is) be applied to resolve names +to their fully-qualified form, to the degree that this is possible. + +```php +$nameResolver = new PhpParser\NodeVisitor\NameResolver; +$nodeTraverser = new PhpParser\NodeTraverser; +$nodeTraverser->addVisitor($nameResolver); + +// Resolve names +$stmts = $nodeTraverser->traverse($stmts); +``` + +In the default configuration, the name resolver will perform three actions: + + * Declarations of functions, classes, interfaces, traits and global constants will have a + `namespacedName` property added, which contains the function/class/etc name including the + namespace prefix. For historic reasons this is a **property** rather than an attribute. + * Names will be replaced by fully qualified resolved names, which are instances of + `Node\Name\FullyQualified`. + * Unqualified function and constant names inside a namespace cannot be statically resolved. Inside + a namespace `Foo`, a call to `strlen()` may either refer to the namespaced `\Foo\strlen()`, or + the global `\strlen()`. Because PHP-Parser does not have the necessary context to decide this, + such names are left unresolved. Additionally a `namespacedName` **attribute** is added to the + name node. + +The name resolver accepts an option array as the second argument, with the following default values: + +```php +$nameResolver = new PhpParser\NodeVisitor\NameResolver(null, [ + 'preserveOriginalNames' => false, + 'replaceNodes' => true, +]); +``` + +If the `preserveOriginalNames` option is enabled, then the resolved (fully qualified) name will have +an `originalName` attribute, which contains the unresolved name. + +If the `replaceNodes` option is disabled, then names will no longer be resolved in-place. Instead a +`resolvedName` attribute will be added to each name, which contains the resolved (fully qualified) +name. Once again, if an unqualified function or constant name cannot be resolved, then the +`resolvedName` attribute will not be present, and instead a `namespacedName` attribute is added. + +The `replaceNodes` attribute is useful if you wish to perform modifications on the AST, as you +probably do not wish the resoluting code to have fully resolved names as a side-effect. + +The NameContext +--------------- + +The actual name resolution logic is implemented in the `NameContext` class, which has the following +public API: + +```php +class NameContext { + public function __construct(ErrorHandler $errorHandler); + public function startNamespace(Name $namespace = null); + public function addAlias(Name $name, string $aliasName, int $type, array $errorAttrs = []); + + public function getNamespace(); + public function getResolvedName(Name $name, int $type); + public function getResolvedClassName(Name $name) : Name; + public function getPossibleNames(string $name, int $type) : array; + public function getShortName(string $name, int $type) : Name; +} +``` + +The `$type` parameters accept on of the `Stmt\Use_::TYPE_*` constants, which represent the three +basic symbol types in PHP (functions, constants and everything else). + +Next to name resolution, the `NameContext` also supports the reverse operation of finding a short +representation of a name given the current name resolution environment. + +The name context is intended to be used for name resolution operations outside the AST itself, such +as class names inside doc comments. A visitor running in parallel with the name resolver can access +the name context using `$nameResolver->getNameContext()`. Alternatively a visitor can use an +independent context and explicitly feed `Namespace` and `Use` nodes to it. \ No newline at end of file diff --git a/vendor/nikic/php-parser/doc/component/Performance.markdown b/vendor/nikic/php-parser/doc/component/Performance.markdown new file mode 100644 index 00000000..4281ce8c --- /dev/null +++ b/vendor/nikic/php-parser/doc/component/Performance.markdown @@ -0,0 +1,65 @@ +Performance +=========== + +Parsing is computationally expensive task, to which the PHP language is not very well suited. +Nonetheless, there are a few things you can do to improve the performance of this library, which are +described in the following. + +Xdebug +------ + +Running PHP with XDebug adds a lot of overhead, especially for code that performs many method calls. +Just by loading XDebug (without enabling profiling or other more intrusive XDebug features), you +can expect that code using PHP-Parser will be approximately *five times slower*. + +As such, you should make sure that XDebug is not loaded when using this library. Note that setting +the `xdebug.default_enable=0` ini option does *not* disable XDebug. The *only* way to disable +XDebug is to not load the extension in the first place. + +If you are building a command-line utility for use by developers (who often have XDebug enabled), +you may want to consider automatically restarting PHP with XDebug unloaded. The +[composer/xdebug-handler](https://github.com/composer/xdebug-handler) package can be used to do +this. + +If you do run with XDebug, you may need to increase the `xdebug.max_nesting_level` option to a +higher level, such as 3000. While the parser itself is recursion free, most other code working on +the AST uses recursion and will generate an error if the value of this option is too low. + +Assertions +---------- + +Assertions should be disabled in a production context by setting `zend.assertions=-1` (or +`zend.assertions=0` if set at runtime). The library currently doesn't make heavy use of assertions, +but they are used in an increasing number of places. + +Object reuse +------------ + +Many objects in this project are designed for reuse. For example, one `Parser` object can be used to +parse multiple files. + +When possible, objects should be reused rather than being newly instantiated for every use. Some +objects have expensive initialization procedures, which will be unnecessarily repeated if the object +is not reused. (Currently two objects with particularly expensive setup are lexers and pretty +printers, though the details might change between versions of this library.) + +Garbage collection +------------------ + +A limitation in PHP's cyclic garbage collector may lead to major performance degradation when the +active working set exceeds 10000 objects (or arrays). Especially when parsing very large files this +limit is significantly exceeded and PHP will spend the majority of time performing unnecessary +garbage collection attempts. + +Without GC, parsing time is roughly linear in the input size. With GC, this degenerates to quadratic +runtime for large files. While the specifics may differ, as a rough guideline you may expect a 2.5x +GC overhead for 500KB files and a 5x overhead for 1MB files. + +Because this a limitation in PHP's implementation, there is no easy way to work around this. If +possible, you should avoid parsing very large files, as they will impact overall execution time +disproportionally (and are usually generated anyway). + +Of course, you can also try to (temporarily) disable GC. By design the AST generated by PHP-Parser +is cycle-free, so the AST itself will never cause leaks with GC disabled. However, other code +(including for example the parser object itself) may hold cycles, so disabling of GC should be +approached with care. \ No newline at end of file diff --git a/vendor/nikic/php-parser/doc/component/Pretty_printing.markdown b/vendor/nikic/php-parser/doc/component/Pretty_printing.markdown new file mode 100644 index 00000000..d6198e31 --- /dev/null +++ b/vendor/nikic/php-parser/doc/component/Pretty_printing.markdown @@ -0,0 +1,96 @@ +Pretty printing +=============== + +Pretty printing is the process of converting a syntax tree back to PHP code. In its basic mode of +operation the pretty printer provided by this library will print the AST using a certain predefined +code style and will discard (nearly) all formatting of the original code. Because programmers tend +to be rather picky about their code formatting, this mode of operation is not very suitable for +refactoring code, but can be used for automatically generated code, which is usually only read for +debugging purposes. + +Basic usage +----------- + +```php +$stmts = $parser->parse($code); + +// MODIFY $stmts here + +$prettyPrinter = new PhpParser\PrettyPrinter\Standard; +$newCode = $prettyPrinter->prettyPrintFile($stmts); +``` + +The pretty printer has three basic printing methods: `prettyPrint()`, `prettyPrintFile()` and +`prettyPrintExpr()`. The one that is most commonly useful is `prettyPrintFile()`, which takes an +array of statements and produces a full PHP file, including opening ` **Note:** This functionality is **experimental** and not yet complete. + +For automated code refactoring, migration and similar, you will usually only want to modify a small +portion of the code and leave the remainder alone. The basic pretty printer is not suitable for +this, because it will also reformat parts of the code which have not been modified. + +Since PHP-Parser 4.0, an experimental formatting-preserving pretty-printing mode is available, which +attempts to preserve the formatting of code (those AST nodes that have not changed) and only reformat +code which has been modified or newly inserted. + +Use of the formatting-preservation functionality requires some additional preparatory steps: + +```php +use PhpParser\{Lexer, NodeTraverser, NodeVisitor, Parser, PrettyPrinter}; + +$lexer = new Lexer\Emulative([ + 'usedAttributes' => [ + 'comments', + 'startLine', 'endLine', + 'startTokenPos', 'endTokenPos', + ], +]); +$parser = new Parser\Php7($lexer); + +$traverser = new NodeTraverser(); +$traverser->addVisitor(new NodeVisitor\CloningVisitor()); + +$printer = new PrettyPrinter\Standard(); + +$oldStmts = $parser->parse($code); +$oldTokens = $lexer->getTokens(); + +$newStmts = $traverser->traverse($oldStmts); + +// MODIFY $newStmts HERE + +$newCode = $printer->printFormatPreserving($newStmts, $oldStmts, $oldTokens); +``` + +If you make use of the name resolution functionality, you will likely want to disable the +`replaceNodes` option. This will add resolved names as attributes, instead of directlying modifying +the AST and causing spurious changes to the pretty printed code. For more information, see the +[name resolution documentation](Name_resolution.markdown). + +This functionality is experimental and not yet fully implemented. It should not provide incorrect +code, but it may sometimes reformat more code than necessary. Open issues are tracked in +[issue #344](https://github.com/nikic/PHP-Parser/issues/344). If you encounter problems while using +this functionality, please open an issue, so we know what to prioritize. diff --git a/vendor/nikic/php-parser/doc/component/Walking_the_AST.markdown b/vendor/nikic/php-parser/doc/component/Walking_the_AST.markdown new file mode 100644 index 00000000..fd979d5a --- /dev/null +++ b/vendor/nikic/php-parser/doc/component/Walking_the_AST.markdown @@ -0,0 +1,335 @@ +Walking the AST +=============== + +The most common way to work with the AST is by using a node traverser and one or more node visitors. +As a basic example, the following code changes all literal integers in the AST into strings (e.g., +`42` becomes `'42'`.) + +```php +use PhpParser\{Node, NodeTraverser, NodeVisitorAbstract}; + +$traverser = new NodeTraverser; +$traverser->addVisitor(new class extends NodeVisitorAbstract { + public function leaveNode(Node $node) { + if ($node instanceof Node\Scalar\LNumber) { + return new Node\Scalar\String_((string) $node->value); + } + } +}); + +$stmts = ...; +$modifiedStmts = $traverser->traverse($stmts); +``` + +Node visitors +------------- + +Each node visitor implements an interface with following four methods: + +```php +interface NodeVisitor { + public function beforeTraverse(array $nodes); + public function enterNode(Node $node); + public function leaveNode(Node $node); + public function afterTraverse(array $nodes); +} +``` + +The `beforeTraverse()` and `afterTraverse()` methods are called before and after the traversal +respectively, and are passed the entire AST. They can be used to perform any necessary state +setup or cleanup. + +The `enterNode()` method is called when a node is first encountered, before its children are +processed ("preorder"). The `leaveNode()` method is called after all children have been visited +("postorder"). + +For example, if we have the following excerpt of an AST + +``` +Expr_FuncCall( + name: Name( + parts: array( + 0: printLine + ) + ) + args: array( + 0: Arg( + value: Scalar_String( + value: Hello World!!! + ) + byRef: false + unpack: false + ) + ) +) +``` + +then the enter/leave methods will be called in the following order: + +``` +enterNode(Expr_FuncCall) +enterNode(Name) +leaveNode(Name) +enterNode(Arg) +enterNode(Scalar_String) +leaveNode(Scalar_String) +leaveNode(Arg) +leaveNode(Expr_FuncCall) +``` + +A common pattern is that `enterNode` is used to collect some information and then `leaveNode` +performs modifications based on that. At the time when `leaveNode` is called, all the code inside +the node will have already been visited and necessary information collected. + +As you usually do not want to implement all four methods, it is recommended that you extend +`NodeVisitorAbstract` instead of implementing the interface directly. The abstract class provides +empty default implementations. + +Modifying the AST +----------------- + +There are a number of ways in which the AST can be modified from inside a node visitor. The first +and simplest is to simply change AST properties inside the visitor: + +```php +public function leaveNode(Node $node) { + if ($node instanceof Node\Scalar\LNumber) { + // increment all integer literals + $node->value++; + } +} +``` + +The second is to replace a node entirely by returning a new node: + +```php +public function leaveNode(Node $node) { + if ($node instanceof Node\Expr\BinaryOp\BooleanAnd) { + // Convert all $a && $b expressions into !($a && $b) + return new Node\Expr\BooleanNot($node); + } +} +``` + +Doing this is supported both inside enterNode and leaveNode. However, you have to be mindful about +where you perform the replacement: If a node is replaced in enterNode, then the recursive traversal +will also consider the children of the new node. If you aren't careful, this can lead to infinite +recursion. For example, let's take the previous code sample and use enterNode instead: + +```php +public function enterNode(Node $node) { + if ($node instanceof Node\Expr\BinaryOp\BooleanAnd) { + // Convert all $a && $b expressions into !($a && $b) + return new Node\Expr\BooleanNot($node); + } +} +``` + +Now `$a && $b` will be replaced by `!($a && $b)`. Then the traverser will go into the first (and +only) child of `!($a && $b)`, which is `$a && $b`. The transformation applies again and we end up +with `!!($a && $b)`. This will continue until PHP hits the memory limit. + +Finally, two special replacement types are supported only by leaveNode. The first is removal of a +node: + +```php +public function leaveNode(Node $node) { + if ($node instanceof Node\Stmt\Return_) { + // Remove all return statements + return NodeTraverser::REMOVE_NODE; + } +} +``` + +Node removal only works if the parent structure is an array. This means that usually it only makes +sense to remove nodes of type `Node\Stmt`, as they always occur inside statement lists (and a few +more node types like `Arg` or `Expr\ArrayItem`, which are also always part of lists). + +On the other hand, removing a `Node\Expr` does not make sense: If you have `$a * $b`, there is no +meaningful way in which the `$a` part could be removed. If you want to remove an expression, you +generally want to remove it together with a surrounding expression statement: + +```php +public function leaveNode(Node $node) { + if ($node instanceof Node\Stmt\Expression + && $node->expr instanceof Node\Expr\FuncCall + && $node->expr->name instanceof Node\Name + && $node->expr->name->toString() === 'var_dump' + ) { + return NodeTraverser::REMOVE_NODE; + } +} +``` + +This example will remove all calls to `var_dump()` which occur as expression statements. This means +that `var_dump($a);` will be removed, but `if (var_dump($a))` will not be removed (and there is no +obvious way in which it can be removed). + +Next to removing nodes, it is also possible to replace one node with multiple nodes. Again, this +only works inside leaveNode and only if the parent structure is an array. + +```php +public function leaveNode(Node $node) { + if ($node instanceof Node\Stmt\Return_ && $node->expr !== null) { + // Convert "return foo();" into "$retval = foo(); return $retval;" + $var = new Node\Expr\Variable('retval'); + return [ + new Node\Stmt\Expression(new Node\Expr\Assign($var, $node->expr)), + new Node\Stmt\Return_($var), + ]; + } +} +``` + +Short-circuiting traversal +-------------------------- + +An AST can easily contain thousands of nodes, and traversing over all of them may be slow, +especially if you have more than one visitor. In some cases, it is possible to avoid a full +traversal. + +If you are looking for all class declarations in a file (and assuming you're not interested in +anonymous classes), you know that once you've seen a class declaration, there is no point in also +checking all it's child nodes, because PHP does not allow nesting classes. In this case, you can +instruct the traverser to not recurse into the class node: + +``` +private $classes = []; +public function enterNode(Node $node) { + if ($node instanceof Node\Stmt\Class_) { + $this->classes[] = $node; + return NodeTraverser::DONT_TRAVERSE_CHILDREN; + } +} +``` + +Of course, this option is only available in enterNode, because it's already too late by the time +leaveNode is reached. + +If you are only looking for one specific node, it is also possible to abort the traversal entirely +after finding it. For example, if you are looking for the node of a class with a certain name (and +discounting exotic cases like conditionally defining a class two times), you can stop traversal +once you found it: + +``` +private $class = null; +public function enterNode(Node $node) { + if ($node instanceof Node\Stmt\Class_ && + $node->namespaceName->toString() === 'Foo\Bar\Baz' + ) { + $this->class = $node; + return NodeTraverser::STOP_TRAVERSAL; + } +} +``` + +This works both in enterNode and leaveNode. Note that this particular case can also be more easily +handled using a NodeFinder, which will be introduced below. + +Multiple visitors +----------------- + +A single traverser can be used with multiple visitors: + +```php +$traverser = new NodeTraverser; +$traverser->addVisitor($visitorA); +$traverser->addVisitor($visitorB); +$stmts = $traverser->traverser($stmts); +``` + +It is important to understand that if a traverser is run with multiple visitors, the visitors will +be interleaved. Given the following AST excerpt + +``` +Stmt_Return( + expr: Expr_Variable( + name: foobar + ) +) +``` + +the following method calls will be performed: + +``` +$visitorA->enterNode(Stmt_Return) +$visitorB->enterNode(Stmt_Return) +$visitorA->enterNode(Expr_Variable) +$visitorB->enterNode(Expr_Variable) +$visitorA->leaveNode(Expr_Variable) +$visitorB->leaveNode(Expr_Variable) +$visitorA->leaveNode(Stmt_Return) +$visitorB->leaveNode(Stmt_Return) +``` + +That is, when visiting a node, enterNode and leaveNode will always be called for all visitors. +Running multiple visitors in parallel improves performance, as the AST only has to be traversed +once. However, it is not always possible to write visitors in a way that allows interleaved +execution. In this case, you can always fall back to performing multiple traversals: + +```php +$traverserA = new NodeTraverser; +$traverserA->addVisitor($visitorA); +$traverserB = new NodeTraverser; +$traverserB->addVisitor($visitorB); +$stmts = $traverserA->traverser($stmts); +$stmts = $traverserB->traverser($stmts); +``` + +When using multiple visitors, it is important to understand how they interact with the various +special enterNode/leaveNode return values: + + * If *any* visitor returns `DONT_TRAVERSE_CHILDREN`, the children will be skipped for *all* + visitors. + * If *any* visitor returns `STOP_TRAVERSAL`, traversal is stopped for *all* visitors. + * If a visitor returns a replacement node, subsequent visitors will be passed the replacement node, + not the original one. + * If a visitor returns `REMOVE_NODE`, subsequent visitors will not see this node. + * If a visitor returns an array of replacement nodes, subsequent visitors will see neither the node + that was replaced, nor the replacement nodes. + +Simple node finding +------------------- + +While the node visitor mechanism is very flexible, creating a node visitor can be overly cumbersome +for minor tasks. For this reason a `NodeFinder` is provided, which can find AST nodes that either +satisfy a certain callback, or which are instanced of a certain node type. A couple of examples are +shown in the following: + +```php +use PhpParser\{Node, NodeFinder}; + +$nodeFinder = new NodeFinder; + +// Find all class nodes. +$classes = $nodeFinder->findInstanceOf($stmts, Node\Stmt\Class_::class); + +// Find all classes that extend another class +$extendingClasses = $nodeFinder->findInstanceOf($stmts, function(Node $node) { + return $node instanceof Node\Stmt\Class_ + && $node->extends !== null; +}); + +// Find first class occuring in the AST. Returns null if no class exists. +$class = $nodeFinder->findFirstInstanceOf($stmts, Node\Stmt\Class_::class); + +// Find first class that has name $name +$class = $nodeFinder->findFirst($stmts, function(Node $node) use ($name) { + return $node instanceof Node\Stmt\Class_ + && $node->resolvedName->toString() === $name; +}); +``` + +Internally, the `NodeFinder` also uses a node traverser. It only simplifies the interface for a +common use case. + +Parent and sibling references +----------------------------- + +The node visitor mechanism is somewhat rigid, in that it prescribes an order in which nodes should +be accessed: From parents to children. However, it can often be convenient to operate in the +reverse direction: When working on a node, you might want to check if the parent node satisfies a +certain property. + +PHP-Parser does not add parent (or sibling) references to nodes by itself, but you can easily +emulate this with a visitor. See the [FAQ](FAQ.markdown) for more information. \ No newline at end of file diff --git a/vendor/nikic/php-parser/grammar/README.md b/vendor/nikic/php-parser/grammar/README.md index 3f1698a6..90988cf4 100644 --- a/vendor/nikic/php-parser/grammar/README.md +++ b/vendor/nikic/php-parser/grammar/README.md @@ -11,7 +11,7 @@ What do all those files mean? .phpy pseudo language ===================== -The `.y` file is a normal grammer in `kmyacc` (`yacc`) style, with some transformations +The `.y` file is a normal grammar in `kmyacc` (`yacc`) style, with some transformations applied to it: * Nodes are created using the syntax `Name[..., ...]`. This is transformed into diff --git a/vendor/nikic/php-parser/grammar/parser.template b/vendor/nikic/php-parser/grammar/parser.template index fff893ff..6166607c 100644 --- a/vendor/nikic/php-parser/grammar/parser.template +++ b/vendor/nikic/php-parser/grammar/parser.template @@ -2,8 +2,8 @@ $meta # #semval($) $this->semValue #semval($,%t) $this->semValue -#semval(%n) $this->stackPos-(%l-%n) -#semval(%n,%t) $this->stackPos-(%l-%n) +#semval(%n) $stackPos-(%l-%n) +#semval(%n,%t) $stackPos-(%l-%n) namespace PhpParser\Parser; @@ -32,8 +32,8 @@ class #(-p) extends \PhpParser\ParserAbstract protected $defaultAction = #(YYDEFAULT); protected $unexpectedTokenRule = #(YYUNEXPECTED); - protected $YY2TBLSTATE = #(YY2TBLSTATE); - protected $YYNLSTATES = #(YYNLSTATES); + protected $YY2TBLSTATE = #(YY2TBLSTATE); + protected $numNonLeafStates = #(YYNLSTATES); protected $symbolToName = array( #listvar terminals @@ -88,16 +88,19 @@ class #(-p) extends \PhpParser\ParserAbstract #production-strings; ); #endif + + protected function initReduceCallbacks() { + $this->reduceCallbacks = [ #reduce - - protected function reduceRule%n() { - %b - } + %n => function ($stackPos) { + %b + }, #noact - - protected function reduceRule%n() { - $this->semValue = $this->semStack[$this->stackPos]; - } + %n => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, #endreduce + ]; + } } #tailcode; diff --git a/vendor/nikic/php-parser/grammar/php5.y b/vendor/nikic/php-parser/grammar/php5.y index 45880463..379cd3c7 100644 --- a/vendor/nikic/php-parser/grammar/php5.y +++ b/vendor/nikic/php-parser/grammar/php5.y @@ -16,7 +16,7 @@ top_statement_list_ex: top_statement_list: top_statement_list_ex - { makeNop($nop, $this->lookaheadStartAttributes); + { makeNop($nop, $this->lookaheadStartAttributes, $this->endAttributes); if ($nop !== null) { $1[] = $nop; } $$ = $1; } ; @@ -35,9 +35,17 @@ semi_reserved: | T_STATIC | T_ABSTRACT | T_FINAL | T_PRIVATE | T_PROTECTED | T_PUBLIC ; +identifier_ex: + T_STRING { $$ = Node\Identifier[$1]; } + | semi_reserved { $$ = Node\Identifier[$1]; } +; + identifier: - T_STRING { $$ = $1; } - | semi_reserved { $$ = $1; } + T_STRING { $$ = Node\Identifier[$1]; } +; + +reserved_non_modifiers_identifier: + reserved_non_modifiers { $$ = Node\Identifier[$1]; } ; namespace_name_parts: @@ -49,6 +57,10 @@ namespace_name: namespace_name_parts { $$ = Name[$1]; } ; +plain_variable: + T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } +; + top_statement: statement { $$ = $1; } | function_declaration_statement { $$ = $1; } @@ -109,7 +121,7 @@ inline_use_declarations: unprefixed_use_declaration: namespace_name { $$ = Stmt\UseUse[$1, null, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #1); } - | namespace_name T_AS T_STRING + | namespace_name T_AS identifier { $$ = Stmt\UseUse[$1, $3, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #3); } ; @@ -129,7 +141,7 @@ constant_declaration_list: ; constant_declaration: - T_STRING '=' static_scalar { $$ = Node\Const_[$1, $3]; } + identifier '=' static_scalar { $$ = Node\Const_[$1, $3]; } ; class_const_list: @@ -138,7 +150,7 @@ class_const_list: ; class_const: - identifier '=' static_scalar { $$ = Node\Const_[$1, $3]; } + identifier_ex '=' static_scalar { $$ = Node\Const_[$1, $3]; } ; inner_statement_list_ex: @@ -148,7 +160,7 @@ inner_statement_list_ex: inner_statement_list: inner_statement_list_ex - { makeNop($nop, $this->lookaheadStartAttributes); + { makeNop($nop, $this->lookaheadStartAttributes, $this->endAttributes); if ($nop !== null) { $1[] = $nop; } $$ = $1; } ; @@ -166,7 +178,7 @@ non_empty_statement: if ($2) { $$ = $2; prependLeadingComments($$); } else { - makeNop($$, $this->startAttributeStack[#1]); + makeNop($$, $this->startAttributeStack[#1], $this->endAttributes); if (null === $$) { $$ = array(); } } } @@ -185,12 +197,12 @@ non_empty_statement: | T_CONTINUE expr ';' { $$ = Stmt\Continue_[$2]; } | T_RETURN ';' { $$ = Stmt\Return_[null]; } | T_RETURN expr ';' { $$ = Stmt\Return_[$2]; } - | yield_expr ';' { $$ = $1; } | T_GLOBAL global_var_list ';' { $$ = Stmt\Global_[$2]; } | T_STATIC static_var_list ';' { $$ = Stmt\Static_[$2]; } | T_ECHO expr_list ';' { $$ = Stmt\Echo_[$2]; } | T_INLINE_HTML { $$ = Stmt\InlineHTML[$1]; } - | expr ';' { $$ = $1; } + | yield_expr ';' { $$ = Stmt\Expression[$1]; } + | expr ';' { $$ = Stmt\Expression[$1]; } | T_UNSET '(' variables_list ')' ';' { $$ = Stmt\Unset_[$3]; } | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement { $$ = Stmt\Foreach_[$3, $5[0], ['keyVar' => null, 'byRef' => $5[1], 'stmts' => $7]]; } @@ -200,16 +212,16 @@ non_empty_statement: | T_TRY '{' inner_statement_list '}' catches optional_finally { $$ = Stmt\TryCatch[$3, $5, $6]; $this->checkTryCatch($$); } | T_THROW expr ';' { $$ = Stmt\Throw_[$2]; } - | T_GOTO T_STRING ';' { $$ = Stmt\Goto_[$2]; } - | T_STRING ':' { $$ = Stmt\Label[$1]; } - | expr error { $$ = $1; } + | T_GOTO identifier ';' { $$ = Stmt\Goto_[$2]; } + | identifier ':' { $$ = Stmt\Label[$1]; } + | expr error { $$ = Stmt\Expression[$1]; } | error { $$ = array(); /* means: no statement */ } ; statement: non_empty_statement { $$ = $1; } | ';' - { makeNop($$, $this->startAttributeStack[#1]); + { makeNop($$, $this->startAttributeStack[#1], $this->endAttributes); if ($$ === null) $$ = array(); /* means: no statement */ } ; @@ -219,8 +231,8 @@ catches: ; catch: - T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}' - { $$ = Stmt\Catch_[array($3), parseVar($4), $7]; } + T_CATCH '(' name plain_variable ')' '{' inner_statement_list '}' + { $$ = Stmt\Catch_[array($3), $4, $7]; } ; optional_finally: @@ -244,18 +256,18 @@ optional_ellipsis: ; function_declaration_statement: - T_FUNCTION optional_ref T_STRING '(' parameter_list ')' optional_return_type '{' inner_statement_list '}' + T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type '{' inner_statement_list '}' { $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $9]]; } ; class_declaration_statement: - class_entry_type T_STRING extends_from implements_list '{' class_statement_list '}' + class_entry_type identifier extends_from implements_list '{' class_statement_list '}' { $$ = Stmt\Class_[$2, ['type' => $1, 'extends' => $3, 'implements' => $4, 'stmts' => $6]]; $this->checkClass($$, #2); } - | T_INTERFACE T_STRING interface_extends_list '{' class_statement_list '}' + | T_INTERFACE identifier interface_extends_list '{' class_statement_list '}' { $$ = Stmt\Interface_[$2, ['extends' => $3, 'stmts' => $5]]; $this->checkInterface($$, #2); } - | T_TRAIT T_STRING '{' class_statement_list '}' + | T_TRAIT identifier '{' class_statement_list '}' { $$ = Stmt\Trait_[$2, ['stmts' => $4]]; } ; @@ -307,7 +319,7 @@ declare_list: ; declare_list_element: - T_STRING '=' static_scalar { $$ = Stmt\DeclareDeclare[$1, $3]; } + identifier '=' static_scalar { $$ = Stmt\DeclareDeclare[$1, $3]; } ; switch_case_list: @@ -323,8 +335,8 @@ case_list: ; case: - T_CASE expr case_separator inner_statement_list { $$ = Stmt\Case_[$2, $4]; } - | T_DEFAULT case_separator inner_statement_list { $$ = Stmt\Case_[null, $3]; } + T_CASE expr case_separator inner_statement_list_ex { $$ = Stmt\Case_[$2, $4]; } + | T_DEFAULT case_separator inner_statement_list_ex { $$ = Stmt\Case_[null, $3]; } ; case_separator: @@ -382,16 +394,16 @@ non_empty_parameter_list: ; parameter: - optional_param_type optional_ref optional_ellipsis T_VARIABLE - { $$ = Node\Param[parseVar($4), null, $1, $2, $3]; $this->checkParam($$); } - | optional_param_type optional_ref optional_ellipsis T_VARIABLE '=' static_scalar - { $$ = Node\Param[parseVar($4), $6, $1, $2, $3]; $this->checkParam($$); } + optional_param_type optional_ref optional_ellipsis plain_variable + { $$ = Node\Param[$4, null, $1, $2, $3]; $this->checkParam($$); } + | optional_param_type optional_ref optional_ellipsis plain_variable '=' static_scalar + { $$ = Node\Param[$4, $6, $1, $2, $3]; $this->checkParam($$); } ; type: name { $$ = $1; } - | T_ARRAY { $$ = 'array'; } - | T_CALLABLE { $$ = 'callable'; } + | T_ARRAY { $$ = Node\Identifier['array']; } + | T_CALLABLE { $$ = Node\Identifier['callable']; } ; optional_param_type: @@ -427,7 +439,7 @@ global_var_list: ; global_var: - T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } + plain_variable { $$ = $1; } | '$' variable { $$ = Expr\Variable[$2]; } | '$' '{' expr '}' { $$ = Expr\Variable[$3]; } ; @@ -438,8 +450,8 @@ static_var_list: ; static_var: - T_VARIABLE { $$ = Stmt\StaticVar[parseVar($1), null]; } - | T_VARIABLE '=' static_scalar { $$ = Stmt\StaticVar[parseVar($1), $3]; } + plain_variable { $$ = Stmt\StaticVar[$1, null]; } + | plain_variable '=' static_scalar { $$ = Stmt\StaticVar[$1, $3]; } ; class_statement_list: @@ -451,7 +463,7 @@ class_statement: variable_modifiers property_declaration_list ';' { $$ = Stmt\Property[$1, $2]; $this->checkProperty($$, #1); } | T_CONST class_const_list ';' { $$ = Stmt\ClassConst[$2, 0]; } - | method_modifiers T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type method_body + | method_modifiers T_FUNCTION optional_ref identifier_ex '(' parameter_list ')' optional_return_type method_body { $$ = Stmt\ClassMethod[$4, ['type' => $1, 'byRef' => $3, 'params' => $6, 'returnType' => $8, 'stmts' => $9]]; $this->checkClassMethod($$, #1); } | T_USE class_name_list trait_adaptations { $$ = Stmt\TraitUse[$2, $3]; } @@ -470,22 +482,22 @@ trait_adaptation_list: trait_adaptation: trait_method_reference_fully_qualified T_INSTEADOF class_name_list ';' { $$ = Stmt\TraitUseAdaptation\Precedence[$1[0], $1[1], $3]; } - | trait_method_reference T_AS member_modifier identifier ';' + | trait_method_reference T_AS member_modifier identifier_ex ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, $4]; } | trait_method_reference T_AS member_modifier ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, null]; } - | trait_method_reference T_AS T_STRING ';' + | trait_method_reference T_AS identifier ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], null, $3]; } - | trait_method_reference T_AS reserved_non_modifiers ';' + | trait_method_reference T_AS reserved_non_modifiers_identifier ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], null, $3]; } ; trait_method_reference_fully_qualified: - name T_PAAMAYIM_NEKUDOTAYIM identifier { $$ = array($1, $3); } + name T_PAAMAYIM_NEKUDOTAYIM identifier_ex { $$ = array($1, $3); } ; trait_method_reference: trait_method_reference_fully_qualified { $$ = $1; } - | identifier { $$ = array(null, $1); } + | identifier_ex { $$ = array(null, $1); } ; method_body: @@ -522,9 +534,13 @@ property_declaration_list: | property_declaration_list ',' property_declaration { push($1, $3); } ; +property_decl_name: + T_VARIABLE { $$ = Node\VarLikeIdentifier[parseVar($1)]; } +; + property_declaration: - T_VARIABLE { $$ = Stmt\PropertyProperty[parseVar($1), null]; } - | T_VARIABLE '=' static_scalar { $$ = Stmt\PropertyProperty[parseVar($1), $3]; } + property_decl_name { $$ = Stmt\PropertyProperty[$1, null]; } + | property_decl_name '=' static_scalar { $$ = Stmt\PropertyProperty[$1, $3]; } ; expr_list: @@ -665,6 +681,7 @@ anonymous_class: T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}' { $$ = array(Stmt\Class_[null, ['type' => 0, 'extends' => $3, 'implements' => $4, 'stmts' => $6]], $2); $this->checkClass($$[0], -1); } +; new_expr: T_NEW class_name_reference ctor_arguments { $$ = Expr\New_[$2, $3]; } @@ -683,30 +700,17 @@ lexical_var_list: ; lexical_var: - optional_ref T_VARIABLE { $$ = Expr\ClosureUse[parseVar($2), $1]; } + optional_ref plain_variable { $$ = Expr\ClosureUse[$2, $1]; } ; function_call: name argument_list { $$ = Expr\FuncCall[$1, $2]; } - | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier argument_list + | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_ex argument_list { $$ = Expr\StaticCall[$1, $3, $4]; } | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '{' expr '}' argument_list { $$ = Expr\StaticCall[$1, $4, $6]; } - | static_property argument_list { - if ($1 instanceof Node\Expr\StaticPropertyFetch) { - $$ = Expr\StaticCall[$1->class, Expr\Variable[$1->name], $2]; - } elseif ($1 instanceof Node\Expr\ArrayDimFetch) { - $tmp = $1; - while ($tmp->var instanceof Node\Expr\ArrayDimFetch) { - $tmp = $tmp->var; - } - - $$ = Expr\StaticCall[$tmp->var->class, $1, $2]; - $tmp->var = Expr\Variable[$tmp->var->name]; - } else { - throw new \Exception; - } - } + | static_property argument_list + { $$ = $this->fixupPhp5StaticPropCall($1, $2, attributes()); } | variable_without_objects argument_list { $$ = Expr\FuncCall[$1, $2]; } | function_call '[' dim_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } @@ -790,7 +794,7 @@ common_scalar: static_scalar: common_scalar { $$ = $1; } - | class_name T_PAAMAYIM_NEKUDOTAYIM identifier { $$ = Expr\ClassConstFetch[$1, $3]; } + | class_name T_PAAMAYIM_NEKUDOTAYIM identifier_ex { $$ = Expr\ClassConstFetch[$1, $3]; } | name { $$ = Expr\ConstFetch[$1]; } | T_ARRAY '(' static_array_pair_list ')' { $$ = Expr\Array_[$3]; } | '[' static_array_pair_list ']' { $$ = Expr\Array_[$2]; } @@ -835,7 +839,7 @@ static_operation: constant: name { $$ = Expr\ConstFetch[$1]; } - | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier + | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_ex { $$ = Expr\ClassConstFetch[$1, $3]; } ; @@ -914,9 +918,14 @@ static_property: | static_property_with_arrays { $$ = $1; } ; +static_property_simple_name: + T_VARIABLE + { $var = parseVar($1); $$ = \is_string($var) ? Node\VarLikeIdentifier[$var] : $var; } +; + static_property_with_arrays: - class_name_or_var T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE - { $$ = Expr\StaticPropertyFetch[$1, parseVar($3)]; } + class_name_or_var T_PAAMAYIM_NEKUDOTAYIM static_property_simple_name + { $$ = Expr\StaticPropertyFetch[$1, $3]; } | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}' { $$ = Expr\StaticPropertyFetch[$1, $5]; } | static_property_with_arrays '[' dim_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } @@ -926,7 +935,7 @@ static_property_with_arrays: reference_variable: reference_variable '[' dim_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } | reference_variable '{' expr '}' { $$ = Expr\ArrayDimFetch[$1, $3]; } - | T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } + | plain_variable { $$ = $1; } | '$' '{' expr '}' { $$ = Expr\Variable[$3]; } ; @@ -936,7 +945,7 @@ dim_offset: ; object_property: - T_STRING { $$ = $1; } + identifier { $$ = $1; } | '{' expr '}' { $$ = $2; } | variable_without_objects { $$ = $1; } | error { $$ = Expr\Error[]; $this->errorState = 2; } @@ -985,25 +994,25 @@ encaps_string_part: T_ENCAPSED_AND_WHITESPACE { $$ = Scalar\EncapsedStringPart[$1]; } ; -encaps_base_var: - T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } +encaps_str_varname: + T_STRING_VARNAME { $$ = Expr\Variable[$1]; } ; encaps_var: - encaps_base_var { $$ = $1; } - | encaps_base_var '[' encaps_var_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } - | encaps_base_var T_OBJECT_OPERATOR T_STRING { $$ = Expr\PropertyFetch[$1, $3]; } + plain_variable { $$ = $1; } + | plain_variable '[' encaps_var_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } + | plain_variable T_OBJECT_OPERATOR identifier { $$ = Expr\PropertyFetch[$1, $3]; } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' { $$ = Expr\Variable[$2]; } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' { $$ = Expr\Variable[$2]; } - | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' - { $$ = Expr\ArrayDimFetch[Expr\Variable[$2], $4]; } + | T_DOLLAR_OPEN_CURLY_BRACES encaps_str_varname '[' expr ']' '}' + { $$ = Expr\ArrayDimFetch[$2, $4]; } | T_CURLY_OPEN variable '}' { $$ = $2; } ; encaps_var_offset: T_STRING { $$ = Scalar\String_[$1]; } | T_NUM_STRING { $$ = $this->parseNumString($1, attributes()); } - | T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } + | plain_variable { $$ = $1; } ; %% diff --git a/vendor/nikic/php-parser/grammar/php7.y b/vendor/nikic/php-parser/grammar/php7.y index b941c496..8f784301 100644 --- a/vendor/nikic/php-parser/grammar/php7.y +++ b/vendor/nikic/php-parser/grammar/php7.y @@ -16,7 +16,7 @@ top_statement_list_ex: top_statement_list: top_statement_list_ex - { makeNop($nop, $this->lookaheadStartAttributes); + { makeNop($nop, $this->lookaheadStartAttributes, $this->endAttributes); if ($nop !== null) { $1[] = $nop; } $$ = $1; } ; @@ -35,9 +35,17 @@ semi_reserved: | T_STATIC | T_ABSTRACT | T_FINAL | T_PRIVATE | T_PROTECTED | T_PUBLIC ; +identifier_ex: + T_STRING { $$ = Node\Identifier[$1]; } + | semi_reserved { $$ = Node\Identifier[$1]; } +; + identifier: - T_STRING { $$ = $1; } - | semi_reserved { $$ = $1; } + T_STRING { $$ = Node\Identifier[$1]; } +; + +reserved_non_modifiers_identifier: + reserved_non_modifiers { $$ = Node\Identifier[$1]; } ; namespace_name_parts: @@ -49,6 +57,10 @@ namespace_name: namespace_name_parts { $$ = Name[$1]; } ; +plain_variable: + T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } +; + semi: ';' { /* nothing */ } | error { /* nothing */ } @@ -136,7 +148,7 @@ non_empty_inline_use_declarations: unprefixed_use_declaration: namespace_name { $$ = Stmt\UseUse[$1, null, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #1); } - | namespace_name T_AS T_STRING + | namespace_name T_AS identifier { $$ = Stmt\UseUse[$1, $3, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #3); } ; @@ -161,7 +173,7 @@ non_empty_constant_declaration_list: ; constant_declaration: - T_STRING '=' expr { $$ = Node\Const_[$1, $3]; } + identifier '=' expr { $$ = Node\Const_[$1, $3]; } ; class_const_list: @@ -174,7 +186,7 @@ non_empty_class_const_list: ; class_const: - identifier '=' expr { $$ = Node\Const_[$1, $3]; } + identifier_ex '=' expr { $$ = Node\Const_[$1, $3]; } ; inner_statement_list_ex: @@ -184,7 +196,7 @@ inner_statement_list_ex: inner_statement_list: inner_statement_list_ex - { makeNop($nop, $this->lookaheadStartAttributes); + { makeNop($nop, $this->lookaheadStartAttributes, $this->endAttributes); if ($nop !== null) { $1[] = $nop; } $$ = $1; } ; @@ -202,7 +214,7 @@ non_empty_statement: if ($2) { $$ = $2; prependLeadingComments($$); } else { - makeNop($$, $this->startAttributeStack[#1]); + makeNop($$, $this->startAttributeStack[#1], $this->endAttributes); if (null === $$) { $$ = array(); } } } @@ -222,25 +234,27 @@ non_empty_statement: | T_STATIC static_var_list semi { $$ = Stmt\Static_[$2]; } | T_ECHO expr_list semi { $$ = Stmt\Echo_[$2]; } | T_INLINE_HTML { $$ = Stmt\InlineHTML[$1]; } - | expr semi { $$ = $1; } + | expr semi { $$ = Stmt\Expression[$1]; } | T_UNSET '(' variables_list ')' semi { $$ = Stmt\Unset_[$3]; } | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement { $$ = Stmt\Foreach_[$3, $5[0], ['keyVar' => null, 'byRef' => $5[1], 'stmts' => $7]]; } | T_FOREACH '(' expr T_AS variable T_DOUBLE_ARROW foreach_variable ')' foreach_statement { $$ = Stmt\Foreach_[$3, $7[0], ['keyVar' => $5, 'byRef' => $7[1], 'stmts' => $9]]; } + | T_FOREACH '(' expr error ')' foreach_statement + { $$ = Stmt\Foreach_[$3, new Expr\Error(stackAttributes(#4)), ['stmts' => $6]]; } | T_DECLARE '(' declare_list ')' declare_statement { $$ = Stmt\Declare_[$3, $5]; } | T_TRY '{' inner_statement_list '}' catches optional_finally { $$ = Stmt\TryCatch[$3, $5, $6]; $this->checkTryCatch($$); } | T_THROW expr semi { $$ = Stmt\Throw_[$2]; } - | T_GOTO T_STRING semi { $$ = Stmt\Goto_[$2]; } - | T_STRING ':' { $$ = Stmt\Label[$1]; } + | T_GOTO identifier semi { $$ = Stmt\Goto_[$2]; } + | identifier ':' { $$ = Stmt\Label[$1]; } | error { $$ = array(); /* means: no statement */ } ; statement: non_empty_statement { $$ = $1; } | ';' - { makeNop($$, $this->startAttributeStack[#1]); + { makeNop($$, $this->startAttributeStack[#1], $this->endAttributes); if ($$ === null) $$ = array(); /* means: no statement */ } ; @@ -255,8 +269,8 @@ name_union: ; catch: - T_CATCH '(' name_union T_VARIABLE ')' '{' inner_statement_list '}' - { $$ = Stmt\Catch_[$3, parseVar($4), $7]; } + T_CATCH '(' name_union plain_variable ')' '{' inner_statement_list '}' + { $$ = Stmt\Catch_[$3, $4, $7]; } ; optional_finally: @@ -265,7 +279,7 @@ optional_finally: ; variables_list: - non_empty_variables_list no_comma { $$ = $1; } + non_empty_variables_list optional_comma { $$ = $1; } ; non_empty_variables_list: @@ -283,19 +297,24 @@ optional_ellipsis: | T_ELLIPSIS { $$ = true; } ; +block_or_error: + '{' inner_statement_list '}' { $$ = $2; } + | error { $$ = []; } +; + function_declaration_statement: - T_FUNCTION optional_ref T_STRING '(' parameter_list ')' optional_return_type '{' inner_statement_list '}' - { $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $9]]; } + T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type block_or_error + { $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $8]]; } ; class_declaration_statement: - class_entry_type T_STRING extends_from implements_list '{' class_statement_list '}' + class_entry_type identifier extends_from implements_list '{' class_statement_list '}' { $$ = Stmt\Class_[$2, ['type' => $1, 'extends' => $3, 'implements' => $4, 'stmts' => $6]]; $this->checkClass($$, #2); } - | T_INTERFACE T_STRING interface_extends_list '{' class_statement_list '}' + | T_INTERFACE identifier interface_extends_list '{' class_statement_list '}' { $$ = Stmt\Interface_[$2, ['extends' => $3, 'stmts' => $5]]; $this->checkInterface($$, #2); } - | T_TRAIT T_STRING '{' class_statement_list '}' + | T_TRAIT identifier '{' class_statement_list '}' { $$ = Stmt\Trait_[$2, ['stmts' => $4]]; } ; @@ -355,7 +374,7 @@ non_empty_declare_list: ; declare_list_element: - T_STRING '=' expr { $$ = Stmt\DeclareDeclare[$1, $3]; } + identifier '=' expr { $$ = Stmt\DeclareDeclare[$1, $3]; } ; switch_case_list: @@ -371,8 +390,8 @@ case_list: ; case: - T_CASE expr case_separator inner_statement_list { $$ = Stmt\Case_[$2, $4]; } - | T_DEFAULT case_separator inner_statement_list { $$ = Stmt\Case_[null, $3]; } + T_CASE expr case_separator inner_statement_list_ex { $$ = Stmt\Case_[$2, $4]; } + | T_DEFAULT case_separator inner_statement_list_ex { $$ = Stmt\Case_[null, $3]; } ; case_separator: @@ -431,10 +450,12 @@ non_empty_parameter_list: ; parameter: - optional_param_type optional_ref optional_ellipsis T_VARIABLE - { $$ = Node\Param[parseVar($4), null, $1, $2, $3]; $this->checkParam($$); } - | optional_param_type optional_ref optional_ellipsis T_VARIABLE '=' expr - { $$ = Node\Param[parseVar($4), $6, $1, $2, $3]; $this->checkParam($$); } + optional_param_type optional_ref optional_ellipsis plain_variable + { $$ = Node\Param[$4, null, $1, $2, $3]; $this->checkParam($$); } + | optional_param_type optional_ref optional_ellipsis plain_variable '=' expr + { $$ = Node\Param[$4, $6, $1, $2, $3]; $this->checkParam($$); } + | optional_param_type optional_ref optional_ellipsis error + { $$ = Node\Param[Expr\Error[], null, $1, $2, $3]; } ; type_expr: @@ -444,8 +465,8 @@ type_expr: type: name { $$ = $this->handleBuiltinTypes($1); } - | T_ARRAY { $$ = 'array'; } - | T_CALLABLE { $$ = 'callable'; } + | T_ARRAY { $$ = Node\Identifier['array']; } + | T_CALLABLE { $$ = Node\Identifier['callable']; } ; optional_param_type: @@ -460,7 +481,7 @@ optional_return_type: argument_list: '(' ')' { $$ = array(); } - | '(' non_empty_argument_list no_comma ')' { $$ = $2; } + | '(' non_empty_argument_list optional_comma ')' { $$ = $2; } ; non_empty_argument_list: @@ -497,12 +518,12 @@ non_empty_static_var_list: ; static_var: - T_VARIABLE { $$ = Stmt\StaticVar[parseVar($1), null]; } - | T_VARIABLE '=' expr { $$ = Stmt\StaticVar[parseVar($1), $3]; } + plain_variable { $$ = Stmt\StaticVar[$1, null]; } + | plain_variable '=' expr { $$ = Stmt\StaticVar[$1, $3]; } ; class_statement_list: - class_statement_list class_statement { push($1, $2); } + class_statement_list class_statement { if ($2 !== null) { push($1, $2); } } | /* empty */ { init(); } ; @@ -511,10 +532,11 @@ class_statement: { $$ = Stmt\Property[$1, $2]; $this->checkProperty($$, #1); } | method_modifiers T_CONST class_const_list ';' { $$ = Stmt\ClassConst[$3, $1]; $this->checkClassConst($$, #1); } - | method_modifiers T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type method_body + | method_modifiers T_FUNCTION optional_ref identifier_ex '(' parameter_list ')' optional_return_type method_body { $$ = Stmt\ClassMethod[$4, ['type' => $1, 'byRef' => $3, 'params' => $6, 'returnType' => $8, 'stmts' => $9]]; $this->checkClassMethod($$, #1); } | T_USE class_name_list trait_adaptations { $$ = Stmt\TraitUse[$2, $3]; } + | error { $$ = null; /* will be skipped */ } ; trait_adaptations: @@ -530,27 +552,27 @@ trait_adaptation_list: trait_adaptation: trait_method_reference_fully_qualified T_INSTEADOF class_name_list ';' { $$ = Stmt\TraitUseAdaptation\Precedence[$1[0], $1[1], $3]; } - | trait_method_reference T_AS member_modifier identifier ';' + | trait_method_reference T_AS member_modifier identifier_ex ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, $4]; } | trait_method_reference T_AS member_modifier ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, null]; } - | trait_method_reference T_AS T_STRING ';' + | trait_method_reference T_AS identifier ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], null, $3]; } - | trait_method_reference T_AS reserved_non_modifiers ';' + | trait_method_reference T_AS reserved_non_modifiers_identifier ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], null, $3]; } ; trait_method_reference_fully_qualified: - name T_PAAMAYIM_NEKUDOTAYIM identifier { $$ = array($1, $3); } + name T_PAAMAYIM_NEKUDOTAYIM identifier_ex { $$ = array($1, $3); } ; trait_method_reference: trait_method_reference_fully_qualified { $$ = $1; } - | identifier { $$ = array(null, $1); } + | identifier_ex { $$ = array(null, $1); } ; method_body: ';' /* abstract method */ { $$ = null; } - | '{' inner_statement_list '}' { $$ = $2; } + | block_or_error { $$ = $1; } ; variable_modifiers: @@ -587,9 +609,13 @@ non_empty_property_declaration_list: { push($1, $3); } ; +property_decl_name: + T_VARIABLE { $$ = Node\VarLikeIdentifier[parseVar($1)]; } +; + property_declaration: - T_VARIABLE { $$ = Stmt\PropertyProperty[parseVar($1), null]; } - | T_VARIABLE '=' expr { $$ = Stmt\PropertyProperty[parseVar($1), $3]; } + property_decl_name { $$ = Stmt\PropertyProperty[$1, null]; } + | property_decl_name '=' expr { $$ = Stmt\PropertyProperty[$1, $3]; } ; expr_list: @@ -692,17 +718,18 @@ expr: | T_YIELD expr T_DOUBLE_ARROW expr { $$ = Expr\Yield_[$4, $2]; } | T_YIELD_FROM expr { $$ = Expr\YieldFrom[$2]; } | T_FUNCTION optional_ref '(' parameter_list ')' lexical_vars optional_return_type - '{' inner_statement_list '}' - { $$ = Expr\Closure[['static' => false, 'byRef' => $2, 'params' => $4, 'uses' => $6, 'returnType' => $7, 'stmts' => $9]]; } + block_or_error + { $$ = Expr\Closure[['static' => false, 'byRef' => $2, 'params' => $4, 'uses' => $6, 'returnType' => $7, 'stmts' => $8]]; } | T_STATIC T_FUNCTION optional_ref '(' parameter_list ')' lexical_vars optional_return_type - '{' inner_statement_list '}' - { $$ = Expr\Closure[['static' => true, 'byRef' => $3, 'params' => $5, 'uses' => $7, 'returnType' => $8, 'stmts' => $10]]; } + block_or_error + { $$ = Expr\Closure[['static' => true, 'byRef' => $3, 'params' => $5, 'uses' => $7, 'returnType' => $8, 'stmts' => $9]]; } ; anonymous_class: T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}' { $$ = array(Stmt\Class_[null, ['type' => 0, 'extends' => $3, 'implements' => $4, 'stmts' => $6]], $2); $this->checkClass($$[0], -1); } +; new_expr: T_NEW class_name_reference ctor_arguments { $$ = Expr\New_[$2, $3]; } @@ -725,7 +752,7 @@ non_empty_lexical_var_list: ; lexical_var: - optional_ref T_VARIABLE { $$ = Expr\ClosureUse[parseVar($2), $1]; } + optional_ref plain_variable { $$ = Expr\ClosureUse[$2, $1]; } ; function_call: @@ -776,7 +803,7 @@ ctor_arguments: constant: name { $$ = Expr\ConstFetch[$1]; } - | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier + | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_ex { $$ = Expr\ClassConstFetch[$1, $3]; } /* We interpret and isolated FOO:: as an unfinished class constant fetch. It could also be an unfinished static property fetch or unfinished scoped call. */ @@ -867,8 +894,13 @@ simple_variable: | '$' error { $$ = Expr\Error[]; $this->errorState = 2; } ; +static_member_prop_name: + simple_variable + { $var = $1; $$ = \is_string($var) ? Node\VarLikeIdentifier[$var] : $var; } +; + static_member: - class_name_or_var T_PAAMAYIM_NEKUDOTAYIM simple_variable + class_name_or_var T_PAAMAYIM_NEKUDOTAYIM static_member_prop_name { $$ = Expr\StaticPropertyFetch[$1, $3]; } ; @@ -877,18 +909,20 @@ new_variable: | new_variable '[' optional_expr ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } | new_variable '{' expr '}' { $$ = Expr\ArrayDimFetch[$1, $3]; } | new_variable T_OBJECT_OPERATOR property_name { $$ = Expr\PropertyFetch[$1, $3]; } - | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { $$ = Expr\StaticPropertyFetch[$1, $3]; } - | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable { $$ = Expr\StaticPropertyFetch[$1, $3]; } + | class_name T_PAAMAYIM_NEKUDOTAYIM static_member_prop_name + { $$ = Expr\StaticPropertyFetch[$1, $3]; } + | new_variable T_PAAMAYIM_NEKUDOTAYIM static_member_prop_name + { $$ = Expr\StaticPropertyFetch[$1, $3]; } ; member_name: - identifier { $$ = $1; } + identifier_ex { $$ = $1; } | '{' expr '}' { $$ = $2; } | simple_variable { $$ = Expr\Variable[$1]; } ; property_name: - T_STRING { $$ = $1; } + identifier { $$ = $1; } | '{' expr '}' { $$ = $2; } | simple_variable { $$ = Expr\Variable[$1]; } | error { $$ = Expr\Error[]; $this->errorState = 2; } @@ -905,15 +939,17 @@ list_expr_elements: list_expr_element: variable { $$ = Expr\ArrayItem[$1, null, false]; } + | '&' variable { $$ = Expr\ArrayItem[$2, null, true]; } | list_expr { $$ = Expr\ArrayItem[$1, null, false]; } | expr T_DOUBLE_ARROW variable { $$ = Expr\ArrayItem[$3, $1, false]; } + | expr T_DOUBLE_ARROW '&' variable { $$ = Expr\ArrayItem[$4, $1, true]; } | expr T_DOUBLE_ARROW list_expr { $$ = Expr\ArrayItem[$3, $1, false]; } | /* empty */ { $$ = null; } ; array_pair_list: inner_array_pair_list - { $$ = $1; $end = count($$)-1; if ($$[$end] === null) unset($$[$end]); } + { $$ = $1; $end = count($$)-1; if ($$[$end] === null) array_pop($$); } ; inner_array_pair_list: @@ -940,18 +976,18 @@ encaps_string_part: T_ENCAPSED_AND_WHITESPACE { $$ = Scalar\EncapsedStringPart[$1]; } ; -encaps_base_var: - T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } +encaps_str_varname: + T_STRING_VARNAME { $$ = Expr\Variable[$1]; } ; encaps_var: - encaps_base_var { $$ = $1; } - | encaps_base_var '[' encaps_var_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } - | encaps_base_var T_OBJECT_OPERATOR T_STRING { $$ = Expr\PropertyFetch[$1, $3]; } + plain_variable { $$ = $1; } + | plain_variable '[' encaps_var_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } + | plain_variable T_OBJECT_OPERATOR identifier { $$ = Expr\PropertyFetch[$1, $3]; } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' { $$ = Expr\Variable[$2]; } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' { $$ = Expr\Variable[$2]; } - | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' - { $$ = Expr\ArrayDimFetch[Expr\Variable[$2], $4]; } + | T_DOLLAR_OPEN_CURLY_BRACES encaps_str_varname '[' expr ']' '}' + { $$ = Expr\ArrayDimFetch[$2, $4]; } | T_CURLY_OPEN variable '}' { $$ = $2; } ; @@ -959,7 +995,7 @@ encaps_var_offset: T_STRING { $$ = Scalar\String_[$1]; } | T_NUM_STRING { $$ = $this->parseNumString($1, attributes()); } | '-' T_NUM_STRING { $$ = $this->parseNumString('-' . $2, attributes()); } - | T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } + | plain_variable { $$ = $1; } ; %% diff --git a/vendor/nikic/php-parser/grammar/rebuildParsers.php b/vendor/nikic/php-parser/grammar/rebuildParsers.php index 340b0eac..3be5edb6 100644 --- a/vendor/nikic/php-parser/grammar/rebuildParsers.php +++ b/vendor/nikic/php-parser/grammar/rebuildParsers.php @@ -176,11 +176,11 @@ function resolveMacros($code) { } if ('makeNop' == $name) { - assertArgs(2, $args, $name); + assertArgs(3, $args, $name); return '$startAttributes = ' . $args[1] . ';' . ' if (isset($startAttributes[\'comments\']))' - . ' { ' . $args[0] . ' = new Stmt\Nop([\'comments\' => $startAttributes[\'comments\']]); }' + . ' { ' . $args[0] . ' = new Stmt\Nop($startAttributes + ' . $args[2] . '); }' . ' else { ' . $args[0] . ' = null; }'; } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Autoloader.php b/vendor/nikic/php-parser/lib/PhpParser/Autoloader.php deleted file mode 100644 index 809a06ed..00000000 --- a/vendor/nikic/php-parser/lib/PhpParser/Autoloader.php +++ /dev/null @@ -1,40 +0,0 @@ -name = $name; } @@ -36,7 +37,7 @@ class Class_ extends Declaration * @return $this The builder instance (for fluid interface) */ public function extend($class) { - $this->extends = $this->normalizeName($class); + $this->extends = BuilderHelpers::normalizeName($class); return $this; } @@ -48,9 +49,9 @@ class Class_ extends Declaration * * @return $this The builder instance (for fluid interface) */ - public function implement() { - foreach (func_get_args() as $interface) { - $this->implements[] = $this->normalizeName($interface); + public function implement(...$interfaces) { + foreach ($interfaces as $interface) { + $this->implements[] = BuilderHelpers::normalizeName($interface); } return $this; @@ -62,7 +63,7 @@ class Class_ extends Declaration * @return $this The builder instance (for fluid interface) */ public function makeAbstract() { - $this->setModifier(Stmt\Class_::MODIFIER_ABSTRACT); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_ABSTRACT); return $this; } @@ -73,7 +74,7 @@ class Class_ extends Declaration * @return $this The builder instance (for fluid interface) */ public function makeFinal() { - $this->setModifier(Stmt\Class_::MODIFIER_FINAL); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_FINAL); return $this; } @@ -86,21 +87,21 @@ class Class_ extends Declaration * @return $this The builder instance (for fluid interface) */ public function addStmt($stmt) { - $stmt = $this->normalizeNode($stmt); + $stmt = BuilderHelpers::normalizeNode($stmt); - $targets = array( - 'Stmt_TraitUse' => &$this->uses, - 'Stmt_ClassConst' => &$this->constants, - 'Stmt_Property' => &$this->properties, - 'Stmt_ClassMethod' => &$this->methods, - ); + $targets = [ + Stmt\TraitUse::class => &$this->uses, + Stmt\ClassConst::class => &$this->constants, + Stmt\Property::class => &$this->properties, + Stmt\ClassMethod::class => &$this->methods, + ]; - $type = $stmt->getType(); - if (!isset($targets[$type])) { - throw new \LogicException(sprintf('Unexpected node of type "%s"', $type)); + $class = \get_class($stmt); + if (!isset($targets[$class])) { + throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType())); } - $targets[$type][] = $stmt; + $targets[$class][] = $stmt; return $this; } @@ -110,12 +111,12 @@ class Class_ extends Declaration * * @return Stmt\Class_ The built class node */ - public function getNode() { - return new Stmt\Class_($this->name, array( + public function getNode() : PhpParser\Node { + return new Stmt\Class_($this->name, [ 'flags' => $this->flags, 'extends' => $this->extends, 'implements' => $this->implements, 'stmts' => array_merge($this->uses, $this->constants, $this->properties, $this->methods), - ), $this->attributes); + ], $this->attributes); } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Declaration.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Declaration.php index 30a1937f..83094992 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Declaration.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Declaration.php @@ -1,12 +1,13 @@ -attributes['comments'] = array( - $this->normalizeDocComment($docComment) - ); + $this->attributes['comments'] = [ + BuilderHelpers::normalizeDocComment($docComment) + ]; return $this; } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php index 28a2ea61..8e7db399 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php @@ -1,14 +1,14 @@ -normalizeNode($param); + $param = BuilderHelpers::normalizeNode($param); if (!$param instanceof Node\Param) { throw new \LogicException(sprintf('Expected parameter node, got "%s"', $param->getType())); @@ -61,14 +61,13 @@ abstract class FunctionLike extends Declaration /** * Sets the return type for PHP 7. * - * @param string|Node\Name|Node\NullableType $type One of array, callable, string, int, float, bool, iterable, - * or a class/interface name. + * @param string|Node\Name|Node\NullableType $type One of array, callable, string, int, float, + * bool, iterable, or a class/interface name. * * @return $this The builder instance (for fluid interface) */ - public function setReturnType($type) - { - $this->returnType = $this->normalizeType($type); + public function setReturnType($type) { + $this->returnType = BuilderHelpers::normalizeType($type); return $this; } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Function_.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Function_.php index 228bdfaa..56eda2a8 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Function_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Function_.php @@ -1,22 +1,23 @@ -name = $name; } @@ -28,7 +29,7 @@ class Function_ extends FunctionLike * @return $this The builder instance (for fluid interface) */ public function addStmt($stmt) { - $this->stmts[] = $this->normalizeNode($stmt); + $this->stmts[] = BuilderHelpers::normalizeStmt($stmt); return $this; } @@ -38,12 +39,12 @@ class Function_ extends FunctionLike * * @return Stmt\Function_ The built function node */ - public function getNode() { - return new Stmt\Function_($this->name, array( + public function getNode() : Node { + return new Stmt\Function_($this->name, [ 'byRef' => $this->returnByRef, 'params' => $this->params, 'returnType' => $this->returnType, 'stmts' => $this->stmts, - ), $this->attributes); + ], $this->attributes); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Interface_.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Interface_.php index 8ebb292a..87e5b93e 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Interface_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Interface_.php @@ -1,24 +1,25 @@ -name = $name; } @@ -29,9 +30,9 @@ class Interface_ extends Declaration * * @return $this The builder instance (for fluid interface) */ - public function extend() { - foreach (func_get_args() as $interface) { - $this->extends[] = $this->normalizeName($interface); + public function extend(...$interfaces) { + foreach ($interfaces as $interface) { + $this->extends[] = BuilderHelpers::normalizeName($interface); } return $this; @@ -45,22 +46,16 @@ class Interface_ extends Declaration * @return $this The builder instance (for fluid interface) */ public function addStmt($stmt) { - $stmt = $this->normalizeNode($stmt); + $stmt = BuilderHelpers::normalizeNode($stmt); - $type = $stmt->getType(); - switch ($type) { - case 'Stmt_ClassConst': - $this->constants[] = $stmt; - break; - - case 'Stmt_ClassMethod': - // we erase all statements in the body of an interface method - $stmt->stmts = null; - $this->methods[] = $stmt; - break; - - default: - throw new \LogicException(sprintf('Unexpected node of type "%s"', $type)); + if ($stmt instanceof Stmt\ClassConst) { + $this->constants[] = $stmt; + } elseif ($stmt instanceof Stmt\ClassMethod) { + // we erase all statements in the body of an interface method + $stmt->stmts = null; + $this->methods[] = $stmt; + } else { + throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType())); } return $this; @@ -71,10 +66,10 @@ class Interface_ extends Declaration * * @return Stmt\Interface_ The built interface node */ - public function getNode() { - return new Stmt\Interface_($this->name, array( + public function getNode() : PhpParser\Node { + return new Stmt\Interface_($this->name, [ 'extends' => $this->extends, 'stmts' => array_merge($this->constants, $this->methods), - ), $this->attributes); + ], $this->attributes); } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Method.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Method.php index 1ed75eed..a3e86765 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Method.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Method.php @@ -1,8 +1,9 @@ -name = $name; } @@ -29,7 +30,7 @@ class Method extends FunctionLike * @return $this The builder instance (for fluid interface) */ public function makePublic() { - $this->setModifier(Stmt\Class_::MODIFIER_PUBLIC); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PUBLIC); return $this; } @@ -40,7 +41,7 @@ class Method extends FunctionLike * @return $this The builder instance (for fluid interface) */ public function makeProtected() { - $this->setModifier(Stmt\Class_::MODIFIER_PROTECTED); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PROTECTED); return $this; } @@ -51,7 +52,7 @@ class Method extends FunctionLike * @return $this The builder instance (for fluid interface) */ public function makePrivate() { - $this->setModifier(Stmt\Class_::MODIFIER_PRIVATE); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PRIVATE); return $this; } @@ -62,7 +63,7 @@ class Method extends FunctionLike * @return $this The builder instance (for fluid interface) */ public function makeStatic() { - $this->setModifier(Stmt\Class_::MODIFIER_STATIC); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_STATIC); return $this; } @@ -77,7 +78,7 @@ class Method extends FunctionLike throw new \LogicException('Cannot make method with statements abstract'); } - $this->setModifier(Stmt\Class_::MODIFIER_ABSTRACT); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_ABSTRACT); $this->stmts = null; // abstract methods don't have statements return $this; @@ -89,7 +90,7 @@ class Method extends FunctionLike * @return $this The builder instance (for fluid interface) */ public function makeFinal() { - $this->setModifier(Stmt\Class_::MODIFIER_FINAL); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_FINAL); return $this; } @@ -106,7 +107,7 @@ class Method extends FunctionLike throw new \LogicException('Cannot add statements to an abstract method'); } - $this->stmts[] = $this->normalizeNode($stmt); + $this->stmts[] = BuilderHelpers::normalizeStmt($stmt); return $this; } @@ -116,13 +117,13 @@ class Method extends FunctionLike * * @return Stmt\ClassMethod The built method node */ - public function getNode() { - return new Stmt\ClassMethod($this->name, array( + public function getNode() : Node { + return new Stmt\ClassMethod($this->name, [ 'flags' => $this->flags, 'byRef' => $this->returnByRef, 'params' => $this->params, 'returnType' => $this->returnType, 'stmts' => $this->stmts, - ), $this->attributes); + ], $this->attributes); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php index fe636c4f..b9ccab3e 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php @@ -1,15 +1,16 @@ -name = null !== $name ? $this->normalizeName($name) : null; + $this->name = null !== $name ? BuilderHelpers::normalizeName($name) : null; } /** @@ -28,7 +29,7 @@ class Namespace_ extends Declaration * @return $this The builder instance (for fluid interface) */ public function addStmt($stmt) { - $this->stmts[] = $this->normalizeNode($stmt); + $this->stmts[] = BuilderHelpers::normalizeStmt($stmt); return $this; } @@ -38,7 +39,7 @@ class Namespace_ extends Declaration * * @return Node The built node */ - public function getNode() { + public function getNode() : Node { return new Stmt\Namespace_($this->name, $this->stmts, $this->attributes); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php index c029e748..eff76cb4 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php @@ -1,11 +1,12 @@ -name = $name; } @@ -35,7 +36,7 @@ class Param extends PhpParser\BuilderAbstract * @return $this The builder instance (for fluid interface) */ public function setDefault($value) { - $this->default = $this->normalizeValue($value); + $this->default = BuilderHelpers::normalizeValue($value); return $this; } @@ -48,8 +49,8 @@ class Param extends PhpParser\BuilderAbstract * @return $this The builder instance (for fluid interface) */ public function setTypeHint($type) { - $this->type = $this->normalizeType($type); - if ($this->type === 'void') { + $this->type = BuilderHelpers::normalizeType($type); + if ($this->type == 'void') { throw new \LogicException('Parameter type cannot be void'); } @@ -83,9 +84,10 @@ class Param extends PhpParser\BuilderAbstract * * @return Node\Param The built parameter node */ - public function getNode() { + public function getNode() : Node { return new Node\Param( - $this->name, $this->default, $this->type, $this->byRef, $this->variadic + new Node\Expr\Variable($this->name), + $this->default, $this->type, $this->byRef, $this->variadic ); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Property.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Property.php index 053c851b..439bd09c 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Property.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Property.php @@ -1,24 +1,25 @@ -name = $name; } @@ -28,7 +29,7 @@ class Property extends PhpParser\BuilderAbstract * @return $this The builder instance (for fluid interface) */ public function makePublic() { - $this->setModifier(Stmt\Class_::MODIFIER_PUBLIC); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PUBLIC); return $this; } @@ -39,7 +40,7 @@ class Property extends PhpParser\BuilderAbstract * @return $this The builder instance (for fluid interface) */ public function makeProtected() { - $this->setModifier(Stmt\Class_::MODIFIER_PROTECTED); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PROTECTED); return $this; } @@ -50,7 +51,7 @@ class Property extends PhpParser\BuilderAbstract * @return $this The builder instance (for fluid interface) */ public function makePrivate() { - $this->setModifier(Stmt\Class_::MODIFIER_PRIVATE); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PRIVATE); return $this; } @@ -61,7 +62,7 @@ class Property extends PhpParser\BuilderAbstract * @return $this The builder instance (for fluid interface) */ public function makeStatic() { - $this->setModifier(Stmt\Class_::MODIFIER_STATIC); + $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_STATIC); return $this; } @@ -74,7 +75,7 @@ class Property extends PhpParser\BuilderAbstract * @return $this The builder instance (for fluid interface) */ public function setDefault($value) { - $this->default = $this->normalizeValue($value); + $this->default = BuilderHelpers::normalizeValue($value); return $this; } @@ -87,9 +88,9 @@ class Property extends PhpParser\BuilderAbstract * @return $this The builder instance (for fluid interface) */ public function setDocComment($docComment) { - $this->attributes = array( - 'comments' => array($this->normalizeDocComment($docComment)) - ); + $this->attributes = [ + 'comments' => [BuilderHelpers::normalizeDocComment($docComment)] + ]; return $this; } @@ -99,13 +100,13 @@ class Property extends PhpParser\BuilderAbstract * * @return Stmt\Property The built property node */ - public function getNode() { + public function getNode() : PhpParser\Node { return new Stmt\Property( $this->flags !== 0 ? $this->flags : Stmt\Class_::MODIFIER_PUBLIC, - array( + [ new Stmt\PropertyProperty($this->name, $this->default) - ), + ], $this->attributes ); } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Trait_.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Trait_.php index 7b004fa9..a836d40c 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Trait_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Trait_.php @@ -1,23 +1,24 @@ -name = $name; } @@ -29,13 +30,13 @@ class Trait_ extends Declaration * @return $this The builder instance (for fluid interface) */ public function addStmt($stmt) { - $stmt = $this->normalizeNode($stmt); + $stmt = BuilderHelpers::normalizeNode($stmt); if ($stmt instanceof Stmt\Property) { $this->properties[] = $stmt; - } else if ($stmt instanceof Stmt\ClassMethod) { + } elseif ($stmt instanceof Stmt\ClassMethod) { $this->methods[] = $stmt; - } else if ($stmt instanceof Stmt\TraitUse) { + } elseif ($stmt instanceof Stmt\TraitUse) { $this->uses[] = $stmt; } else { throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType())); @@ -49,11 +50,11 @@ class Trait_ extends Declaration * * @return Stmt\Trait_ The built interface node */ - public function getNode() { + public function getNode() : PhpParser\Node { return new Stmt\Trait_( - $this->name, array( + $this->name, [ 'stmts' => array_merge($this->uses, $this->properties, $this->methods) - ), $this->attributes + ], $this->attributes ); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Use_.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Use_.php index f6d3a856..2026a172 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Use_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Use_.php @@ -1,15 +1,14 @@ -name = $this->normalizeName($name); + public function __construct($name, int $type) { + $this->name = BuilderHelpers::normalizeName($name); $this->type = $type; } @@ -32,27 +31,19 @@ class Use_ extends BuilderAbstract { * * @return $this The builder instance (for fluid interface) */ - protected function as_($alias) { + public function as(string $alias) { $this->alias = $alias; return $this; } - public function __call($name, $args) { - if (method_exists($this, $name . '_')) { - return call_user_func_array(array($this, $name . '_'), $args); - } - - throw new \LogicException(sprintf('Method "%s" does not exist', $name)); - } /** * Returns the built node. * * @return Node The built node */ - public function getNode() { - $alias = null !== $this->alias ? $this->alias : $this->name->getLast(); - return new Stmt\Use_(array( - new Stmt\UseUse($this->name, $alias) - ), $this->type); + public function getNode() : Node { + return new Stmt\Use_([ + new Stmt\UseUse($this->name, $this->alias) + ], $this->type); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/BuilderAbstract.php b/vendor/nikic/php-parser/lib/PhpParser/BuilderAbstract.php deleted file mode 100644 index e353963e..00000000 --- a/vendor/nikic/php-parser/lib/PhpParser/BuilderAbstract.php +++ /dev/null @@ -1,175 +0,0 @@ -getNode(); - } elseif ($node instanceof Node) { - return $node; - } - - throw new \LogicException('Expected node or builder object'); - } - - /** - * Normalizes a name: Converts plain string names to PhpParser\Node\Name. - * - * @param Name|string $name The name to normalize - * - * @return Name The normalized name - */ - protected function normalizeName($name) { - if ($name instanceof Name) { - return $name; - } elseif (is_string($name)) { - if (!$name) { - throw new \LogicException('Name cannot be empty'); - } - - if ($name[0] == '\\') { - return new Name\FullyQualified(substr($name, 1)); - } elseif (0 === strpos($name, 'namespace\\')) { - return new Name\Relative(substr($name, strlen('namespace\\'))); - } else { - return new Name($name); - } - } - - throw new \LogicException('Name must be a string or an instance of PhpParser\Node\Name'); - } - - /** - * Normalizes a type: Converts plain-text type names into proper AST representation. - * - * In particular, builtin types are left as strings, custom types become Names and nullables - * are wrapped in NullableType nodes. - * - * @param Name|string|NullableType $type The type to normalize - * - * @return Name|string|NullableType The normalized type - */ - protected function normalizeType($type) { - if (!is_string($type)) { - if (!$type instanceof Name && !$type instanceof NullableType) { - throw new \LogicException( - 'Type must be a string, or an instance of Name or NullableType'); - } - return $type; - } - - $nullable = false; - if (strlen($type) > 0 && $type[0] === '?') { - $nullable = true; - $type = substr($type, 1); - } - - $builtinTypes = array( - 'array', 'callable', 'string', 'int', 'float', 'bool', 'iterable', 'void', 'object' - ); - - $lowerType = strtolower($type); - if (in_array($lowerType, $builtinTypes)) { - $type = $lowerType; - } else { - $type = $this->normalizeName($type); - } - - if ($nullable && $type === 'void') { - throw new \LogicException('void type cannot be nullable'); - } - - return $nullable ? new Node\NullableType($type) : $type; - } - - /** - * Normalizes a value: Converts nulls, booleans, integers, - * floats, strings and arrays into their respective nodes - * - * @param mixed $value The value to normalize - * - * @return Expr The normalized value - */ - protected function normalizeValue($value) { - if ($value instanceof Node) { - return $value; - } elseif (is_null($value)) { - return new Expr\ConstFetch( - new Name('null') - ); - } elseif (is_bool($value)) { - return new Expr\ConstFetch( - new Name($value ? 'true' : 'false') - ); - } elseif (is_int($value)) { - return new Scalar\LNumber($value); - } elseif (is_float($value)) { - return new Scalar\DNumber($value); - } elseif (is_string($value)) { - return new Scalar\String_($value); - } elseif (is_array($value)) { - $items = array(); - $lastKey = -1; - foreach ($value as $itemKey => $itemValue) { - // for consecutive, numeric keys don't generate keys - if (null !== $lastKey && ++$lastKey === $itemKey) { - $items[] = new Expr\ArrayItem( - $this->normalizeValue($itemValue) - ); - } else { - $lastKey = null; - $items[] = new Expr\ArrayItem( - $this->normalizeValue($itemValue), - $this->normalizeValue($itemKey) - ); - } - } - - return new Expr\Array_($items); - } else { - throw new \LogicException('Invalid value'); - } - } - - /** - * Normalizes a doc comment: Converts plain strings to PhpParser\Comment\Doc. - * - * @param Comment\Doc|string $docComment The doc comment to normalize - * - * @return Comment\Doc The normalized doc comment - */ - protected function normalizeDocComment($docComment) { - if ($docComment instanceof Comment\Doc) { - return $docComment; - } else if (is_string($docComment)) { - return new Comment\Doc($docComment); - } else { - throw new \LogicException('Doc comment must be a string or an instance of PhpParser\Comment\Doc'); - } - } - - /** - * Sets a modifier in the $this->type property. - * - * @param int $modifier Modifier to set - */ - protected function setModifier($modifier) { - Stmt\Class_::verifyModifier($this->flags, $modifier); - $this->flags |= $modifier; - } -} diff --git a/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php b/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php index 42c7f612..ee855589 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php +++ b/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php @@ -1,21 +1,16 @@ -args($args) + ); + } + + /** + * Creates a method call node. + * + * @param Expr $var Variable the method is called on + * @param string|Identifier|Expr $name Method name + * @param array $args Method arguments + * + * @return Expr\MethodCall + */ + public function methodCall(Expr $var, $name, array $args = []) : Expr\MethodCall { + return new Expr\MethodCall( + $var, + BuilderHelpers::normalizeIdentifierOrExpr($name), + $this->args($args) + ); + } + + /** + * Creates a static method call node. + * + * @param string|Name|Expr $class Class name + * @param string|Identifier|Expr $name Method name + * @param array $args Method arguments + * + * @return Expr\StaticCall + */ + public function staticCall($class, $name, array $args = []) : Expr\StaticCall { + return new Expr\StaticCall( + BuilderHelpers::normalizeNameOrExpr($class), + BuilderHelpers::normalizeIdentifierOrExpr($name), + $this->args($args) + ); + } + + /** + * Creates an object creation node. + * + * @param string|Name|Expr $class Class name + * @param array $args Constructor arguments + * + * @return Expr\New_ + */ + public function new($class, array $args = []) : Expr\New_ { + return new Expr\New_( + BuilderHelpers::normalizeNameOrExpr($class), + $this->args($args) + ); + } + + /** + * Creates a constant fetch node. + * + * @param string|Name $name Constant name + * + * @return Expr\ConstFetch + */ + public function constFetch($name) : Expr\ConstFetch { + return new Expr\ConstFetch(BuilderHelpers::normalizeName($name)); + } + + /** + * Creates a class constant fetch node. + * + * @param string|Name|Expr $class Class name + * @param string|Identifier $name Constant name + * + * @return Expr\ClassConstFetch + */ + public function classConstFetch($class, $name): Expr\ClassConstFetch { + return new Expr\ClassConstFetch( + BuilderHelpers::normalizeNameOrExpr($class), + BuilderHelpers::normalizeIdentifier($name) + ); + } + + /** + * Creates nested Concat nodes from a list of expressions. + * + * @param Expr|string ...$exprs Expressions or literal strings + * + * @return Concat + */ + public function concat(...$exprs) : Concat { + $numExprs = count($exprs); + if ($numExprs < 2) { + throw new \LogicException('Expected at least two expressions'); } - throw new \LogicException(sprintf('Method "%s" does not exist', $name)); + $lastConcat = $this->normalizeStringExpr($exprs[0]); + for ($i = 1; $i < $numExprs; $i++) { + $lastConcat = new Concat($lastConcat, $this->normalizeStringExpr($exprs[$i])); + } + return $lastConcat; + } + + /** + * @param string|Expr $expr + * @return Expr + */ + private function normalizeStringExpr($expr) : Expr { + if ($expr instanceof Expr) { + return $expr; + } + + if (\is_string($expr)) { + return new String_($expr); + } + + throw new \LogicException('Expected string or Expr'); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php b/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php new file mode 100644 index 00000000..d5ae1792 --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php @@ -0,0 +1,277 @@ +getNode(); + } elseif ($node instanceof Node) { + return $node; + } + + throw new \LogicException('Expected node or builder object'); + } + + /** + * Normalizes a node to a statement. + * + * Expressions are wrapped in a Stmt\Expression node. + * + * @param Node|Builder $node The node to normalize + * + * @return Stmt The normalized statement node + */ + public static function normalizeStmt($node) : Stmt { + $node = self::normalizeNode($node); + if ($node instanceof Stmt) { + return $node; + } + + if ($node instanceof Expr) { + return new Stmt\Expression($node); + } + + throw new \LogicException('Expected statement or expression node'); + } + + /** + * Normalizes strings to Identifier. + * + * @param string|Identifier $name The identifier to normalize + * + * @return Identifier The normalized identifier + */ + public static function normalizeIdentifier($name) : Identifier { + if ($name instanceof Identifier) { + return $name; + } + + if (\is_string($name)) { + return new Identifier($name); + } + + throw new \LogicException('Expected string or instance of Node\Identifier or Node\Expr'); + } + + /** + * Normalizes strings to Identifier, also allowing expressions. + * + * @param string|Identifier|Expr $name The identifier to normalize + * + * @return Identifier|Expr The normalized identifier or expression + */ + public static function normalizeIdentifierOrExpr($name) { + if ($name instanceof Identifier || $name instanceof Expr) { + return $name; + } + + if (\is_string($name)) { + return new Identifier($name); + } + + throw new \LogicException('Expected string or instance of Node\Identifier or Node\Expr'); + } + + /** + * Normalizes a name: Converts string names to Name nodes. + * + * @param Name|string $name The name to normalize + * + * @return Name The normalized name + */ + public static function normalizeName($name) : Name { + return self::normalizeNameCommon($name, false); + } + + /** + * Normalizes a name: Converts string names to Name nodes, while also allowing expressions. + * + * @param Expr|Name|string $name The name to normalize + * + * @return Name|Expr The normalized name or expression + */ + public static function normalizeNameOrExpr($name) { + return self::normalizeNameCommon($name, true); + } + + /** + * Normalizes a name: Converts string names to Name nodes, optionally allowing expressions. + * + * @param Expr|Name|string $name The name to normalize + * @param bool $allowExpr Whether to also allow expressions + * + * @return Name|Expr The normalized name, or expression (if allowed) + */ + private static function normalizeNameCommon($name, bool $allowExpr) { + if ($name instanceof Name) { + return $name; + } elseif (is_string($name)) { + if (!$name) { + throw new \LogicException('Name cannot be empty'); + } + + if ($name[0] === '\\') { + return new Name\FullyQualified(substr($name, 1)); + } elseif (0 === strpos($name, 'namespace\\')) { + return new Name\Relative(substr($name, strlen('namespace\\'))); + } else { + return new Name($name); + } + } + + if ($allowExpr) { + if ($name instanceof Expr) { + return $name; + } + throw new \LogicException( + 'Name must be a string or an instance of Node\Name or Node\Expr' + ); + } else { + throw new \LogicException('Name must be a string or an instance of Node\Name'); + } + } + + /** + * Normalizes a type: Converts plain-text type names into proper AST representation. + * + * In particular, builtin types become Identifiers, custom types become Names and nullables + * are wrapped in NullableType nodes. + * + * @param string|Name|Identifier|NullableType $type The type to normalize + * + * @return Name|Identifier|NullableType The normalized type + */ + public static function normalizeType($type) { + if (!is_string($type)) { + if (!$type instanceof Name && !$type instanceof Identifier + && !$type instanceof NullableType) { + throw new \LogicException( + 'Type must be a string, or an instance of Name, Identifier or NullableType'); + } + return $type; + } + + $nullable = false; + if (strlen($type) > 0 && $type[0] === '?') { + $nullable = true; + $type = substr($type, 1); + } + + $builtinTypes = [ + 'array', 'callable', 'string', 'int', 'float', 'bool', 'iterable', 'void', 'object' + ]; + + $lowerType = strtolower($type); + if (in_array($lowerType, $builtinTypes)) { + $type = new Identifier($lowerType); + } else { + $type = self::normalizeName($type); + } + + if ($nullable && (string) $type === 'void') { + throw new \LogicException('void type cannot be nullable'); + } + + return $nullable ? new Node\NullableType($type) : $type; + } + + /** + * Normalizes a value: Converts nulls, booleans, integers, + * floats, strings and arrays into their respective nodes + * + * @param Node\Expr|bool|null|int|float|string|array $value The value to normalize + * + * @return Expr The normalized value + */ + public static function normalizeValue($value) : Expr { + if ($value instanceof Node\Expr) { + return $value; + } elseif (is_null($value)) { + return new Expr\ConstFetch( + new Name('null') + ); + } elseif (is_bool($value)) { + return new Expr\ConstFetch( + new Name($value ? 'true' : 'false') + ); + } elseif (is_int($value)) { + return new Scalar\LNumber($value); + } elseif (is_float($value)) { + return new Scalar\DNumber($value); + } elseif (is_string($value)) { + return new Scalar\String_($value); + } elseif (is_array($value)) { + $items = []; + $lastKey = -1; + foreach ($value as $itemKey => $itemValue) { + // for consecutive, numeric keys don't generate keys + if (null !== $lastKey && ++$lastKey === $itemKey) { + $items[] = new Expr\ArrayItem( + self::normalizeValue($itemValue) + ); + } else { + $lastKey = null; + $items[] = new Expr\ArrayItem( + self::normalizeValue($itemValue), + self::normalizeValue($itemKey) + ); + } + } + + return new Expr\Array_($items); + } else { + throw new \LogicException('Invalid value'); + } + } + + /** + * Normalizes a doc comment: Converts plain strings to PhpParser\Comment\Doc. + * + * @param Comment\Doc|string $docComment The doc comment to normalize + * + * @return Comment\Doc The normalized doc comment + */ + public static function normalizeDocComment($docComment) : Comment\Doc { + if ($docComment instanceof Comment\Doc) { + return $docComment; + } elseif (is_string($docComment)) { + return new Comment\Doc($docComment); + } else { + throw new \LogicException('Doc comment must be a string or an instance of PhpParser\Comment\Doc'); + } + } + + /** + * Adds a modifier and returns new modifier bitmask. + * + * @param int $modifiers Existing modifiers + * @param int $modifier Modifier to set + * + * @return int New modifiers + */ + public static function addModifier(int $modifiers, int $modifier) : int { + Stmt\Class_::verifyModifier($modifiers, $modifier); + return $modifiers | $modifier; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Comment.php b/vendor/nikic/php-parser/lib/PhpParser/Comment.php index 4034cfa6..5da84209 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Comment.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Comment.php @@ -1,4 +1,4 @@ -text = $text; $this->line = $startLine; $this->filePos = $startFilePos; + $this->tokenPos = $startTokenPos; } /** @@ -26,7 +31,7 @@ class Comment implements \JsonSerializable * * @return string The comment text (including comment delimiters like /*) */ - public function getText() { + public function getText() : string { return $this->text; } @@ -35,7 +40,7 @@ class Comment implements \JsonSerializable * * @return int Line number */ - public function getLine() { + public function getLine() : int { return $this->line; } @@ -44,16 +49,25 @@ class Comment implements \JsonSerializable * * @return int File offset */ - public function getFilePos() { + public function getFilePos() : int { return $this->filePos; } + /** + * Gets the token offset the comment started on. + * + * @return int Token offset + */ + public function getTokenPos() : int { + return $this->tokenPos; + } + /** * Gets the comment text. * * @return string The comment text (including comment delimiters like /*) */ - public function __toString() { + public function __toString() : string { return $this->text; } @@ -114,9 +128,17 @@ class Comment implements \JsonSerializable return $text; } - private function getShortestWhitespacePrefixLen($str) { + /** + * Get length of shortest whitespace prefix (at the start of a line). + * + * If there is a line with no prefix whitespace, 0 is a valid return value. + * + * @param string $str String to check + * @return int Length in characters. Tabs count as single characters. + */ + private function getShortestWhitespacePrefixLen(string $str) : int { $lines = explode("\n", $str); - $shortestPrefixLen = INF; + $shortestPrefixLen = \INF; foreach ($lines as $line) { preg_match('(^\s*)', $line, $matches); $prefixLen = strlen($matches[0]); @@ -127,7 +149,11 @@ class Comment implements \JsonSerializable return $shortestPrefixLen; } - public function jsonSerialize() { + /** + * @return array + * @psalm-return array{nodeType:string, text:mixed, line:mixed, filePos:mixed} + */ + public function jsonSerialize() : array { // Technically not a node, but we make it look like one anyway $type = $this instanceof Comment\Doc ? 'Comment_Doc' : 'Comment'; return [ @@ -135,6 +161,7 @@ class Comment implements \JsonSerializable 'text' => $this->text, 'line' => $this->line, 'filePos' => $this->filePos, + 'tokenPos' => $this->tokenPos, ]; } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Comment/Doc.php b/vendor/nikic/php-parser/lib/PhpParser/Comment/Doc.php index 24fc6c9e..a9db6128 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Comment/Doc.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Comment/Doc.php @@ -1,7 +1,7 @@ -fallbackEvaluator = $fallbackEvaluator ?? function(Expr $expr) { + throw new ConstExprEvaluationException( + "Expression of type {$expr->getType()} cannot be evaluated" + ); + }; + } + + /** + * Silently evaluates a constant expression into a PHP value. + * + * Thrown Errors, warnings or notices will be converted into a ConstExprEvaluationException. + * The original source of the exception is available through getPrevious(). + * + * If some part of the expression cannot be evaluated, the fallback evaluator passed to the + * constructor will be invoked. By default, if no fallback is provided, an exception of type + * ConstExprEvaluationException is thrown. + * + * See class doc comment for caveats and limitations. + * + * @param Expr $expr Constant expression to evaluate + * @return mixed Result of evaluation + * + * @throws ConstExprEvaluationException if the expression cannot be evaluated or an error occurred + */ + public function evaluateSilently(Expr $expr) { + set_error_handler(function($num, $str, $file, $line) { + throw new \ErrorException($str, 0, $num, $file, $line); + }); + + try { + return $this->evaluate($expr); + } catch (\Throwable $e) { + if (!$e instanceof ConstExprEvaluationException) { + $e = new ConstExprEvaluationException( + "An error occurred during constant expression evaluation", 0, $e); + } + throw $e; + } finally { + restore_error_handler(); + } + } + + /** + * Directly evaluates a constant expression into a PHP value. + * + * May generate Error exceptions, warnings or notices. Use evaluateSilently() to convert these + * into a ConstExprEvaluationException. + * + * If some part of the expression cannot be evaluated, the fallback evaluator passed to the + * constructor will be invoked. By default, if no fallback is provided, an exception of type + * ConstExprEvaluationException is thrown. + * + * See class doc comment for caveats and limitations. + * + * @param Expr $expr Constant expression to evaluate + * @return mixed Result of evaluation + * + * @throws ConstExprEvaluationException if the expression cannot be evaluated + */ + public function evaluateDirectly(Expr $expr) { + return $this->evaluate($expr); + } + + private function evaluate(Expr $expr) { + if ($expr instanceof Scalar\LNumber + || $expr instanceof Scalar\DNumber + || $expr instanceof Scalar\String_ + ) { + return $expr->value; + } + + if ($expr instanceof Expr\Array_) { + return $this->evaluateArray($expr); + } + + // Unary operators + if ($expr instanceof Expr\UnaryPlus) { + return +$this->evaluate($expr->expr); + } + if ($expr instanceof Expr\UnaryMinus) { + return -$this->evaluate($expr->expr); + } + if ($expr instanceof Expr\BooleanNot) { + return !$this->evaluate($expr->expr); + } + if ($expr instanceof Expr\BitwiseNot) { + return ~$this->evaluate($expr->expr); + } + + if ($expr instanceof Expr\BinaryOp) { + return $this->evaluateBinaryOp($expr); + } + + if ($expr instanceof Expr\Ternary) { + return $this->evaluateTernary($expr); + } + + if ($expr instanceof Expr\ArrayDimFetch && null !== $expr->dim) { + return $this->evaluate($expr->var)[$this->evaluate($expr->dim)]; + } + + if ($expr instanceof Expr\ConstFetch) { + return $this->evaluateConstFetch($expr); + } + + return ($this->fallbackEvaluator)($expr); + } + + private function evaluateArray(Expr\Array_ $expr) { + $array = []; + foreach ($expr->items as $item) { + if (null !== $item->key) { + $array[$this->evaluate($item->key)] = $this->evaluate($item->value); + } else { + $array[] = $this->evaluate($item->value); + } + } + return $array; + } + + private function evaluateTernary(Expr\Ternary $expr) { + if (null === $expr->if) { + return $this->evaluate($expr->cond) ?: $this->evaluate($expr->else); + } + + return $this->evaluate($expr->cond) + ? $this->evaluate($expr->if) + : $this->evaluate($expr->else); + } + + private function evaluateBinaryOp(Expr\BinaryOp $expr) { + if ($expr instanceof Expr\BinaryOp\Coalesce + && $expr->left instanceof Expr\ArrayDimFetch + ) { + // This needs to be special cased to respect BP_VAR_IS fetch semantics + return $this->evaluate($expr->left->var)[$this->evaluate($expr->left->dim)] + ?? $this->evaluate($expr->right); + } + + // The evaluate() calls are repeated in each branch, because some of the operators are + // short-circuiting and evaluating the RHS in advance may be illegal in that case + $l = $expr->left; + $r = $expr->right; + switch ($expr->getOperatorSigil()) { + case '&': return $this->evaluate($l) & $this->evaluate($r); + case '|': return $this->evaluate($l) | $this->evaluate($r); + case '^': return $this->evaluate($l) ^ $this->evaluate($r); + case '&&': return $this->evaluate($l) && $this->evaluate($r); + case '||': return $this->evaluate($l) || $this->evaluate($r); + case '??': return $this->evaluate($l) ?? $this->evaluate($r); + case '.': return $this->evaluate($l) . $this->evaluate($r); + case '/': return $this->evaluate($l) / $this->evaluate($r); + case '==': return $this->evaluate($l) == $this->evaluate($r); + case '>': return $this->evaluate($l) > $this->evaluate($r); + case '>=': return $this->evaluate($l) >= $this->evaluate($r); + case '===': return $this->evaluate($l) === $this->evaluate($r); + case 'and': return $this->evaluate($l) and $this->evaluate($r); + case 'or': return $this->evaluate($l) or $this->evaluate($r); + case 'xor': return $this->evaluate($l) xor $this->evaluate($r); + case '-': return $this->evaluate($l) - $this->evaluate($r); + case '%': return $this->evaluate($l) % $this->evaluate($r); + case '*': return $this->evaluate($l) * $this->evaluate($r); + case '!=': return $this->evaluate($l) != $this->evaluate($r); + case '!==': return $this->evaluate($l) !== $this->evaluate($r); + case '+': return $this->evaluate($l) + $this->evaluate($r); + case '**': return $this->evaluate($l) ** $this->evaluate($r); + case '<<': return $this->evaluate($l) << $this->evaluate($r); + case '>>': return $this->evaluate($l) >> $this->evaluate($r); + case '<': return $this->evaluate($l) < $this->evaluate($r); + case '<=': return $this->evaluate($l) <= $this->evaluate($r); + case '<=>': return $this->evaluate($l) <=> $this->evaluate($r); + } + + throw new \Exception('Should not happen'); + } + + private function evaluateConstFetch(Expr\ConstFetch $expr) { + $name = $expr->name->toLowerString(); + switch ($name) { + case 'null': return null; + case 'false': return false; + case 'true': return true; + } + + return ($this->fallbackEvaluator)($expr); + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Error.php b/vendor/nikic/php-parser/lib/PhpParser/Error.php index 4a23294f..d1fb959d 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Error.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Error.php @@ -1,4 +1,4 @@ -rawMessage = (string) $message; + public function __construct(string $message, $attributes = []) { + $this->rawMessage = $message; if (is_array($attributes)) { $this->attributes = $attributes; } else { - $this->attributes = array('startLine' => $attributes); + $this->attributes = ['startLine' => $attributes]; } $this->updateMessage(); } @@ -29,7 +29,7 @@ class Error extends \RuntimeException * * @return string Error message */ - public function getRawMessage() { + public function getRawMessage() : string { return $this->rawMessage; } @@ -38,8 +38,8 @@ class Error extends \RuntimeException * * @return int Error start line */ - public function getStartLine() { - return isset($this->attributes['startLine']) ? $this->attributes['startLine'] : -1; + public function getStartLine() : int { + return $this->attributes['startLine'] ?? -1; } /** @@ -47,22 +47,21 @@ class Error extends \RuntimeException * * @return int Error end line */ - public function getEndLine() { - return isset($this->attributes['endLine']) ? $this->attributes['endLine'] : -1; + public function getEndLine() : int { + return $this->attributes['endLine'] ?? -1; } - /** * Gets the attributes of the node/token the error occurred at. * * @return array */ - public function getAttributes() { + public function getAttributes() : array { return $this->attributes; } /** - * Sets the attributes of the node/token the error occured at. + * Sets the attributes of the node/token the error occurred at. * * @param array $attributes */ @@ -76,8 +75,8 @@ class Error extends \RuntimeException * * @param string $message Error message */ - public function setRawMessage($message) { - $this->rawMessage = (string) $message; + public function setRawMessage(string $message) { + $this->rawMessage = $message; $this->updateMessage(); } @@ -86,8 +85,8 @@ class Error extends \RuntimeException * * @param int $line Error start line */ - public function setStartLine($line) { - $this->attributes['startLine'] = (int) $line; + public function setStartLine(int $line) { + $this->attributes['startLine'] = $line; $this->updateMessage(); } @@ -98,8 +97,8 @@ class Error extends \RuntimeException * * @return bool */ - public function hasColumnInfo() { - return isset($this->attributes['startFilePos']) && isset($this->attributes['endFilePos']); + public function hasColumnInfo() : bool { + return isset($this->attributes['startFilePos'], $this->attributes['endFilePos']); } /** @@ -108,7 +107,7 @@ class Error extends \RuntimeException * @param string $code Source code of the file * @return int */ - public function getStartColumn($code) { + public function getStartColumn(string $code) : int { if (!$this->hasColumnInfo()) { throw new \RuntimeException('Error does not have column information'); } @@ -122,7 +121,7 @@ class Error extends \RuntimeException * @param string $code Source code of the file * @return int */ - public function getEndColumn($code) { + public function getEndColumn(string $code) : int { if (!$this->hasColumnInfo()) { throw new \RuntimeException('Error does not have column information'); } @@ -130,7 +129,14 @@ class Error extends \RuntimeException return $this->toColumn($code, $this->attributes['endFilePos']); } - public function getMessageWithColumnInfo($code) { + /** + * Formats message including line and column information. + * + * @param string $code Source code associated with the error, for calculation of the columns + * + * @return string Formatted message + */ + public function getMessageWithColumnInfo(string $code) : string { return sprintf( '%s from %d:%d to %d:%d', $this->getRawMessage(), $this->getStartLine(), $this->getStartColumn($code), @@ -138,7 +144,15 @@ class Error extends \RuntimeException ); } - private function toColumn($code, $pos) { + /** + * Converts a file offset into a column. + * + * @param string $code Source code that $pos indexes into + * @param int $pos 0-based position in $code + * + * @return int 1-based column (relative to start of line) + */ + private function toColumn(string $code, int $pos) : int { if ($pos > strlen($code)) { throw new \RuntimeException('Invalid position information'); } diff --git a/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler.php b/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler.php index fa2c2f8c..d620e745 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler.php +++ b/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler.php @@ -1,4 +1,4 @@ -errors; } @@ -33,7 +33,7 @@ class Collecting implements ErrorHandler * * @return bool */ - public function hasErrors() { + public function hasErrors() : bool { return !empty($this->errors); } @@ -43,4 +43,4 @@ class Collecting implements ErrorHandler public function clearErrors() { $this->errors = []; } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php b/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php index c5a76dd0..aeee989b 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php +++ b/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php @@ -1,4 +1,4 @@ -type = $type; + $this->old = $old; + $this->new = $new; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Internal/Differ.php b/vendor/nikic/php-parser/lib/PhpParser/Internal/Differ.php new file mode 100644 index 00000000..7f218c74 --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/Internal/Differ.php @@ -0,0 +1,164 @@ +isEqual = $isEqual; + } + + /** + * Calculate diff (edit script) from $old to $new. + * + * @param array $old Original array + * @param array $new New array + * + * @return DiffElem[] Diff (edit script) + */ + public function diff(array $old, array $new) { + list($trace, $x, $y) = $this->calculateTrace($old, $new); + return $this->extractDiff($trace, $x, $y, $old, $new); + } + + /** + * Calculate diff, including "replace" operations. + * + * If a sequence of remove operations is followed by the same number of add operations, these + * will be coalesced into replace operations. + * + * @param array $old Original array + * @param array $new New array + * + * @return DiffElem[] Diff (edit script), including replace operations + */ + public function diffWithReplacements(array $old, array $new) { + return $this->coalesceReplacements($this->diff($old, $new)); + } + + private function calculateTrace(array $a, array $b) { + $n = \count($a); + $m = \count($b); + $max = $n + $m; + $v = [1 => 0]; + $trace = []; + for ($d = 0; $d <= $max; $d++) { + $trace[] = $v; + for ($k = -$d; $k <= $d; $k += 2) { + if ($k === -$d || ($k !== $d && $v[$k-1] < $v[$k+1])) { + $x = $v[$k+1]; + } else { + $x = $v[$k-1] + 1; + } + + $y = $x - $k; + while ($x < $n && $y < $m && ($this->isEqual)($a[$x], $b[$y])) { + $x++; + $y++; + } + + $v[$k] = $x; + if ($x >= $n && $y >= $m) { + return [$trace, $x, $y]; + } + } + } + throw new \Exception('Should not happen'); + } + + private function extractDiff(array $trace, int $x, int $y, array $a, array $b) { + $result = []; + for ($d = \count($trace) - 1; $d >= 0; $d--) { + $v = $trace[$d]; + $k = $x - $y; + + if ($k === -$d || ($k !== $d && $v[$k-1] < $v[$k+1])) { + $prevK = $k + 1; + } else { + $prevK = $k - 1; + } + + $prevX = $v[$prevK]; + $prevY = $prevX - $prevK; + + while ($x > $prevX && $y > $prevY) { + $result[] = new DiffElem(DiffElem::TYPE_KEEP, $a[$x-1], $b[$y-1]); + $x--; + $y--; + } + + if ($d === 0) { + break; + } + + while ($x > $prevX) { + $result[] = new DiffElem(DiffElem::TYPE_REMOVE, $a[$x-1], null); + $x--; + } + + while ($y > $prevY) { + $result[] = new DiffElem(DiffElem::TYPE_ADD, null, $b[$y-1]); + $y--; + } + } + return array_reverse($result); + } + + /** + * Coalesce equal-length sequences of remove+add into a replace operation. + * + * @param DiffElem[] $diff + * @return DiffElem[] + */ + private function coalesceReplacements(array $diff) { + $newDiff = []; + $c = \count($diff); + for ($i = 0; $i < $c; $i++) { + $diffType = $diff[$i]->type; + if ($diffType !== DiffElem::TYPE_REMOVE) { + $newDiff[] = $diff[$i]; + continue; + } + + $j = $i; + while ($j < $c && $diff[$j]->type === DiffElem::TYPE_REMOVE) { + $j++; + } + + $k = $j; + while ($k < $c && $diff[$k]->type === DiffElem::TYPE_ADD) { + $k++; + } + + if ($j - $i === $k - $j) { + $len = $j - $i; + for ($n = 0; $n < $len; $n++) { + $newDiff[] = new DiffElem( + DiffElem::TYPE_REPLACE, $diff[$i + $n]->old, $diff[$j + $n]->new + ); + } + } else { + for (; $i < $k; $i++) { + $newDiff[] = $diff[$i]; + } + } + $i = $k - 1; + } + return $newDiff; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php b/vendor/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php new file mode 100644 index 00000000..dcacbfb6 --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php @@ -0,0 +1,56 @@ +args = $args; + $this->extends = $extends; + $this->implements = $implements; + $this->stmts = $stmts; + } + + public static function fromNewNode(Expr\New_ $newNode) { + $class = $newNode->class; + assert($class instanceof Node\Stmt\Class_); + assert($class->name === null); + return new self( + $newNode->args, $class->extends, $class->implements, + $class->stmts, $newNode->getAttributes() + ); + } + + public function getType() : string { + return 'Expr_PrintableNewAnonClass'; + } + + public function getSubNodeNames() : array { + return ['args', 'extends', 'implements', 'stmts']; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php b/vendor/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php new file mode 100644 index 00000000..cf9e00ab --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php @@ -0,0 +1,256 @@ +tokens = $tokens; + $this->indentMap = $this->calcIndentMap(); + } + + /** + * Whether the given position is immediately surrounded by parenthesis. + * + * @param int $startPos Start position + * @param int $endPos End position + * + * @return bool + */ + public function haveParens(int $startPos, int $endPos) : bool { + return $this->haveTokenImmediativelyBefore($startPos, '(') + && $this->haveTokenImmediatelyAfter($endPos, ')'); + } + + /** + * Whether the given position is immediately surrounded by braces. + * + * @param int $startPos Start position + * @param int $endPos End position + * + * @return bool + */ + public function haveBraces(int $startPos, int $endPos) : bool { + return $this->haveTokenImmediativelyBefore($startPos, '{') + && $this->haveTokenImmediatelyAfter($endPos, '}'); + } + + /** + * Check whether the position is directly preceded by a certain token type. + * + * During this check whitespace and comments are skipped. + * + * @param int $pos Position before which the token should occur + * @param int|string $expectedTokenType Token to check for + * + * @return bool Whether the expected token was found + */ + public function haveTokenImmediativelyBefore(int $pos, $expectedTokenType) : bool { + $tokens = $this->tokens; + $pos--; + for (; $pos >= 0; $pos--) { + $tokenType = $tokens[$pos][0]; + if ($tokenType === $expectedTokenType) { + return true; + } + if ($tokenType !== \T_WHITESPACE + && $tokenType !== \T_COMMENT && $tokenType !== \T_DOC_COMMENT) { + break; + } + } + return false; + } + + /** + * Check whether the position is directly followed by a certain token type. + * + * During this check whitespace and comments are skipped. + * + * @param int $pos Position after which the token should occur + * @param int|string $expectedTokenType Token to check for + * + * @return bool Whether the expected token was found + */ + public function haveTokenImmediatelyAfter(int $pos, $expectedTokenType) : bool { + $tokens = $this->tokens; + $pos++; + for (; $pos < \count($tokens); $pos++) { + $tokenType = $tokens[$pos][0]; + if ($tokenType === $expectedTokenType) { + return true; + } + if ($tokenType !== \T_WHITESPACE + && $tokenType !== \T_COMMENT && $tokenType !== \T_DOC_COMMENT) { + break; + } + } + return false; + } + + public function skipLeft(int $pos, $skipTokenType) { + $tokens = $this->tokens; + + $pos = $this->skipLeftWhitespace($pos); + if ($skipTokenType === \T_WHITESPACE) { + return $pos; + } + + if ($tokens[$pos][0] !== $skipTokenType) { + // Shouldn't happen. The skip token MUST be there + throw new \Exception('Encountered unexpected token'); + } + $pos--; + + return $this->skipLeftWhitespace($pos); + } + + public function skipRight(int $pos, $skipTokenType) { + $tokens = $this->tokens; + + $pos = $this->skipRightWhitespace($pos); + if ($skipTokenType === \T_WHITESPACE) { + return $pos; + } + + if ($tokens[$pos][0] !== $skipTokenType) { + // Shouldn't happen. The skip token MUST be there + throw new \Exception('Encountered unexpected token'); + } + $pos++; + + return $this->skipRightWhitespace($pos); + } + + /** + * Return first non-whitespace token position smaller or equal to passed position. + * + * @param int $pos Token position + * @return int Non-whitespace token position + */ + public function skipLeftWhitespace(int $pos) { + $tokens = $this->tokens; + for (; $pos >= 0; $pos--) { + $type = $tokens[$pos][0]; + if ($type !== \T_WHITESPACE && $type !== \T_COMMENT && $type !== \T_DOC_COMMENT) { + break; + } + } + return $pos; + } + + /** + * Return first non-whitespace position greater or equal to passed position. + * + * @param int $pos Token position + * @return int Non-whitespace token position + */ + public function skipRightWhitespace(int $pos) { + $tokens = $this->tokens; + for ($count = \count($tokens); $pos < $count; $pos++) { + $type = $tokens[$pos][0]; + if ($type !== \T_WHITESPACE && $type !== \T_COMMENT && $type !== \T_DOC_COMMENT) { + break; + } + } + return $pos; + } + + public function findRight($pos, $findTokenType) { + $tokens = $this->tokens; + for ($count = \count($tokens); $pos < $count; $pos++) { + $type = $tokens[$pos][0]; + if ($type === $findTokenType) { + return $pos; + } + } + return -1; + } + + /** + * Get indentation before token position. + * + * @param int $pos Token position + * + * @return int Indentation depth (in spaces) + */ + public function getIndentationBefore(int $pos) : int { + return $this->indentMap[$pos]; + } + + /** + * Get the code corresponding to a token offset range, optionally adjusted for indentation. + * + * @param int $from Token start position (inclusive) + * @param int $to Token end position (exclusive) + * @param int $indent By how much the code should be indented (can be negative as well) + * + * @return string Code corresponding to token range, adjusted for indentation + */ + public function getTokenCode(int $from, int $to, int $indent) : string { + $tokens = $this->tokens; + $result = ''; + for ($pos = $from; $pos < $to; $pos++) { + $token = $tokens[$pos]; + if (\is_array($token)) { + $type = $token[0]; + $content = $token[1]; + if ($type === \T_CONSTANT_ENCAPSED_STRING || $type === \T_ENCAPSED_AND_WHITESPACE) { + $result .= $content; + } else { + // TODO Handle non-space indentation + if ($indent < 0) { + $result .= str_replace("\n" . str_repeat(" ", -$indent), "\n", $content); + } elseif ($indent > 0) { + $result .= str_replace("\n", "\n" . str_repeat(" ", $indent), $content); + } else { + $result .= $content; + } + } + } else { + $result .= $token; + } + } + return $result; + } + + /** + * Precalculate the indentation at every token position. + * + * @return int[] Token position to indentation map + */ + private function calcIndentMap() { + $indentMap = []; + $indent = 0; + foreach ($this->tokens as $token) { + $indentMap[] = $indent; + + if ($token[0] === \T_WHITESPACE) { + $content = $token[1]; + $newlinePos = \strrpos($content, "\n"); + if (false !== $newlinePos) { + $indent = \strlen($content) - $newlinePos - 1; + } + } + } + + // Add a sentinel for one past end of the file + $indentMap[] = $indent; + + return $indentMap; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/JsonDecoder.php b/vendor/nikic/php-parser/lib/PhpParser/JsonDecoder.php new file mode 100644 index 00000000..25d1c6ab --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/JsonDecoder.php @@ -0,0 +1,101 @@ +decodeRecursive($value); + } + + private function decodeRecursive($value) { + if (\is_array($value)) { + if (isset($value['nodeType'])) { + if ($value['nodeType'] === 'Comment' || $value['nodeType'] === 'Comment_Doc') { + return $this->decodeComment($value); + } + return $this->decodeNode($value); + } + return $this->decodeArray($value); + } + return $value; + } + + private function decodeArray(array $array) : array { + $decodedArray = []; + foreach ($array as $key => $value) { + $decodedArray[$key] = $this->decodeRecursive($value); + } + return $decodedArray; + } + + private function decodeNode(array $value) : Node { + $nodeType = $value['nodeType']; + if (!\is_string($nodeType)) { + throw new \RuntimeException('Node type must be a string'); + } + + $reflectionClass = $this->reflectionClassFromNodeType($nodeType); + /** @var Node $node */ + $node = $reflectionClass->newInstanceWithoutConstructor(); + + if (isset($value['attributes'])) { + if (!\is_array($value['attributes'])) { + throw new \RuntimeException('Attributes must be an array'); + } + + $node->setAttributes($this->decodeArray($value['attributes'])); + } + + foreach ($value as $name => $subNode) { + if ($name === 'nodeType' || $name === 'attributes') { + continue; + } + + $node->$name = $this->decodeRecursive($subNode); + } + + return $node; + } + + private function decodeComment(array $value) : Comment { + $className = $value['nodeType'] === 'Comment' ? Comment::class : Comment\Doc::class; + if (!isset($value['text'])) { + throw new \RuntimeException('Comment must have text'); + } + + return new $className( + $value['text'], $value['line'] ?? -1, $value['filePos'] ?? -1, $value['tokenPos'] ?? -1 + ); + } + + private function reflectionClassFromNodeType(string $nodeType) : \ReflectionClass { + if (!isset($this->reflectionClassCache[$nodeType])) { + $className = $this->classNameFromNodeType($nodeType); + $this->reflectionClassCache[$nodeType] = new \ReflectionClass($className); + } + return $this->reflectionClassCache[$nodeType]; + } + + private function classNameFromNodeType(string $nodeType) : string { + $className = 'PhpParser\\Node\\' . strtr($nodeType, '_', '\\'); + if (class_exists($className)) { + return $className; + } + + $className .= '_'; + if (class_exists($className)) { + return $className; + } + + throw new \RuntimeException("Unknown node type \"$nodeType\""); + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Lexer.php b/vendor/nikic/php-parser/lib/PhpParser/Lexer.php index 75d3f35a..125c3b80 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Lexer.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Lexer.php @@ -1,4 +1,4 @@ -tokenMap = $this->createTokenMap(); // map of tokens to drop while lexing (the map is only used for isset lookup, // that's why the value is simply set to 1; the value is never actually used.) $this->dropTokens = array_fill_keys( - array(T_WHITESPACE, T_OPEN_TAG, T_COMMENT, T_DOC_COMMENT), 1 + [\T_WHITESPACE, \T_OPEN_TAG, \T_COMMENT, \T_DOC_COMMENT], 1 ); // the usedAttributes member is a map of the used attribute names to a dummy // value (here "true") - $options += array( - 'usedAttributes' => array('comments', 'startLine', 'endLine'), - ); + $options += [ + 'usedAttributes' => ['comments', 'startLine', 'endLine'], + ]; $this->usedAttributes = array_fill_keys($options['usedAttributes'], true); } @@ -55,7 +55,7 @@ class Lexer * @param ErrorHandler|null $errorHandler Error handler to use for lexing errors. Defaults to * ErrorHandler\Throwing */ - public function startLexing($code, ErrorHandler $errorHandler = null) { + public function startLexing(string $code, ErrorHandler $errorHandler = null) { if (null === $errorHandler) { $errorHandler = new ErrorHandler\Throwing(); } @@ -71,7 +71,7 @@ class Lexer $scream = ini_set('xdebug.scream', '0'); - $this->resetErrors(); + error_clear_last(); $this->tokens = @token_get_all($code); $this->handleErrors($errorHandler); @@ -80,17 +80,6 @@ class Lexer } } - protected function resetErrors() { - if (function_exists('error_clear_last')) { - error_clear_last(); - } else { - // set error_get_last() to defined state by forcing an undefined variable error - set_error_handler(function() { return false; }, 0); - @$undefinedVariable; - restore_error_handler(); - } - } - private function handleInvalidCharacterRange($start, $end, $line, ErrorHandler $errorHandler) { for ($i = $start; $i < $end; $i++) { $chr = $this->code[$i]; @@ -117,22 +106,30 @@ class Lexer } } - private function isUnterminatedComment($token) { - return ($token[0] === T_COMMENT || $token[0] === T_DOC_COMMENT) + /** + * Check whether comment token is unterminated. + * + * @return bool + */ + private function isUnterminatedComment($token) : bool { + return ($token[0] === \T_COMMENT || $token[0] === \T_DOC_COMMENT) && substr($token[1], 0, 2) === '/*' && substr($token[1], -2) !== '*/'; } - private function errorMayHaveOccurred() { + /** + * Check whether an error *may* have occurred during tokenization. + * + * @return bool + */ + private function errorMayHaveOccurred() : bool { if (defined('HHVM_VERSION')) { // In HHVM token_get_all() does not throw warnings, so we need to conservatively // assume that an error occurred return true; } - $error = error_get_last(); - return null !== $error - && false === strpos($error['message'], 'Undefined variable'); + return null !== error_get_last(); } protected function handleErrors(ErrorHandler $errorHandler) { @@ -147,7 +144,7 @@ class Lexer $filePos = 0; $line = 1; - foreach ($this->tokens as $i => $token) { + foreach ($this->tokens as $token) { $tokenValue = \is_string($token) ? $token : $token[1]; $tokenLen = \strlen($tokenValue); @@ -156,7 +153,7 @@ class Lexer $nextFilePos = strpos($this->code, $tokenValue, $filePos); $this->handleInvalidCharacterRange( $filePos, $nextFilePos, $line, $errorHandler); - $filePos = $nextFilePos; + $filePos = (int) $nextFilePos; } $filePos += $tokenLen; @@ -176,7 +173,7 @@ class Lexer // Emulate the PHP behavior $isDocComment = isset($comment[3]) && $comment[3] === '*'; - $this->tokens[] = [$isDocComment ? T_DOC_COMMENT : T_COMMENT, $comment, $line]; + $this->tokens[] = [$isDocComment ? \T_DOC_COMMENT : \T_COMMENT, $comment, $line]; } else { // Invalid characters at the end of the input $this->handleInvalidCharacterRange( @@ -221,9 +218,9 @@ class Lexer * * @return int Token id */ - public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) { - $startAttributes = array(); - $endAttributes = array(); + public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) : int { + $startAttributes = []; + $endAttributes = []; while (1) { if (isset($this->tokens[++$this->pos])) { @@ -256,20 +253,20 @@ class Lexer } elseif (!isset($this->dropTokens[$token[0]])) { $value = $token[1]; $id = $this->tokenMap[$token[0]]; - if (T_CLOSE_TAG === $token[0]) { + if (\T_CLOSE_TAG === $token[0]) { $this->prevCloseTagHasNewline = false !== strpos($token[1], "\n"); - } else if (T_INLINE_HTML === $token[0]) { + } elseif (\T_INLINE_HTML === $token[0]) { $startAttributes['hasLeadingNewline'] = $this->prevCloseTagHasNewline; } $this->line += substr_count($value, "\n"); $this->filePos += \strlen($value); } else { - if (T_COMMENT === $token[0] || T_DOC_COMMENT === $token[0]) { + if (\T_COMMENT === $token[0] || \T_DOC_COMMENT === $token[0]) { if (isset($this->usedAttributes['comments'])) { - $comment = T_DOC_COMMENT === $token[0] - ? new Comment\Doc($token[1], $this->line, $this->filePos) - : new Comment($token[1], $this->line, $this->filePos); + $comment = \T_DOC_COMMENT === $token[0] + ? new Comment\Doc($token[1], $this->line, $this->filePos, $this->pos) + : new Comment($token[1], $this->line, $this->filePos, $this->pos); $startAttributes['comments'][] = $comment; } } @@ -305,7 +302,7 @@ class Lexer * * @return array Array of tokens in token_get_all() format */ - public function getTokens() { + public function getTokens() : array { return $this->tokens; } @@ -314,7 +311,7 @@ class Lexer * * @return string Remaining text */ - public function handleHaltCompiler() { + public function handleHaltCompiler() : string { // text after T_HALT_COMPILER, still including (); $textAfter = substr($this->code, $this->filePos); @@ -329,7 +326,7 @@ class Lexer $this->pos = count($this->tokens); // return with (); removed - return (string) substr($textAfter, strlen($matches[0])); // (string) converts false to '' + return substr($textAfter, strlen($matches[0])); } /** @@ -341,26 +338,26 @@ class Lexer * * @return array The token map */ - protected function createTokenMap() { - $tokenMap = array(); + protected function createTokenMap() : array { + $tokenMap = []; // 256 is the minimum possible token number, as everything below // it is an ASCII value for ($i = 256; $i < 1000; ++$i) { - if (T_DOUBLE_COLON === $i) { + if (\T_DOUBLE_COLON === $i) { // T_DOUBLE_COLON is equivalent to T_PAAMAYIM_NEKUDOTAYIM $tokenMap[$i] = Tokens::T_PAAMAYIM_NEKUDOTAYIM; - } elseif(T_OPEN_TAG_WITH_ECHO === $i) { + } elseif(\T_OPEN_TAG_WITH_ECHO === $i) { // T_OPEN_TAG_WITH_ECHO with dropped T_OPEN_TAG results in T_ECHO $tokenMap[$i] = Tokens::T_ECHO; - } elseif(T_CLOSE_TAG === $i) { + } elseif(\T_CLOSE_TAG === $i) { // T_CLOSE_TAG is equivalent to ';' $tokenMap[$i] = ord(';'); } elseif ('UNKNOWN' !== $name = token_name($i)) { if ('T_HASHBANG' === $name) { // HHVM uses a special token for #! hashbang lines $tokenMap[$i] = Tokens::T_INLINE_HTML; - } else if (defined($name = Tokens::class . '::' . $name)) { + } elseif (defined($name = Tokens::class . '::' . $name)) { // Other tokens can be mapped directly $tokenMap[$i] = constant($name); } @@ -369,11 +366,11 @@ class Lexer // HHVM uses a special token for numbers that overflow to double if (defined('T_ONUMBER')) { - $tokenMap[T_ONUMBER] = Tokens::T_DNUMBER; + $tokenMap[\T_ONUMBER] = Tokens::T_DNUMBER; } // HHVM also has a separate token for the __COMPILER_HALT_OFFSET__ constant if (defined('T_COMPILER_HALT_OFFSET')) { - $tokenMap[T_COMPILER_HALT_OFFSET] = Tokens::T_STRING; + $tokenMap[\T_COMPILER_HALT_OFFSET] = Tokens::T_STRING; } return $tokenMap; diff --git a/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php b/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php index 739a328a..647aaa34 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php @@ -1,174 +1,8 @@ -newKeywords = array(); - foreach ($newKeywordsPerVersion as $version => $newKeywords) { - if (version_compare(PHP_VERSION, $version, '>=')) { - break; - } - - $this->newKeywords += $newKeywords; - } - - if (version_compare(PHP_VERSION, self::PHP_7_0, '>=')) { - return; - } - $this->tokenMap[self::T_COALESCE] = Tokens::T_COALESCE; - $this->tokenMap[self::T_SPACESHIP] = Tokens::T_SPACESHIP; - $this->tokenMap[self::T_YIELD_FROM] = Tokens::T_YIELD_FROM; - - if (version_compare(PHP_VERSION, self::PHP_5_6, '>=')) { - return; - } - $this->tokenMap[self::T_ELLIPSIS] = Tokens::T_ELLIPSIS; - $this->tokenMap[self::T_POW] = Tokens::T_POW; - $this->tokenMap[self::T_POW_EQUAL] = Tokens::T_POW_EQUAL; - } - - public function startLexing($code, ErrorHandler $errorHandler = null) { - $this->inObjectAccess = false; - - parent::startLexing($code, $errorHandler); - if ($this->requiresEmulation($code)) { - $this->emulateTokens(); - } - } - - /* - * Checks if the code is potentially using features that require emulation. - */ - protected function requiresEmulation($code) { - if (version_compare(PHP_VERSION, self::PHP_7_0, '>=')) { - return false; - } - - if (preg_match('(\?\?|<=>|yield[ \n\r\t]+from)', $code)) { - return true; - } - - if (version_compare(PHP_VERSION, self::PHP_5_6, '>=')) { - return false; - } - - return preg_match('(\.\.\.|(?tokens); $i < $c; ++$i) { - $replace = null; - if (isset($this->tokens[$i + 1])) { - if ($this->tokens[$i] === '?' && $this->tokens[$i + 1] === '?') { - array_splice($this->tokens, $i, 2, array( - array(self::T_COALESCE, '??', $line) - )); - $c--; - continue; - } - if ($this->tokens[$i][0] === T_IS_SMALLER_OR_EQUAL - && $this->tokens[$i + 1] === '>' - ) { - array_splice($this->tokens, $i, 2, array( - array(self::T_SPACESHIP, '<=>', $line) - )); - $c--; - continue; - } - if ($this->tokens[$i] === '*' && $this->tokens[$i + 1] === '*') { - array_splice($this->tokens, $i, 2, array( - array(self::T_POW, '**', $line) - )); - $c--; - continue; - } - if ($this->tokens[$i] === '*' && $this->tokens[$i + 1][0] === T_MUL_EQUAL) { - array_splice($this->tokens, $i, 2, array( - array(self::T_POW_EQUAL, '**=', $line) - )); - $c--; - continue; - } - } - - if (isset($this->tokens[$i + 2])) { - if ($this->tokens[$i][0] === T_YIELD && $this->tokens[$i + 1][0] === T_WHITESPACE - && $this->tokens[$i + 2][0] === T_STRING - && !strcasecmp($this->tokens[$i + 2][1], 'from') - ) { - array_splice($this->tokens, $i, 3, array( - array( - self::T_YIELD_FROM, - $this->tokens[$i][1] . $this->tokens[$i + 1][1] . $this->tokens[$i + 2][1], - $line - ) - )); - $c -= 2; - $line += substr_count($this->tokens[$i][1], "\n"); - continue; - } - if ($this->tokens[$i] === '.' && $this->tokens[$i + 1] === '.' - && $this->tokens[$i + 2] === '.' - ) { - array_splice($this->tokens, $i, 3, array( - array(self::T_ELLIPSIS, '...', $line) - )); - $c -= 2; - continue; - } - } - - if (\is_array($this->tokens[$i])) { - $line += substr_count($this->tokens[$i][1], "\n"); - } - } - } - - public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) { - $token = parent::getNextToken($value, $startAttributes, $endAttributes); - - // replace new keywords by their respective tokens. This is not done - // if we currently are in an object access (e.g. in $obj->namespace - // "namespace" stays a T_STRING tokens and isn't converted to T_NAMESPACE) - if (Tokens::T_STRING === $token && !$this->inObjectAccess) { - if (isset($this->newKeywords[strtolower($value)])) { - return $this->newKeywords[strtolower($value)]; - } - } else { - // keep track of whether we currently are in an object access (after ->) - $this->inObjectAccess = Tokens::T_OBJECT_OPERATOR === $token; - } - - return $token; - } + /* No features requiring emulation have been added in PHP > 7.0 */ } diff --git a/vendor/nikic/php-parser/lib/PhpParser/NameContext.php b/vendor/nikic/php-parser/lib/PhpParser/NameContext.php new file mode 100644 index 00000000..777a4afd --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/NameContext.php @@ -0,0 +1,285 @@ + [aliasName => originalName]] */ + protected $aliases = []; + + /** @var Name[][] Same as $aliases but preserving original case */ + protected $origAliases = []; + + /** @var ErrorHandler Error handler */ + protected $errorHandler; + + /** + * Create a name context. + * + * @param ErrorHandler $errorHandler Error handling used to report errors + */ + public function __construct(ErrorHandler $errorHandler) { + $this->errorHandler = $errorHandler; + } + + /** + * Start a new namespace. + * + * This also resets the alias table. + * + * @param Name|null $namespace Null is the global namespace + */ + public function startNamespace(Name $namespace = null) { + $this->namespace = $namespace; + $this->origAliases = $this->aliases = [ + Stmt\Use_::TYPE_NORMAL => [], + Stmt\Use_::TYPE_FUNCTION => [], + Stmt\Use_::TYPE_CONSTANT => [], + ]; + } + + /** + * Add an alias / import. + * + * @param Name $name Original name + * @param string $aliasName Aliased name + * @param int $type One of Stmt\Use_::TYPE_* + * @param array $errorAttrs Attributes to use to report an error + */ + public function addAlias(Name $name, string $aliasName, int $type, array $errorAttrs = []) { + // Constant names are case sensitive, everything else case insensitive + if ($type === Stmt\Use_::TYPE_CONSTANT) { + $aliasLookupName = $aliasName; + } else { + $aliasLookupName = strtolower($aliasName); + } + + if (isset($this->aliases[$type][$aliasLookupName])) { + $typeStringMap = [ + Stmt\Use_::TYPE_NORMAL => '', + Stmt\Use_::TYPE_FUNCTION => 'function ', + Stmt\Use_::TYPE_CONSTANT => 'const ', + ]; + + $this->errorHandler->handleError(new Error( + sprintf( + 'Cannot use %s%s as %s because the name is already in use', + $typeStringMap[$type], $name, $aliasName + ), + $errorAttrs + )); + return; + } + + $this->aliases[$type][$aliasLookupName] = $name; + $this->origAliases[$type][$aliasName] = $name; + } + + /** + * Get current namespace. + * + * @return null|Name Namespace (or null if global namespace) + */ + public function getNamespace() { + return $this->namespace; + } + + /** + * Get resolved name. + * + * @param Name $name Name to resolve + * @param int $type One of Stmt\Use_::TYPE_{FUNCTION|CONSTANT} + * + * @return null|Name Resolved name, or null if static resolution is not possible + */ + public function getResolvedName(Name $name, int $type) { + // don't resolve special class names + if ($type === Stmt\Use_::TYPE_NORMAL && $name->isSpecialClassName()) { + if (!$name->isUnqualified()) { + $this->errorHandler->handleError(new Error( + sprintf("'\\%s' is an invalid class name", $name->toString()), + $name->getAttributes() + )); + } + return $name; + } + + // fully qualified names are already resolved + if ($name->isFullyQualified()) { + return $name; + } + + // Try to resolve aliases + if (null !== $resolvedName = $this->resolveAlias($name, $type)) { + return $resolvedName; + } + + if ($type !== Stmt\Use_::TYPE_NORMAL && $name->isUnqualified()) { + if (null === $this->namespace) { + // outside of a namespace unaliased unqualified is same as fully qualified + return new FullyQualified($name, $name->getAttributes()); + } + + // Cannot resolve statically + return null; + } + + // if no alias exists prepend current namespace + return FullyQualified::concat($this->namespace, $name, $name->getAttributes()); + } + + /** + * Get resolved class name. + * + * @param Name $name Class ame to resolve + * + * @return Name Resolved name + */ + public function getResolvedClassName(Name $name) : Name { + return $this->getResolvedName($name, Stmt\Use_::TYPE_NORMAL); + } + + /** + * Get possible ways of writing a fully qualified name (e.g., by making use of aliases). + * + * @param string $name Fully-qualified name (without leading namespace separator) + * @param int $type One of Stmt\Use_::TYPE_* + * + * @return Name[] Possible representations of the name + */ + public function getPossibleNames(string $name, int $type) : array { + $lcName = strtolower($name); + + if ($type === Stmt\Use_::TYPE_NORMAL) { + // self, parent and static must always be unqualified + if ($lcName === "self" || $lcName === "parent" || $lcName === "static") { + return [new Name($name)]; + } + } + + // Collect possible ways to write this name, starting with the fully-qualified name + $possibleNames = [new FullyQualified($name)]; + + if (null !== $nsRelativeName = $this->getNamespaceRelativeName($name, $lcName, $type)) { + // Make sure there is no alias that makes the normally namespace-relative name + // into something else + if (null === $this->resolveAlias($nsRelativeName, $type)) { + $possibleNames[] = $nsRelativeName; + } + } + + // Check for relevant namespace use statements + foreach ($this->origAliases[Stmt\Use_::TYPE_NORMAL] as $alias => $orig) { + $lcOrig = $orig->toLowerString(); + if (0 === strpos($lcName, $lcOrig . '\\')) { + $possibleNames[] = new Name($alias . substr($name, strlen($lcOrig))); + } + } + + // Check for relevant type-specific use statements + foreach ($this->origAliases[$type] as $alias => $orig) { + if ($type === Stmt\Use_::TYPE_CONSTANT) { + // Constants are are complicated-sensitive + $normalizedOrig = $this->normalizeConstName($orig->toString()); + if ($normalizedOrig === $this->normalizeConstName($name)) { + $possibleNames[] = new Name($alias); + } + } else { + // Everything else is case-insensitive + if ($orig->toLowerString() === $lcName) { + $possibleNames[] = new Name($alias); + } + } + } + + return $possibleNames; + } + + /** + * Get shortest representation of this fully-qualified name. + * + * @param string $name Fully-qualified name (without leading namespace separator) + * @param int $type One of Stmt\Use_::TYPE_* + * + * @return Name Shortest representation + */ + public function getShortName(string $name, int $type) : Name { + $possibleNames = $this->getPossibleNames($name, $type); + + // Find shortest name + $shortestName = null; + $shortestLength = \INF; + foreach ($possibleNames as $possibleName) { + $length = strlen($possibleName->toCodeString()); + if ($length < $shortestLength) { + $shortestName = $possibleName; + $shortestLength = $length; + } + } + + return $shortestName; + } + + private function resolveAlias(Name $name, $type) { + $firstPart = $name->getFirst(); + + if ($name->isQualified()) { + // resolve aliases for qualified names, always against class alias table + $checkName = strtolower($firstPart); + if (isset($this->aliases[Stmt\Use_::TYPE_NORMAL][$checkName])) { + $alias = $this->aliases[Stmt\Use_::TYPE_NORMAL][$checkName]; + return FullyQualified::concat($alias, $name->slice(1), $name->getAttributes()); + } + } elseif ($name->isUnqualified()) { + // constant aliases are case-sensitive, function aliases case-insensitive + $checkName = $type === Stmt\Use_::TYPE_CONSTANT ? $firstPart : strtolower($firstPart); + if (isset($this->aliases[$type][$checkName])) { + // resolve unqualified aliases + return new FullyQualified($this->aliases[$type][$checkName], $name->getAttributes()); + } + } + + // No applicable aliases + return null; + } + + private function getNamespaceRelativeName(string $name, string $lcName, int $type) { + if (null === $this->namespace) { + return new Name($name); + } + + if ($type === Stmt\Use_::TYPE_CONSTANT) { + // The constants true/false/null always resolve to the global symbols, even inside a + // namespace, so they may be used without qualification + if ($lcName === "true" || $lcName === "false" || $lcName === "null") { + return new Name($name); + } + } + + $namespacePrefix = strtolower($this->namespace . '\\'); + if (0 === strpos($lcName, $namespacePrefix)) { + return new Name(substr($name, strlen($namespacePrefix))); + } + + return null; + } + + private function normalizeConstName(string $name) { + $nsSep = strrpos($name, '\\'); + if (false === $nsSep) { + return $name; + } + + // Constants have case-insensitive namespace and case-sensitive short-name + $ns = substr($name, 0, $nsSep); + $shortName = substr($name, $nsSep + 1); + return strtolower($ns) . '\\' . $shortName; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node.php b/vendor/nikic/php-parser/lib/PhpParser/Node.php index 6925fd72..7f04c343 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node.php @@ -1,4 +1,4 @@ -value = $value; $this->byRef = $byRef; $this->unpack = $unpack; } - public function getSubNodeNames() { - return array('value', 'byRef', 'unpack'); + public function getSubNodeNames() : array { + return ['value', 'byRef', 'unpack']; + } + + public function getType() : string { + return 'Arg'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Const_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Const_.php index 26322d49..76a220f4 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Const_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Const_.php @@ -1,12 +1,15 @@ -name = $name; + $this->name = \is_string($name) ? new Identifier($name) : $name; $this->value = $value; } - public function getSubNodeNames() { - return array('name', 'value'); + public function getSubNodeNames() : array { + return ['name', 'value']; + } + + public function getType() : string { + return 'Const'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr.php index 2dae5bfc..6cf4df22 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr.php @@ -1,4 +1,4 @@ -var = $var; $this->dim = $dim; } - public function getSubNodeNames() { - return array('var', 'dim'); + public function getSubNodeNames() : array { + return ['var', 'dim']; + } + + public function getType() : string { + return 'Expr_ArrayDimFetch'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php index de73ef46..bf9c7fde 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php @@ -1,4 +1,4 @@ -key = $key; $this->value = $value; $this->byRef = $byRef; } - public function getSubNodeNames() { - return array('key', 'value', 'byRef'); + public function getSubNodeNames() : array { + return ['key', 'value', 'byRef']; + } + + public function getType() : string { + return 'Expr_ArrayItem'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php index 9151f27d..061c52e3 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php @@ -1,4 +1,4 @@ -items = $items; } - public function getSubNodeNames() { - return array('items'); + public function getSubNodeNames() : array { + return ['items']; + } + + public function getType() : string { + return 'Expr_Array'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php index 1f280ff0..1306c88f 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php @@ -1,4 +1,4 @@ -var = $var; $this->expr = $expr; } - public function getSubNodeNames() { - return array('var', 'expr'); + public function getSubNodeNames() : array { + return ['var', 'expr']; + } + + public function getType() : string { + return 'Expr_Assign'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php index 83540a07..e5bdbf58 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php @@ -1,4 +1,4 @@ -var = $var; $this->expr = $expr; } - public function getSubNodeNames() { - return array('var', 'expr'); + public function getSubNodeNames() : array { + return ['var', 'expr']; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php index 9e3ed822..420284cd 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php @@ -1,4 +1,4 @@ -var = $var; $this->expr = $expr; } - public function getSubNodeNames() { - return array('var', 'expr'); + public function getSubNodeNames() : array { + return ['var', 'expr']; + } + + public function getType() : string { + return 'Expr_AssignRef'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php index 6f87e235..466b01a2 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php @@ -1,4 +1,4 @@ -left = $left; $this->right = $right; } - public function getSubNodeNames() { - return array('left', 'right'); + public function getSubNodeNames() : array { + return ['left', 'right']; } + + /** + * Get the operator sigil for this binary operation. + * + * In the case there are multiple possible sigils for an operator, this method does not + * necessarily return the one used in the parsed code. + * + * @return string + */ + abstract public function getOperatorSigil() : string; } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php index bd6c5c1f..d907393b 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php @@ -1,4 +1,4 @@ -'; + } + + public function getType() : string { + return 'Expr_BinaryOp_Greater'; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php index 9bd93a15..d677502c 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php @@ -1,4 +1,4 @@ -='; + } + + public function getType() : string { + return 'Expr_BinaryOp_GreaterOrEqual'; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php index 9562680e..3d96285c 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php @@ -1,4 +1,4 @@ ->'; + } + + public function getType() : string { + return 'Expr_BinaryOp_ShiftRight'; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php index ba2c28b8..3cb8e7e0 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php @@ -1,4 +1,4 @@ -'; + } + + public function getType() : string { + return 'Expr_BinaryOp_Spaceship'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php index 1d922641..f96fdddc 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_BitwiseNot'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php index 8f543b82..1ae74b16 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_BooleanNot'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php index bf850dc5..8fd0285e 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php index 08b3a384..57cc473b 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php @@ -1,4 +1,4 @@ -class = $class; - $this->name = $name; + $this->name = \is_string($name) ? new Identifier($name) : $name; } - public function getSubNodeNames() { - return array('class', 'name'); + public function getSubNodeNames() : array { + return ['class', 'name']; + } + + public function getType() : string { + return 'Expr_ClassConstFetch'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php index 198ec4d8..9f6931a6 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_Clone'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php index 5d376550..261b4440 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php @@ -1,4 +1,4 @@ - array(): Statements * @param array $attributes Additional attributes */ - public function __construct(array $subNodes = array(), array $attributes = array()) { + public function __construct(array $subNodes = [], array $attributes = []) { parent::__construct($attributes); - $this->static = isset($subNodes['static']) ? $subNodes['static'] : false; - $this->byRef = isset($subNodes['byRef']) ? $subNodes['byRef'] : false; - $this->params = isset($subNodes['params']) ? $subNodes['params'] : array(); - $this->uses = isset($subNodes['uses']) ? $subNodes['uses'] : array(); - $this->returnType = isset($subNodes['returnType']) ? $subNodes['returnType'] : null; - $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array(); + $this->static = $subNodes['static'] ?? false; + $this->byRef = $subNodes['byRef'] ?? false; + $this->params = $subNodes['params'] ?? []; + $this->uses = $subNodes['uses'] ?? []; + $returnType = $subNodes['returnType'] ?? null; + $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType; + $this->stmts = $subNodes['stmts'] ?? []; } - public function getSubNodeNames() { - return array('static', 'byRef', 'params', 'uses', 'returnType', 'stmts'); + public function getSubNodeNames() : array { + return ['static', 'byRef', 'params', 'uses', 'returnType', 'stmts']; } - public function returnsByRef() { + public function returnsByRef() : bool { return $this->byRef; } - public function getParams() { + public function getParams() : array { return $this->params; } @@ -59,7 +60,12 @@ class Closure extends Expr implements FunctionLike return $this->returnType; } - public function getStmts() { + /** @return Node\Stmt[] */ + public function getStmts() : array { return $this->stmts; } + + public function getType() : string { + return 'Expr_Closure'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php index f4d02023..4c551684 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php @@ -1,4 +1,4 @@ -var = $var; $this->byRef = $byRef; } - public function getSubNodeNames() { - return array('var', 'byRef'); + public function getSubNodeNames() : array { + return ['var', 'byRef']; + } + + public function getType() : string { + return 'Expr_ClosureUse'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php index 98e51d52..875ddf3c 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php @@ -1,4 +1,4 @@ -name = $name; } - public function getSubNodeNames() { - return array('name'); + public function getSubNodeNames() : array { + return ['name']; + } + + public function getType() : string { + return 'Expr_ConstFetch'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php index 0c0509ef..2e0c43b0 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_Empty'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php index 5ab8fd44..90f6cbbc 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_ErrorSuppress'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php index eadffd00..d421595a 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_Eval'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php index b0b94cf7..58134811 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_Exit'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php index 60d00507..79457670 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php @@ -1,4 +1,4 @@ -name = $name; $this->args = $args; } - public function getSubNodeNames() { - return array('name', 'args'); + public function getSubNodeNames() : array { + return ['name', 'args']; + } + + public function getType() : string { + return 'Expr_FuncCall'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php index b27f3af1..aa6e55d1 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php @@ -1,4 +1,4 @@ -expr = $expr; $this->type = $type; } - public function getSubNodeNames() { - return array('expr', 'type'); + public function getSubNodeNames() : array { + return ['expr', 'type']; + } + + public function getType() : string { + return 'Expr_Include'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php index 69573d86..5b73d027 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php @@ -1,4 +1,4 @@ -expr = $expr; $this->class = $class; } - public function getSubNodeNames() { - return array('expr', 'class'); + public function getSubNodeNames() : array { + return ['expr', 'class']; + } + + public function getType() : string { + return 'Expr_Instanceof'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php index 4ec1d025..5e192cfe 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php @@ -1,4 +1,4 @@ -vars = $vars; } - public function getSubNodeNames() { - return array('vars'); + public function getSubNodeNames() : array { + return ['vars']; + } + + public function getType() : string { + return 'Expr_Isset'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php index 30f3dc16..cc156e3a 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php @@ -1,4 +1,4 @@ -items = $items; } - public function getSubNodeNames() { - return array('items'); + public function getSubNodeNames() : array { + return ['items']; + } + + public function getType() : string { + return 'Expr_List'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php index a6cdd07c..e0fe3271 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php @@ -1,15 +1,16 @@ -var = $var; - $this->name = $name; + $this->name = \is_string($name) ? new Identifier($name) : $name; $this->args = $args; } - public function getSubNodeNames() { - return array('var', 'name', 'args'); + public function getSubNodeNames() : array { + return ['var', 'name', 'args']; + } + + public function getType() : string { + return 'Expr_MethodCall'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php index a8c87794..f4380082 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php @@ -1,4 +1,4 @@ -class = $class; $this->args = $args; } - public function getSubNodeNames() { - return array('class', 'args'); + public function getSubNodeNames() : array { + return ['class', 'args']; + } + + public function getType() : string { + return 'Expr_New'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php index 06ce5470..c3f21a2c 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php @@ -1,4 +1,4 @@ -var = $var; } - public function getSubNodeNames() { - return array('var'); + public function getSubNodeNames() : array { + return ['var']; + } + + public function getType() : string { + return 'Expr_PostDec'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php index 54865ba1..e8b07d80 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php @@ -1,4 +1,4 @@ -var = $var; } - public function getSubNodeNames() { - return array('var'); + public function getSubNodeNames() : array { + return ['var']; + } + + public function getType() : string { + return 'Expr_PostInc'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php index db30f510..d31b2580 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php @@ -1,4 +1,4 @@ -var = $var; } - public function getSubNodeNames() { - return array('var'); + public function getSubNodeNames() : array { + return ['var']; + } + + public function getType() : string { + return 'Expr_PreDec'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php index 06356028..68be695b 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php @@ -1,4 +1,4 @@ -var = $var; } - public function getSubNodeNames() { - return array('var'); + public function getSubNodeNames() : array { + return ['var']; + } + + public function getType() : string { + return 'Expr_PreInc'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php index 0666ab84..9d514e65 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_Print'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php index adcf21ce..90efef3d 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php @@ -1,30 +1,35 @@ -var = $var; - $this->name = $name; + $this->name = \is_string($name) ? new Identifier($name) : $name; } - public function getSubNodeNames() { - return array('var', 'name'); + public function getSubNodeNames() : array { + return ['var', 'name']; + } + + public function getType() : string { + return 'Expr_PropertyFetch'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php index 9516a32f..59708d66 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php @@ -1,4 +1,4 @@ -parts = $parts; } - public function getSubNodeNames() { - return array('parts'); + public function getSubNodeNames() : array { + return ['parts']; + } + + public function getType() : string { + return 'Expr_ShellExec'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php index 5118f34a..5dc2d316 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php @@ -1,15 +1,16 @@ -class = $class; - $this->name = $name; + $this->name = \is_string($name) ? new Identifier($name) : $name; $this->args = $args; } - public function getSubNodeNames() { - return array('class', 'name', 'args'); + public function getSubNodeNames() : array { + return ['class', 'name', 'args']; + } + + public function getType() : string { + return 'Expr_StaticCall'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php index 477a69dd..809b6662 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php @@ -1,31 +1,36 @@ -class = $class; - $this->name = $name; + $this->name = \is_string($name) ? new VarLikeIdentifier($name) : $name; } - public function getSubNodeNames() { - return array('class', 'name'); + public function getSubNodeNames() : array { + return ['class', 'name']; + } + + public function getType() : string { + return 'Expr_StaticPropertyFetch'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php index 57301390..cb36145e 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php @@ -1,4 +1,4 @@ -cond = $cond; $this->if = $if; $this->else = $else; } - public function getSubNodeNames() { - return array('cond', 'if', 'else'); + public function getSubNodeNames() : array { + return ['cond', 'if', 'else']; + } + + public function getType() : string { + return 'Expr_Ternary'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php index 94635d63..90be0e05 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_UnaryMinus'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php index 65141200..1a5bc632 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_UnaryPlus'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php index 3ae3ecd9..b100f214 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php @@ -1,4 +1,4 @@ -name = $name; } - public function getSubNodeNames() { - return array('name'); + public function getSubNodeNames() : array { + return ['name']; + } + + public function getType() : string { + return 'Expr_Variable'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php index 993c82c2..ab3a2754 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Expr_YieldFrom'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php index f3ca88e0..a28a701a 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php @@ -1,4 +1,4 @@ -key = $key; $this->value = $value; } - public function getSubNodeNames() { - return array('key', 'value'); + public function getSubNodeNames() : array { + return ['key', 'value']; + } + + public function getType() : string { + return 'Expr_Yield'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php b/vendor/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php index 82569450..d574e020 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php @@ -1,4 +1,4 @@ - true, + 'parent' => true, + 'static' => true, + ]; + + /** + * Constructs an identifier node. + * + * @param string $name Identifier as string + * @param array $attributes Additional attributes + */ + public function __construct(string $name, array $attributes = []) { + parent::__construct($attributes); + $this->name = $name; + } + + public function getSubNodeNames() : array { + return ['name']; + } + + /** + * Get identifier as string. + * + * @return string Identifier as string. + */ + public function toString() : string { + return $this->name; + } + + /** + * Get lowercased identifier as string. + * + * @return string Lowercased identifier as string + */ + public function toLowerString() : string { + return strtolower($this->name); + } + + /** + * Checks whether the identifier is a special class name (self, parent or static). + * + * @return bool Whether identifier is a special class name + */ + public function isSpecialClassName() : bool { + return isset(self::$specialClassNames[strtolower($this->name)]); + } + + /** + * Get identifier as string. + * + * @return string Identifier as string + */ + public function __toString() : string { + return $this->name; + } + + public function getType() : string { + return 'Identifier'; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php index 7b8c8e23..5d923d02 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php @@ -1,4 +1,4 @@ - true, + 'parent' => true, + 'static' => true, + ]; + /** * Constructs a name node. * - * @param string|array|self $name Name as string, part array or Name instance (copy ctor) - * @param array $attributes Additional attributes + * @param string|string[]|self $name Name as string, part array or Name instance (copy ctor) + * @param array $attributes Additional attributes */ - public function __construct($name, array $attributes = array()) { + public function __construct($name, array $attributes = []) { parent::__construct($attributes); $this->parts = self::prepareName($name); } - public function getSubNodeNames() { - return array('parts'); + public function getSubNodeNames() : array { + return ['parts']; } /** @@ -31,7 +37,7 @@ class Name extends NodeAbstract * * @return string First part of the name */ - public function getFirst() { + public function getFirst() : string { return $this->parts[0]; } @@ -40,7 +46,7 @@ class Name extends NodeAbstract * * @return string Last part of the name */ - public function getLast() { + public function getLast() : string { return $this->parts[count($this->parts) - 1]; } @@ -49,8 +55,8 @@ class Name extends NodeAbstract * * @return bool Whether the name is unqualified */ - public function isUnqualified() { - return 1 == count($this->parts); + public function isUnqualified() : bool { + return 1 === count($this->parts); } /** @@ -58,7 +64,7 @@ class Name extends NodeAbstract * * @return bool Whether the name is qualified */ - public function isQualified() { + public function isQualified() : bool { return 1 < count($this->parts); } @@ -67,7 +73,7 @@ class Name extends NodeAbstract * * @return bool Whether the name is fully qualified */ - public function isFullyQualified() { + public function isFullyQualified() : bool { return false; } @@ -76,27 +82,57 @@ class Name extends NodeAbstract * * @return bool Whether the name is relative */ - public function isRelative() { + public function isRelative() : bool { return false; } /** - * Returns a string representation of the name by imploding the namespace parts with the - * namespace separator. + * Returns a string representation of the name itself, without taking taking the name type into + * account (e.g., not including a leading backslash for fully qualified names). * * @return string String representation */ - public function toString() { + public function toString() : string { return implode('\\', $this->parts); } + /** + * Returns a string representation of the name as it would occur in code (e.g., including + * leading backslash for fully qualified names. + * + * @return string String representation + */ + public function toCodeString() : string { + return $this->toString(); + } + + /** + * Returns lowercased string representation of the name, without taking the name type into + * account (e.g., no leading backslash for fully qualified names). + * + * @return string Lowercased string representation + */ + public function toLowerString() : string { + return strtolower(implode('\\', $this->parts)); + } + + /** + * Checks whether the identifier is a special class name (self, parent or static). + * + * @return bool Whether identifier is a special class name + */ + public function isSpecialClassName() : bool { + return count($this->parts) === 1 + && isset(self::$specialClassNames[strtolower($this->parts[0])]); + } + /** * Returns a string representation of the name by imploding the namespace parts with the * namespace separator. * * @return string String representation */ - public function __toString() { + public function __toString() : string { return implode('\\', $this->parts); } @@ -116,7 +152,7 @@ class Name extends NodeAbstract * * @return static|null Sliced name */ - public function slice($offset, $length = null) { + public function slice(int $offset, int $length = null) { $numParts = count($this->parts); $realOffset = $offset < 0 ? $offset + $numParts : $offset; @@ -152,9 +188,9 @@ class Name extends NodeAbstract * Name::concat($namespace, $shortName) * where $namespace is a Name node or null will work as expected. * - * @param string|array|self|null $name1 The first name - * @param string|array|self|null $name2 The second name - * @param array $attributes Attributes to assign to concatenated name + * @param string|string[]|self|null $name1 The first name + * @param string|string[]|self|null $name2 The second name + * @param array $attributes Attributes to assign to concatenated name * * @return static|null Concatenated name */ @@ -163,7 +199,7 @@ class Name extends NodeAbstract return null; } elseif (null === $name1) { return new static(self::prepareName($name2), $attributes); - } else if (null === $name2) { + } elseif (null === $name2) { return new static(self::prepareName($name1), $attributes); } else { return new static( @@ -176,14 +212,22 @@ class Name extends NodeAbstract * Prepares a (string, array or Name node) name for use in name changing methods by converting * it to an array. * - * @param string|array|self $name Name to prepare + * @param string|string[]|self $name Name to prepare * - * @return array Prepared name + * @return string[] Prepared name */ - private static function prepareName($name) { + private static function prepareName($name) : array { if (\is_string($name)) { + if ('' === $name) { + throw new \InvalidArgumentException('Name cannot be empty'); + } + return explode('\\', $name); } elseif (\is_array($name)) { + if (empty($name)) { + throw new \InvalidArgumentException('Name cannot be empty'); + } + return $name; } elseif ($name instanceof self) { return $name->parts; @@ -193,4 +237,8 @@ class Name extends NodeAbstract 'Expected string, array of parts or Name instance' ); } + + public function getType() : string { + return 'Name'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php index 97cc1113..1df93a56 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php @@ -1,4 +1,4 @@ -toString(); + } + + public function getType() : string { + return 'Name_FullyQualified'; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php index 25676ce6..57bf7af2 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php @@ -1,4 +1,4 @@ -toString(); + } + + public function getType() : string { + return 'Name_Relative'; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/NullableType.php b/vendor/nikic/php-parser/lib/PhpParser/Node/NullableType.php index d887b321..3679269e 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/NullableType.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/NullableType.php @@ -1,4 +1,4 @@ -type = $type; + $this->type = \is_string($type) ? new Identifier($type) : $type; } - public function getSubNodeNames() { - return array('type'); + public function getSubNodeNames() : array { + return ['type']; + } + + public function getType() : string { + return 'NullableType'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Param.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Param.php index b35ee4ef..0b53f67c 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Param.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Param.php @@ -1,4 +1,4 @@ -type = $type; + $this->type = \is_string($type) ? new Identifier($type) : $type; $this->byRef = $byRef; $this->variadic = $variadic; - $this->name = $name; + $this->var = $var; $this->default = $default; } - public function getSubNodeNames() { - return array('type', 'byRef', 'variadic', 'name', 'default'); + public function getSubNodeNames() : array { + return ['type', 'byRef', 'variadic', 'var', 'default']; + } + + public function getType() : string { + return 'Param'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar.php index 01177532..8117909b 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar.php @@ -1,7 +1,7 @@ -value = $value; } - public function getSubNodeNames() { - return array('value'); + public function getSubNodeNames() : array { + return ['value']; } /** @@ -33,7 +33,7 @@ class DNumber extends Scalar * * @return float The parsed number */ - public static function parse($str) { + public static function parse(string $str) : float { // if string contains any of .eE just cast it to float if (false !== strpbrk($str, '.eE')) { return (float) $str; @@ -61,4 +61,8 @@ class DNumber extends Scalar // dec return (float) $str; } + + public function getType() : string { + return 'Scalar_DNumber'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php index 4f9b433c..0541a31e 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php @@ -1,4 +1,4 @@ -parts = $parts; } - public function getSubNodeNames() { - return array('parts'); + public function getSubNodeNames() : array { + return ['parts']; + } + + public function getType() : string { + return 'Scalar_Encapsed'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php index 50cb1afe..89048e21 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php @@ -1,4 +1,4 @@ -value = $value; } - public function getSubNodeNames() { - return array('value'); + public function getSubNodeNames() : array { + return ['value']; + } + + public function getType() : string { + return 'Scalar_EncapsedStringPart'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php index 3559b982..7b9ec5e9 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php @@ -1,4 +1,4 @@ -value = $value; } - public function getSubNodeNames() { - return array('value'); + public function getSubNodeNames() : array { + return ['value']; } /** @@ -40,7 +40,7 @@ class LNumber extends Scalar * * @return LNumber The constructed LNumber, including kind attribute */ - public static function fromString($str, array $attributes = array(), $allowInvalidOctal = false) { + public static function fromString(string $str, array $attributes = [], bool $allowInvalidOctal = false) : LNumber { if ('0' !== $str[0] || '0' === $str) { $attributes['kind'] = LNumber::KIND_DEC; return new LNumber((int) $str, $attributes); @@ -64,4 +64,8 @@ class LNumber extends Scalar $attributes['kind'] = LNumber::KIND_OCT; return new LNumber(intval($str, 8), $attributes); } + + public function getType() : string { + return 'Scalar_LNumber'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php index a50d68f3..841f4f8b 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php @@ -1,4 +1,4 @@ - '\\', '$' => '$', 'n' => "\n", @@ -25,7 +25,7 @@ class String_ extends Scalar 'f' => "\f", 'v' => "\v", 'e' => "\x1B", - ); + ]; /** * Constructs a string scalar node. @@ -33,13 +33,13 @@ class String_ extends Scalar * @param string $value Value of the string * @param array $attributes Additional attributes */ - public function __construct($value, array $attributes = array()) { + public function __construct(string $value, array $attributes = []) { parent::__construct($attributes); $this->value = $value; } - public function getSubNodeNames() { - return array('value'); + public function getSubNodeNames() : array { + return ['value']; } /** @@ -52,7 +52,7 @@ class String_ extends Scalar * * @return string The parsed string */ - public static function parse($str, $parseUnicodeEscape = true) { + public static function parse(string $str, bool $parseUnicodeEscape = true) : string { $bLength = 0; if ('b' === $str[0] || 'B' === $str[0]) { $bLength = 1; @@ -60,8 +60,8 @@ class String_ extends Scalar if ('\'' === $str[$bLength]) { return str_replace( - array('\\\\', '\\\''), - array( '\\', '\''), + ['\\\\', '\\\''], + ['\\', '\''], substr($str, $bLength + 1, -1) ); } else { @@ -82,7 +82,7 @@ class String_ extends Scalar * * @return string String with escape sequences parsed */ - public static function parseEscapeSequences($str, $quote, $parseUnicodeEscape = true) { + public static function parseEscapeSequences(string $str, $quote, bool $parseUnicodeEscape = true) : string { if (null !== $quote) { $str = str_replace('\\' . $quote, $quote, $str); } @@ -111,7 +111,14 @@ class String_ extends Scalar ); } - private static function codePointToUtf8($num) { + /** + * Converts a Unicode code point to its UTF-8 encoded representation. + * + * @param int $num Code point + * + * @return string UTF-8 representation of code point + */ + private static function codePointToUtf8(int $num) : string { if ($num <= 0x7F) { return chr($num); } @@ -139,7 +146,7 @@ class String_ extends Scalar * * @return string Parsed string */ - public static function parseDocString($startToken, $str, $parseUnicodeEscape = true) { + public static function parseDocString(string $startToken, string $str, bool $parseUnicodeEscape = true) : string { // strip last newline (thanks tokenizer for sticking it into the string!) $str = preg_replace('~(\r\n|\n|\r)\z~', '', $str); @@ -150,4 +157,8 @@ class String_ extends Scalar return self::parseEscapeSequences($str, null, $parseUnicodeEscape); } + + public function getType() : string { + return 'Scalar_String'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt.php index baa2f3e1..69d33e57 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt.php @@ -1,4 +1,4 @@ -num = $num; } - public function getSubNodeNames() { - return array('num'); + public function getSubNodeNames() : array { + return ['num']; + } + + public function getType() : string { + return 'Stmt_Break'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php index 03f892c7..30528509 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php @@ -1,4 +1,4 @@ -cond = $cond; $this->stmts = $stmts; } - public function getSubNodeNames() { - return array('cond', 'stmts'); + public function getSubNodeNames() : array { + return ['cond', 'stmts']; + } + + public function getType() : string { + return 'Stmt_Case'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php index 58337ad9..49cecf39 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php @@ -1,34 +1,41 @@ -types = $types; $this->var = $var; $this->stmts = $stmts; } - public function getSubNodeNames() { - return array('types', 'var', 'stmts'); + public function getSubNodeNames() : array { + return ['types', 'var', 'stmts']; + } + + public function getType() : string { + return 'Stmt_Catch'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php index 0d41094f..ff2f40d2 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php @@ -1,4 +1,4 @@ -flags = $flags; $this->consts = $consts; } - public function getSubNodeNames() { - return array('flags', 'consts'); + public function getSubNodeNames() : array { + return ['flags', 'consts']; } - public function isPublic() { + /** + * Whether constant is explicitly or implicitly public. + * + * @return bool + */ + public function isPublic() : bool { return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0 || ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0; } - public function isProtected() { + /** + * Whether constant is protected. + * + * @return bool + */ + public function isProtected() : bool { return (bool) ($this->flags & Class_::MODIFIER_PROTECTED); } - public function isPrivate() { + /** + * Whether constant is private. + * + * @return bool + */ + public function isPrivate() : bool { return (bool) ($this->flags & Class_::MODIFIER_PRIVATE); } - - public function isStatic() { - return (bool) ($this->flags & Class_::MODIFIER_STATIC); + + public function getType() : string { + return 'Stmt_ClassConst'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php index f9053355..31cd66ac 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php @@ -1,13 +1,17 @@ -stmts as $stmt) { if ($stmt instanceof ClassMethod) { $methods[] = $stmt; @@ -32,10 +36,10 @@ abstract class ClassLike extends Node\Stmt { * * @return ClassMethod|null Method node or null if the method does not exist */ - public function getMethod($name) { + public function getMethod(string $name) { $lowerName = strtolower($name); foreach ($this->stmts as $stmt) { - if ($stmt instanceof ClassMethod && $lowerName === strtolower($stmt->name)) { + if ($stmt instanceof ClassMethod && $lowerName === $stmt->name->toLowerString()) { return $stmt; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php index de05390a..550b54ba 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php @@ -1,4 +1,4 @@ - true, + '__destruct' => true, + '__call' => true, + '__callstatic' => true, + '__get' => true, + '__set' => true, + '__isset' => true, + '__unset' => true, + '__sleep' => true, + '__wakeup' => true, + '__tostring' => true, + '__set_state' => true, + '__clone' => true, + '__invoke' => true, + '__debuginfo' => true, + ]; /** * Constructs a class method node. * - * @param string $name Name - * @param array $subNodes Array of the following optional subnodes: - * 'flags => MODIFIER_PUBLIC: Flags - * 'byRef' => false : Whether to return by reference - * 'params' => array() : Parameters - * 'returnType' => null : Return type - * 'stmts' => array() : Statements - * @param array $attributes Additional attributes + * @param string|Node\Identifier $name Name + * @param array $subNodes Array of the following optional subnodes: + * 'flags => MODIFIER_PUBLIC: Flags + * 'byRef' => false : Whether to return by reference + * 'params' => array() : Parameters + * 'returnType' => null : Return type + * 'stmts' => array() : Statements + * @param array $attributes Additional attributes */ - public function __construct($name, array $subNodes = array(), array $attributes = array()) { + public function __construct($name, array $subNodes = [], array $attributes = []) { parent::__construct($attributes); - $this->flags = isset($subNodes['flags']) ? $subNodes['flags'] - : (isset($subNodes['type']) ? $subNodes['type'] : 0); - $this->type = $this->flags; - $this->byRef = isset($subNodes['byRef']) ? $subNodes['byRef'] : false; - $this->name = $name; - $this->params = isset($subNodes['params']) ? $subNodes['params'] : array(); - $this->returnType = isset($subNodes['returnType']) ? $subNodes['returnType'] : null; - $this->stmts = array_key_exists('stmts', $subNodes) ? $subNodes['stmts'] : array(); + $this->flags = $subNodes['flags'] ?? $subNodes['type'] ?? 0; + $this->byRef = $subNodes['byRef'] ?? false; + $this->name = \is_string($name) ? new Node\Identifier($name) : $name; + $this->params = $subNodes['params'] ?? []; + $returnType = $subNodes['returnType'] ?? null; + $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType; + $this->stmts = array_key_exists('stmts', $subNodes) ? $subNodes['stmts'] : []; } - public function getSubNodeNames() { - return array('flags', 'byRef', 'name', 'params', 'returnType', 'stmts'); + public function getSubNodeNames() : array { + return ['flags', 'byRef', 'name', 'params', 'returnType', 'stmts']; } - public function returnsByRef() { + public function returnsByRef() : bool { return $this->byRef; } - public function getParams() { + public function getParams() : array { return $this->params; } @@ -67,28 +81,71 @@ class ClassMethod extends Node\Stmt implements FunctionLike return $this->stmts; } - public function isPublic() { + /** + * Whether the method is explicitly or implicitly public. + * + * @return bool + */ + public function isPublic() : bool { return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0 || ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0; } - public function isProtected() { + /** + * Whether the method is protected. + * + * @return bool + */ + public function isProtected() : bool { return (bool) ($this->flags & Class_::MODIFIER_PROTECTED); } - public function isPrivate() { + /** + * Whether the method is private. + * + * @return bool + */ + public function isPrivate() : bool { return (bool) ($this->flags & Class_::MODIFIER_PRIVATE); } - public function isAbstract() { + /** + * Whether the method is abstract. + * + * @return bool + */ + public function isAbstract() : bool { return (bool) ($this->flags & Class_::MODIFIER_ABSTRACT); } - public function isFinal() { + /** + * Whether the method is final. + * + * @return bool + */ + public function isFinal() : bool { return (bool) ($this->flags & Class_::MODIFIER_FINAL); } - public function isStatic() { + /** + * Whether the method is static. + * + * @return bool + */ + public function isStatic() : bool { return (bool) ($this->flags & Class_::MODIFIER_STATIC); } + + /** + * Whether the method is magic. + * + * @return bool + */ + public function isMagic() : bool { + return isset(self::$magicNames[$this->name->toLowerString()]); + } + + public function getType() : string { + return 'Stmt_ClassMethod'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php index 0a65e374..78bd1957 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php @@ -1,4 +1,4 @@ - true, - 'parent' => true, - 'static' => true, - ); - /** * Constructs a class node. * - * @param string|null $name Name + * @param string|Node\Identifier|null $name Name * @param array $subNodes Array of the following optional subnodes: * 'flags' => 0 : Flags * 'extends' => null : Name of extended class @@ -45,30 +34,43 @@ class Class_ extends ClassLike * 'stmts' => array(): Statements * @param array $attributes Additional attributes */ - public function __construct($name, array $subNodes = array(), array $attributes = array()) { + public function __construct($name, array $subNodes = [], array $attributes = []) { parent::__construct($attributes); - $this->flags = isset($subNodes['flags']) ? $subNodes['flags'] - : (isset($subNodes['type']) ? $subNodes['type'] : 0); - $this->type = $this->flags; - $this->name = $name; - $this->extends = isset($subNodes['extends']) ? $subNodes['extends'] : null; - $this->implements = isset($subNodes['implements']) ? $subNodes['implements'] : array(); - $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array(); + $this->flags = $subNodes['flags'] ?? $subNodes['type'] ?? 0; + $this->name = \is_string($name) ? new Node\Identifier($name) : $name; + $this->extends = $subNodes['extends'] ?? null; + $this->implements = $subNodes['implements'] ?? []; + $this->stmts = $subNodes['stmts'] ?? []; } - public function getSubNodeNames() { - return array('flags', 'name', 'extends', 'implements', 'stmts'); + public function getSubNodeNames() : array { + return ['flags', 'name', 'extends', 'implements', 'stmts']; } - public function isAbstract() { + /** + * Whether the class is explicitly abstract. + * + * @return bool + */ + public function isAbstract() : bool { return (bool) ($this->flags & self::MODIFIER_ABSTRACT); } - public function isFinal() { + /** + * Whether the class is final. + * + * @return bool + */ + public function isFinal() : bool { return (bool) ($this->flags & self::MODIFIER_FINAL); } - public function isAnonymous() { + /** + * Whether the class is anonymous. + * + * @return bool + */ + public function isAnonymous() : bool { return null === $this->name; } @@ -96,4 +98,8 @@ class Class_ extends ClassLike throw new Error('Cannot use the final modifier on an abstract class member'); } } + + public function getType() : string { + return 'Stmt_Class'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php index 8b2eecd5..c1786bed 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php @@ -1,4 +1,4 @@ -consts = $consts; } - public function getSubNodeNames() { - return array('consts'); + public function getSubNodeNames() : array { + return ['consts']; + } + + public function getType() : string { + return 'Stmt_Const'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php index f78e19a2..7e143ac9 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php @@ -1,4 +1,4 @@ -num = $num; } - public function getSubNodeNames() { - return array('num'); + public function getSubNodeNames() : array { + return ['num']; + } + + public function getType() : string { + return 'Stmt_Continue'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php index 829dbaf2..40bec303 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php @@ -1,4 +1,4 @@ -value pair node. * - * @param string $key Key - * @param Node\Expr $value Value - * @param array $attributes Additional attributes + * @param string|Node\Identifier $key Key + * @param Node\Expr $value Value + * @param array $attributes Additional attributes */ - public function __construct($key, Node\Expr $value, array $attributes = array()) { + public function __construct($key, Node\Expr $value, array $attributes = []) { parent::__construct($attributes); - $this->key = $key; + $this->key = \is_string($key) ? new Node\Identifier($key) : $key; $this->value = $value; } - public function getSubNodeNames() { - return array('key', 'value'); + public function getSubNodeNames() : array { + return ['key', 'value']; + } + + public function getType() : string { + return 'Stmt_DeclareDeclare'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php index 32739f35..305e07d5 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php @@ -1,4 +1,4 @@ -declares = $declares; $this->stmts = $stmts; } - public function getSubNodeNames() { - return array('declares', 'stmts'); + public function getSubNodeNames() : array { + return ['declares', 'stmts']; + } + + public function getType() : string { + return 'Stmt_Declare'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php index dd4c6c84..778c7398 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php @@ -1,4 +1,4 @@ -cond = $cond; $this->stmts = $stmts; } - public function getSubNodeNames() { - return array('cond', 'stmts'); + public function getSubNodeNames() : array { + return ['stmts', 'cond']; + } + + public function getType() : string { + return 'Stmt_Do'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php index 11e10707..9c35c616 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php @@ -1,4 +1,4 @@ -exprs = $exprs; } - public function getSubNodeNames() { - return array('exprs'); + public function getSubNodeNames() : array { + return ['exprs']; + } + + public function getType() : string { + return 'Stmt_Echo'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php index 608878f6..f518d512 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php @@ -1,4 +1,4 @@ -cond = $cond; $this->stmts = $stmts; } - public function getSubNodeNames() { - return array('cond', 'stmts'); + public function getSubNodeNames() : array { + return ['cond', 'stmts']; + } + + public function getType() : string { + return 'Stmt_ElseIf'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php index c91a1484..c7015c69 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php @@ -1,4 +1,4 @@ -stmts = $stmts; } - public function getSubNodeNames() { - return array('stmts'); + public function getSubNodeNames() : array { + return ['stmts']; + } + + public function getType() : string { + return 'Stmt_Else'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php new file mode 100644 index 00000000..1e2aa394 --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php @@ -0,0 +1,33 @@ +expr = $expr; + } + + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Stmt_Expression'; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php index 0e3eabbe..0498f5bf 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php @@ -1,4 +1,4 @@ -stmts = $stmts; } - public function getSubNodeNames() { - return array('stmts'); + public function getSubNodeNames() : array { + return ['stmts']; + } + + public function getType() : string { + return 'Stmt_Finally'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php index 2ca88a33..3e208914 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php @@ -1,4 +1,4 @@ - array(): Statements * @param array $attributes Additional attributes */ - public function __construct(array $subNodes = array(), array $attributes = array()) { + public function __construct(array $subNodes = [], array $attributes = []) { parent::__construct($attributes); - $this->init = isset($subNodes['init']) ? $subNodes['init'] : array(); - $this->cond = isset($subNodes['cond']) ? $subNodes['cond'] : array(); - $this->loop = isset($subNodes['loop']) ? $subNodes['loop'] : array(); - $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array(); + $this->init = $subNodes['init'] ?? []; + $this->cond = $subNodes['cond'] ?? []; + $this->loop = $subNodes['loop'] ?? []; + $this->stmts = $subNodes['stmts'] ?? []; } - public function getSubNodeNames() { - return array('init', 'cond', 'loop', 'stmts'); + public function getSubNodeNames() : array { + return ['init', 'cond', 'loop', 'stmts']; + } + + public function getType() : string { + return 'Stmt_For'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php index d2c64320..9c8e88f8 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php @@ -1,4 +1,4 @@ - array(): Statements * @param array $attributes Additional attributes */ - public function __construct(Node\Expr $expr, Node\Expr $valueVar, array $subNodes = array(), array $attributes = array()) { + public function __construct(Node\Expr $expr, Node\Expr $valueVar, array $subNodes = [], array $attributes = []) { parent::__construct($attributes); $this->expr = $expr; - $this->keyVar = isset($subNodes['keyVar']) ? $subNodes['keyVar'] : null; - $this->byRef = isset($subNodes['byRef']) ? $subNodes['byRef'] : false; + $this->keyVar = $subNodes['keyVar'] ?? null; + $this->byRef = $subNodes['byRef'] ?? false; $this->valueVar = $valueVar; - $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array(); + $this->stmts = $subNodes['stmts'] ?? []; } - public function getSubNodeNames() { - return array('expr', 'keyVar', 'byRef', 'valueVar', 'stmts'); + public function getSubNodeNames() : array { + return ['expr', 'keyVar', 'byRef', 'valueVar', 'stmts']; + } + + public function getType() : string { + return 'Stmt_Foreach'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php index 4c1f48d8..a0bd2570 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php @@ -1,27 +1,30 @@ - false : Whether to return by reference * 'params' => array(): Parameters @@ -29,24 +32,25 @@ class Function_ extends Node\Stmt implements FunctionLike * 'stmts' => array(): Statements * @param array $attributes Additional attributes */ - public function __construct($name, array $subNodes = array(), array $attributes = array()) { + public function __construct($name, array $subNodes = [], array $attributes = []) { parent::__construct($attributes); - $this->byRef = isset($subNodes['byRef']) ? $subNodes['byRef'] : false; - $this->name = $name; - $this->params = isset($subNodes['params']) ? $subNodes['params'] : array(); - $this->returnType = isset($subNodes['returnType']) ? $subNodes['returnType'] : null; - $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array(); + $this->byRef = $subNodes['byRef'] ?? false; + $this->name = \is_string($name) ? new Node\Identifier($name) : $name; + $this->params = $subNodes['params'] ?? []; + $returnType = $subNodes['returnType'] ?? null; + $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType; + $this->stmts = $subNodes['stmts'] ?? []; } - public function getSubNodeNames() { - return array('byRef', 'name', 'params', 'returnType', 'stmts'); + public function getSubNodeNames() : array { + return ['byRef', 'name', 'params', 'returnType', 'stmts']; } - public function returnsByRef() { + public function returnsByRef() : bool { return $this->byRef; } - public function getParams() { + public function getParams() : array { return $this->params; } @@ -54,7 +58,12 @@ class Function_ extends Node\Stmt implements FunctionLike return $this->returnType; } - public function getStmts() { + /** @return Node\Stmt[] */ + public function getStmts() : array { return $this->stmts; } + + public function getType() : string { + return 'Stmt_Function'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php index 29fbc488..8e616487 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php @@ -1,4 +1,4 @@ -vars = $vars; } - public function getSubNodeNames() { - return array('vars'); + public function getSubNodeNames() : array { + return ['vars']; + } + + public function getType() : string { + return 'Stmt_Global'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php index b087fe02..35052b8a 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php @@ -1,26 +1,31 @@ -name = $name; + $this->name = \is_string($name) ? new Identifier($name) : $name; } - public function getSubNodeNames() { - return array('name'); + public function getSubNodeNames() : array { + return ['name']; + } + + public function getType() : string { + return 'Stmt_Goto'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php index 30837dd6..e0d7e604 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php @@ -1,4 +1,4 @@ -type = $type; $this->prefix = $prefix; $this->uses = $uses; } - public function getSubNodeNames() { - return array('type', 'prefix', 'uses'); + public function getSubNodeNames() : array { + return ['type', 'prefix', 'uses']; + } + + public function getType() : string { + return 'Stmt_GroupUse'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php index c33ec9f1..c86d71e1 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php @@ -1,4 +1,4 @@ -remaining = $remaining; } - public function getSubNodeNames() { - return array('remaining'); + public function getSubNodeNames() : array { + return ['remaining']; + } + + public function getType() : string { + return 'Stmt_HaltCompiler'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php index 98bda356..87cd313b 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php @@ -1,4 +1,4 @@ - null : Else clause * @param array $attributes Additional attributes */ - public function __construct(Node\Expr $cond, array $subNodes = array(), array $attributes = array()) { + public function __construct(Node\Expr $cond, array $subNodes = [], array $attributes = []) { parent::__construct($attributes); $this->cond = $cond; - $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array(); - $this->elseifs = isset($subNodes['elseifs']) ? $subNodes['elseifs'] : array(); - $this->else = isset($subNodes['else']) ? $subNodes['else'] : null; + $this->stmts = $subNodes['stmts'] ?? []; + $this->elseifs = $subNodes['elseifs'] ?? []; + $this->else = $subNodes['else'] ?? null; } - public function getSubNodeNames() { - return array('cond', 'stmts', 'elseifs', 'else'); + public function getSubNodeNames() : array { + return ['cond', 'stmts', 'elseifs', 'else']; + } + + public function getType() : string { + return 'Stmt_If'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php index accebe61..1dec989f 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php @@ -1,4 +1,4 @@ -value = $value; } - public function getSubNodeNames() { - return array('value'); + public function getSubNodeNames() : array { + return ['value']; + } + + public function getType() : string { + return 'Stmt_InlineHTML'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php index efb5891f..39049aae 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php @@ -1,4 +1,4 @@ - array(): Name of extended interfaces * 'stmts' => array(): Statements * @param array $attributes Additional attributes */ - public function __construct($name, array $subNodes = array(), array $attributes = array()) { + public function __construct($name, array $subNodes = [], array $attributes = []) { parent::__construct($attributes); - $this->name = $name; - $this->extends = isset($subNodes['extends']) ? $subNodes['extends'] : array(); - $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array(); + $this->name = \is_string($name) ? new Node\Identifier($name) : $name; + $this->extends = $subNodes['extends'] ?? []; + $this->stmts = $subNodes['stmts'] ?? []; } - public function getSubNodeNames() { - return array('name', 'extends', 'stmts'); + public function getSubNodeNames() : array { + return ['name', 'extends', 'stmts']; + } + + public function getType() : string { + return 'Stmt_Interface'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php index edd0ee9a..332043ba 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php @@ -1,26 +1,31 @@ -name = $name; + $this->name = \is_string($name) ? new Identifier($name) : $name; } - public function getSubNodeNames() { - return array('name'); + public function getSubNodeNames() : array { + return ['name']; + } + + public function getType() : string { + return 'Stmt_Label'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php index 444855c3..f113998d 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php @@ -1,4 +1,4 @@ -name = $name; $this->stmts = $stmts; } - public function getSubNodeNames() { - return array('name', 'stmts'); + public function getSubNodeNames() : array { + return ['name', 'stmts']; + } + + public function getType() : string { + return 'Stmt_Namespace'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php index 270dd099..f86f8df7 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php @@ -1,4 +1,4 @@ -flags = $flags; - $this->type = $flags; $this->props = $props; } - public function getSubNodeNames() { - return array('flags', 'props'); + public function getSubNodeNames() : array { + return ['flags', 'props']; } - public function isPublic() { + /** + * Whether the property is explicitly or implicitly public. + * + * @return bool + */ + public function isPublic() : bool { return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0 || ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0; } - public function isProtected() { + /** + * Whether the property is protected. + * + * @return bool + */ + public function isProtected() : bool { return (bool) ($this->flags & Class_::MODIFIER_PROTECTED); } - public function isPrivate() { + /** + * Whether the property is private. + * + * @return bool + */ + public function isPrivate() : bool { return (bool) ($this->flags & Class_::MODIFIER_PRIVATE); } - public function isStatic() { + /** + * Whether the property is static. + * + * @return bool + */ + public function isStatic() : bool { return (bool) ($this->flags & Class_::MODIFIER_STATIC); } + + public function getType() : string { + return 'Stmt_Property'; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php index b2d29dc7..45e26faa 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php @@ -1,4 +1,4 @@ -name = $name; + $this->name = \is_string($name) ? new Node\VarLikeIdentifier($name) : $name; $this->default = $default; } - public function getSubNodeNames() { - return array('name', 'default'); + public function getSubNodeNames() : array { + return ['name', 'default']; + } + + public function getType() : string { + return 'Stmt_PropertyProperty'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php index b6428411..346f9bd8 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Stmt_Return'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php index 4bc5dd25..7fbb7de1 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php @@ -1,30 +1,37 @@ -name = $name; + $this->var = $var; $this->default = $default; } - public function getSubNodeNames() { - return array('name', 'default'); + public function getSubNodeNames() : array { + return ['var', 'default']; + } + + public function getType() : string { + return 'Stmt_StaticVar'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php index 37cc0b36..e408f51f 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php @@ -1,4 +1,4 @@ -vars = $vars; } - public function getSubNodeNames() { - return array('vars'); + public function getSubNodeNames() : array { + return ['vars']; + } + + public function getType() : string { + return 'Stmt_Static'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php index 72d667b1..ff2ba0d9 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php @@ -1,4 +1,4 @@ -cond = $cond; $this->cases = $cases; } - public function getSubNodeNames() { - return array('cond', 'cases'); + public function getSubNodeNames() : array { + return ['cond', 'cases']; + } + + public function getType() : string { + return 'Stmt_Switch'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php index f8ff6aa3..21709bf7 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php @@ -1,4 +1,4 @@ -expr = $expr; } - public function getSubNodeNames() { - return array('expr'); + public function getSubNodeNames() : array { + return ['expr']; + } + + public function getType() : string { + return 'Stmt_Throw'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php index a29874be..43c66b8d 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php @@ -1,10 +1,9 @@ -traits = $traits; $this->adaptations = $adaptations; } - public function getSubNodeNames() { - return array('traits', 'adaptations'); + public function getSubNodeNames() : array { + return ['traits', 'adaptations']; + } + + public function getType() : string { + return 'Stmt_TraitUse'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php index c6038c8c..8bdd2c04 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php @@ -1,4 +1,4 @@ -trait = $trait; - $this->method = $method; + $this->method = \is_string($method) ? new Node\Identifier($method) : $method; $this->newModifier = $newModifier; - $this->newName = $newName; + $this->newName = \is_string($newName) ? new Node\Identifier($newName) : $newName; } - public function getSubNodeNames() { - return array('trait', 'method', 'newModifier', 'newName'); + public function getSubNodeNames() : array { + return ['trait', 'method', 'newModifier', 'newName']; + } + + public function getType() : string { + return 'Stmt_TraitUseAdaptation_Alias'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php index 1f6bc1f9..2ec6bff2 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php @@ -1,4 +1,4 @@ -trait = $trait; - $this->method = $method; + $this->method = \is_string($method) ? new Node\Identifier($method) : $method; $this->insteadof = $insteadof; } - public function getSubNodeNames() { - return array('trait', 'method', 'insteadof'); + public function getSubNodeNames() : array { + return ['trait', 'method', 'insteadof']; + } + + public function getType() : string { + return 'Stmt_TraitUseAdaptation_Precedence'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php index eed5844a..83980a76 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php @@ -1,4 +1,4 @@ - array(): Statements * @param array $attributes Additional attributes */ - public function __construct($name, array $subNodes = array(), array $attributes = array()) { + public function __construct($name, array $subNodes = [], array $attributes = []) { parent::__construct($attributes); - $this->name = $name; - $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array(); + $this->name = \is_string($name) ? new Node\Identifier($name) : $name; + $this->stmts = $subNodes['stmts'] ?? []; } - public function getSubNodeNames() { - return array('name', 'stmts'); + public function getSubNodeNames() : array { + return ['name', 'stmts']; + } + + public function getType() : string { + return 'Stmt_Trait'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php index 0ff36cc7..7661ecb7 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php @@ -1,4 +1,4 @@ -stmts = $stmts; $this->catches = $catches; $this->finally = $finally; } - public function getSubNodeNames() { - return array('stmts', 'catches', 'finally'); + public function getSubNodeNames() : array { + return ['stmts', 'catches', 'finally']; + } + + public function getType() : string { + return 'Stmt_TryCatch'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php index 0f00fe94..8bd2d7d6 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php @@ -1,4 +1,4 @@ -vars = $vars; } - public function getSubNodeNames() { - return array('vars'); + public function getSubNodeNames() : array { + return ['vars']; + } + + public function getType() : string { + return 'Stmt_Unset'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php index 2de8432d..fe588d2c 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php @@ -1,8 +1,9 @@ -getLast(); - } - + public function __construct(Node\Name $name, $alias = null, int $type = Use_::TYPE_UNKNOWN, array $attributes = []) { parent::__construct($attributes); $this->type = $type; $this->name = $name; - $this->alias = $alias; + $this->alias = \is_string($alias) ? new Identifier($alias) : $alias; } - public function getSubNodeNames() { - return array('type', 'name', 'alias'); + public function getSubNodeNames() : array { + return ['type', 'name', 'alias']; + } + + /** + * Get alias. If not explicitly given this is the last component of the used name. + * + * @return Identifier + */ + public function getAlias() : Identifier { + if (null !== $this->alias) { + return $this->alias; + } + + return new Identifier($this->name->getLast()); + } + + public function getType() : string { + return 'Stmt_UseUse'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php index 6c89ebb1..dafc1090 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php @@ -1,4 +1,4 @@ -type = $type; $this->uses = $uses; } - public function getSubNodeNames() { - return array('type', 'uses'); + public function getSubNodeNames() : array { + return ['type', 'uses']; + } + + public function getType() : string { + return 'Stmt_Use'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php index afad1b25..671207b8 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php @@ -1,4 +1,4 @@ -cond = $cond; $this->stmts = $stmts; } - public function getSubNodeNames() { - return array('cond', 'stmts'); + public function getSubNodeNames() : array { + return ['cond', 'stmts']; + } + + public function getType() : string { + return 'Stmt_While'; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php b/vendor/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php new file mode 100644 index 00000000..a30807a6 --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php @@ -0,0 +1,17 @@ +attributes = $attributes; } /** - * Gets the type of the node. + * Gets line the node started in (alias of getStartLine). * - * @return string Type of the node + * @return int Start line (or -1 if not available) */ - public function getType() { - $className = rtrim(get_class($this), '_'); - return strtr( - substr( - $className, - strpos($className, 'PhpParser\Node') + 15 - ), - '\\', - '_' - ); + public function getLine() : int { + return $this->attributes['startLine'] ?? -1; } /** * Gets line the node started in. * - * @return int Line + * Requires the 'startLine' attribute to be enabled in the lexer (enabled by default). + * + * @return int Start line (or -1 if not available) */ - public function getLine() { - return $this->getAttribute('startLine', -1); + public function getStartLine() : int { + return $this->attributes['startLine'] ?? -1; } /** - * Sets line the node started in. + * Gets the line the node ended in. * - * @param int $line Line + * Requires the 'endLine' attribute to be enabled in the lexer (enabled by default). * - * @deprecated + * @return int End line (or -1 if not available) */ - public function setLine($line) { - $this->setAttribute('startLine', (int) $line); + public function getEndLine() : int { + return $this->attributes['endLine'] ?? -1; + } + + /** + * Gets the token offset of the first token that is part of this node. + * + * The offset is an index into the array returned by Lexer::getTokens(). + * + * Requires the 'startTokenPos' attribute to be enabled in the lexer (DISABLED by default). + * + * @return int Token start position (or -1 if not available) + */ + public function getStartTokenPos() : int { + return $this->attributes['startTokenPos'] ?? -1; + } + + /** + * Gets the token offset of the last token that is part of this node. + * + * The offset is an index into the array returned by Lexer::getTokens(). + * + * Requires the 'endTokenPos' attribute to be enabled in the lexer (DISABLED by default). + * + * @return int Token end position (or -1 if not available) + */ + public function getEndTokenPos() : int { + return $this->attributes['endTokenPos'] ?? -1; + } + + /** + * Gets the file offset of the first character that is part of this node. + * + * Requires the 'startFilePos' attribute to be enabled in the lexer (DISABLED by default). + * + * @return int File start position (or -1 if not available) + */ + public function getStartFilePos() : int { + return $this->attributes['startFilePos'] ?? -1; + } + + /** + * Gets the file offset of the last character that is part of this node. + * + * Requires the 'endFilePos' attribute to be enabled in the lexer (DISABLED by default). + * + * @return int File end position (or -1 if not available) + */ + public function getEndFilePos() : int { + return $this->attributes['endFilePos'] ?? -1; + } + + /** + * Gets all comments directly preceding this node. + * + * The comments are also available through the "comments" attribute. + * + * @return Comment[] + */ + public function getComments() : array { + return $this->attributes['comments'] ?? []; } /** @@ -60,7 +115,7 @@ abstract class NodeAbstract implements Node, \JsonSerializable * @return null|Comment\Doc Doc comment object or null */ public function getDocComment() { - $comments = $this->getAttribute('comments'); + $comments = $this->getComments(); if (!$comments) { return null; } @@ -81,7 +136,7 @@ abstract class NodeAbstract implements Node, \JsonSerializable * @param Comment\Doc $docComment Doc comment to set */ public function setDocComment(Comment\Doc $docComment) { - $comments = $this->getAttribute('comments', []); + $comments = $this->getComments(); $numComments = count($comments); if ($numComments > 0 && $comments[$numComments - 1] instanceof Comment\Doc) { @@ -95,15 +150,15 @@ abstract class NodeAbstract implements Node, \JsonSerializable $this->setAttribute('comments', $comments); } - public function setAttribute($key, $value) { + public function setAttribute(string $key, $value) { $this->attributes[$key] = $value; } - public function hasAttribute($key) { + public function hasAttribute(string $key) : bool { return array_key_exists($key, $this->attributes); } - public function &getAttribute($key, $default = null) { + public function getAttribute(string $key, $default = null) { if (!array_key_exists($key, $this->attributes)) { return $default; } else { @@ -111,11 +166,18 @@ abstract class NodeAbstract implements Node, \JsonSerializable } } - public function getAttributes() { + public function getAttributes() : array { return $this->attributes; } - public function jsonSerialize() { + public function setAttributes(array $attributes) { + $this->attributes = $attributes; + } + + /** + * @return array + */ + public function jsonSerialize() : array { return ['nodeType' => $this->getType()] + get_object_vars($this); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php b/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php index 9946eb85..197ebc14 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php @@ -1,4 +1,4 @@ -code = $code; return $this->dumpRecursive($node); } @@ -65,9 +65,9 @@ class NodeDumper } elseif (is_scalar($value)) { if ('flags' === $key || 'newModifier' === $key) { $r .= $this->dumpFlags($value); - } else if ('type' === $key && $node instanceof Include_) { + } elseif ('type' === $key && $node instanceof Include_) { $r .= $this->dumpIncludeType($value); - } else if ('type' === $key + } elseif ('type' === $key && ($node instanceof Use_ || $node instanceof UseUse || $node instanceof GroupUse)) { $r .= $this->dumpUseType($value); } else { @@ -78,7 +78,7 @@ class NodeDumper } } - if ($this->dumpComments && $comments = $node->getAttribute('comments')) { + if ($this->dumpComments && $comments = $node->getComments()) { $r .= "\n comments: " . str_replace("\n", "\n ", $this->dumpRecursive($comments)); } } elseif (is_array($node)) { @@ -141,7 +141,7 @@ class NodeDumper Include_::TYPE_INCLUDE => 'TYPE_INCLUDE', Include_::TYPE_INCLUDE_ONCE => 'TYPE_INCLUDE_ONCE', Include_::TYPE_REQUIRE => 'TYPE_REQUIRE', - Include_::TYPE_REQUIRE_ONCE => 'TYPE_REQURE_ONCE', + Include_::TYPE_REQUIRE_ONCE => 'TYPE_REQUIRE_ONCE', ]; if (!isset($map[$type])) { @@ -164,18 +164,25 @@ class NodeDumper return $map[$type] . ' (' . $type . ')'; } + /** + * Dump node position, if possible. + * + * @param Node $node Node for which to dump position + * + * @return string|null Dump of position, or null if position information not available + */ protected function dumpPosition(Node $node) { if (!$node->hasAttribute('startLine') || !$node->hasAttribute('endLine')) { return null; } - $start = $node->getAttribute('startLine'); - $end = $node->getAttribute('endLine'); + $start = $node->getStartLine(); + $end = $node->getEndLine(); if ($node->hasAttribute('startFilePos') && $node->hasAttribute('endFilePos') && null !== $this->code ) { - $start .= ':' . $this->toColumn($this->code, $node->getAttribute('startFilePos')); - $end .= ':' . $this->toColumn($this->code, $node->getAttribute('endFilePos')); + $start .= ':' . $this->toColumn($this->code, $node->getStartFilePos()); + $end .= ':' . $this->toColumn($this->code, $node->getEndFilePos()); } return "[$start - $end]"; } diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeFinder.php b/vendor/nikic/php-parser/lib/PhpParser/NodeFinder.php new file mode 100644 index 00000000..2e7cfdad --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeFinder.php @@ -0,0 +1,81 @@ +addVisitor($visitor); + $traverser->traverse($nodes); + + return $visitor->getFoundNodes(); + } + + /** + * Find all nodes that are instances of a certain class. + * + * @param Node|Node[] $nodes Single node or array of nodes to search in + * @param string $class Class name + * + * @return Node[] Found nodes (all instances of $class) + */ + public function findInstanceOf($nodes, string $class) : array { + return $this->find($nodes, function ($node) use ($class) { + return $node instanceof $class; + }); + } + + /** + * Find first node satisfying a filter callback. + * + * @param Node|Node[] $nodes Single node or array of nodes to search in + * @param callable $filter Filter callback: function(Node $node) : bool + * + * @return null|Node Found node (or null if none found) + */ + public function findFirst($nodes, callable $filter) { + if (!is_array($nodes)) { + $nodes = [$nodes]; + } + + $visitor = new FirstFindingVisitor($filter); + + $traverser = new NodeTraverser; + $traverser->addVisitor($visitor); + $traverser->traverse($nodes); + + return $visitor->getFoundNode(); + } + + /** + * Find first node that is an instance of a certain class. + * + * @param Node|Node[] $nodes Single node or array of nodes to search in + * @param string $class Class name + * + * @return null|Node Found node, which is an instance of $class (or null if none found) + */ + public function findFirstInstanceOf($nodes, string $class) { + return $this->findFirst($nodes, function ($node) use ($class) { + return $node instanceof $class; + }); + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php b/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php index cce43d92..fe3045ae 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php @@ -1,4 +1,4 @@ -visitors = array(); + $this->visitors = []; } /** @@ -73,7 +73,7 @@ class NodeTraverser implements NodeTraverserInterface * * @return Node[] Traversed array of nodes */ - public function traverse(array $nodes) { + public function traverse(array $nodes) : array { $this->stopTraversal = false; foreach ($this->visitors as $visitor) { @@ -93,11 +93,18 @@ class NodeTraverser implements NodeTraverserInterface return $nodes; } - protected function traverseNode(Node $node) { + /** + * Recursively traverse a node. + * + * @param Node $node Node to traverse. + * + * @return Node Result of traversal (may be original node or new one) + */ + protected function traverseNode(Node $node) : Node { foreach ($node->getSubNodeNames() as $name) { $subNode =& $node->$name; - if (is_array($subNode)) { + if (\is_array($subNode)) { $subNode = $this->traverseArray($subNode); if ($this->stopTraversal) { break; @@ -106,13 +113,20 @@ class NodeTraverser implements NodeTraverserInterface $traverseChildren = true; foreach ($this->visitors as $visitor) { $return = $visitor->enterNode($subNode); - if (self::DONT_TRAVERSE_CHILDREN === $return) { - $traverseChildren = false; - } else if (self::STOP_TRAVERSAL === $return) { - $this->stopTraversal = true; - break 2; - } else if (null !== $return) { - $subNode = $return; + if (null !== $return) { + if ($return instanceof Node) { + $this->ensureReplacementReasonable($subNode, $return); + $subNode = $return; + } elseif (self::DONT_TRAVERSE_CHILDREN === $return) { + $traverseChildren = false; + } elseif (self::STOP_TRAVERSAL === $return) { + $this->stopTraversal = true; + break 2; + } else { + throw new \LogicException( + 'enterNode() returned invalid value of type ' . gettype($return) + ); + } } } @@ -125,17 +139,23 @@ class NodeTraverser implements NodeTraverserInterface foreach ($this->visitors as $visitor) { $return = $visitor->leaveNode($subNode); - if (self::STOP_TRAVERSAL === $return) { - $this->stopTraversal = true; - break 2; - } else if (null !== $return) { - if (is_array($return)) { + if (null !== $return) { + if ($return instanceof Node) { + $this->ensureReplacementReasonable($subNode, $return); + $subNode = $return; + } elseif (self::STOP_TRAVERSAL === $return) { + $this->stopTraversal = true; + break 2; + } elseif (\is_array($return)) { throw new \LogicException( 'leaveNode() may only return an array ' . 'if the parent structure is an array' ); + } else { + throw new \LogicException( + 'leaveNode() returned invalid value of type ' . gettype($return) + ); } - $subNode = $return; } } } @@ -144,26 +164,35 @@ class NodeTraverser implements NodeTraverserInterface return $node; } - protected function traverseArray(array $nodes) { - $doNodes = array(); + /** + * Recursively traverse array (usually of nodes). + * + * @param array $nodes Array to traverse + * + * @return array Result of traversal (may be original array or changed one) + */ + protected function traverseArray(array $nodes) : array { + $doNodes = []; foreach ($nodes as $i => &$node) { - if (is_array($node)) { - $node = $this->traverseArray($node); - if ($this->stopTraversal) { - break; - } - } elseif ($node instanceof Node) { + if ($node instanceof Node) { $traverseChildren = true; foreach ($this->visitors as $visitor) { $return = $visitor->enterNode($node); - if (self::DONT_TRAVERSE_CHILDREN === $return) { - $traverseChildren = false; - } else if (self::STOP_TRAVERSAL === $return) { - $this->stopTraversal = true; - break 2; - } else if (null !== $return) { - $node = $return; + if (null !== $return) { + if ($return instanceof Node) { + $this->ensureReplacementReasonable($node, $return); + $node = $return; + } elseif (self::DONT_TRAVERSE_CHILDREN === $return) { + $traverseChildren = false; + } elseif (self::STOP_TRAVERSAL === $return) { + $this->stopTraversal = true; + break 2; + } else { + throw new \LogicException( + 'enterNode() returned invalid value of type ' . gettype($return) + ); + } } } @@ -176,20 +205,33 @@ class NodeTraverser implements NodeTraverserInterface foreach ($this->visitors as $visitor) { $return = $visitor->leaveNode($node); - - if (self::REMOVE_NODE === $return) { - $doNodes[] = array($i, array()); - break; - } else if (self::STOP_TRAVERSAL === $return) { - $this->stopTraversal = true; - break 2; - } elseif (is_array($return)) { - $doNodes[] = array($i, $return); - break; - } elseif (null !== $return) { - $node = $return; + if (null !== $return) { + if ($return instanceof Node) { + $this->ensureReplacementReasonable($node, $return); + $node = $return; + } elseif (\is_array($return)) { + $doNodes[] = [$i, $return]; + break; + } elseif (self::REMOVE_NODE === $return) { + $doNodes[] = [$i, []]; + break; + } elseif (self::STOP_TRAVERSAL === $return) { + $this->stopTraversal = true; + break 2; + } elseif (false === $return) { + throw new \LogicException( + 'bool(false) return from leaveNode() no longer supported. ' . + 'Return NodeTraverser::REMOVE_NODE instead' + ); + } else { + throw new \LogicException( + 'leaveNode() returned invalid value of type ' . gettype($return) + ); + } } } + } elseif (\is_array($node)) { + throw new \LogicException('Invalid node structure: Contains nested arrays'); } } @@ -201,4 +243,21 @@ class NodeTraverser implements NodeTraverserInterface return $nodes; } + + private function ensureReplacementReasonable($old, $new) { + if ($old instanceof Node\Stmt && $new instanceof Node\Expr) { + throw new \LogicException( + "Trying to replace statement ({$old->getType()}) " . + "with expression ({$new->getType()}). Are you missing a " . + "Stmt_Expression wrapper?" + ); + } + + if ($old instanceof Node\Expr && $new instanceof Node\Stmt) { + throw new \LogicException( + "Trying to replace expression ({$old->getType()}) " . + "with statement ({$new->getType()})" + ); + } + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php b/vendor/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php index 0f88e467..77ff3d27 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php @@ -1,4 +1,4 @@ -setAttribute('origNode', $origNode); + return $node; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php new file mode 100644 index 00000000..9531edbc --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php @@ -0,0 +1,48 @@ +filterCallback = $filterCallback; + } + + /** + * Get found nodes satisfying the filter callback. + * + * Nodes are returned in pre-order. + * + * @return Node[] Found nodes + */ + public function getFoundNodes() : array { + return $this->foundNodes; + } + + public function beforeTraverse(array $nodes) { + $this->foundNodes = []; + + return null; + } + + public function enterNode(Node $node) { + $filterCallback = $this->filterCallback; + if ($filterCallback($node)) { + $this->foundNodes[] = $node; + } + + return null; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php new file mode 100644 index 00000000..596a7d7f --- /dev/null +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php @@ -0,0 +1,50 @@ +filterCallback = $filterCallback; + } + + /** + * Get found node satisfying the filter callback. + * + * Returns null if no node satisfies the filter callback. + * + * @return null|Node Found node (or null if not found) + */ + public function getFoundNode() { + return $this->foundNode; + } + + public function beforeTraverse(array $nodes) { + $this->foundNode = null; + + return null; + } + + public function enterNode(Node $node) { + $filterCallback = $this->filterCallback; + if ($filterCallback($node)) { + $this->foundNode = $node; + return NodeTraverser::STOP_TRAVERSAL; + } + + return null; + } +} diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php index d56812bc..44d01e10 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php @@ -1,9 +1,10 @@ - [aliasName => originalName]] */ - protected $aliases; - - /** @var ErrorHandler Error handler */ - protected $errorHandler; + /** @var NameContext Naming context */ + protected $nameContext; /** @var bool Whether to preserve original names */ protected $preserveOriginalNames; + /** @var bool Whether to replace resolved nodes in place, or to add resolvedNode attributes */ + protected $replaceNodes; + /** * Constructs a name resolution visitor. * - * Options: If "preserveOriginalNames" is enabled, an "originalName" attribute will be added to - * all name nodes that underwent resolution. + * Options: + * * preserveOriginalNames (default false): An "originalName" attribute will be added to + * all name nodes that underwent resolution. + * * replaceNodes (default true): Resolved names are replaced in-place. Otherwise, a + * resolvedName attribute is added. (Names that cannot be statically resolved receive a + * namespacedName attribute, as usual.) * * @param ErrorHandler|null $errorHandler Error handler * @param array $options Options */ public function __construct(ErrorHandler $errorHandler = null, array $options = []) { - $this->errorHandler = $errorHandler ?: new ErrorHandler\Throwing; - $this->preserveOriginalNames = !empty($options['preserveOriginalNames']); + $this->nameContext = new NameContext($errorHandler ?? new ErrorHandler\Throwing); + $this->preserveOriginalNames = $options['preserveOriginalNames'] ?? false; + $this->replaceNodes = $options['replaceNodes'] ?? true; + } + + /** + * Get name resolution context. + * + * @return NameContext + */ + public function getNameContext() : NameContext { + return $this->nameContext; } public function beforeTraverse(array $nodes) { - $this->resetState(); + $this->nameContext->startNamespace(); + return null; } public function enterNode(Node $node) { if ($node instanceof Stmt\Namespace_) { - $this->resetState($node->name); + $this->nameContext->startNamespace($node->name); } elseif ($node instanceof Stmt\Use_) { foreach ($node->uses as $use) { $this->addAlias($use, $node->type, null); @@ -100,10 +113,10 @@ class NameResolver extends NodeVisitorAbstract } } elseif ($node instanceof Expr\FuncCall) { if ($node->name instanceof Name) { - $node->name = $this->resolveOtherName($node->name, Stmt\Use_::TYPE_FUNCTION); + $node->name = $this->resolveName($node->name, Stmt\Use_::TYPE_FUNCTION); } } elseif ($node instanceof Expr\ConstFetch) { - $node->name = $this->resolveOtherName($node->name, Stmt\Use_::TYPE_CONSTANT); + $node->name = $this->resolveName($node->name, Stmt\Use_::TYPE_CONSTANT); } elseif ($node instanceof Stmt\TraitUse) { foreach ($node->traits as &$trait) { $trait = $this->resolveClassName($trait); @@ -121,48 +134,19 @@ class NameResolver extends NodeVisitorAbstract } } } + + return null; } - protected function resetState(Name $namespace = null) { - $this->namespace = $namespace; - $this->aliases = array( - Stmt\Use_::TYPE_NORMAL => array(), - Stmt\Use_::TYPE_FUNCTION => array(), - Stmt\Use_::TYPE_CONSTANT => array(), - ); - } - - protected function addAlias(Stmt\UseUse $use, $type, Name $prefix = null) { + private function addAlias(Stmt\UseUse $use, $type, Name $prefix = null) { // Add prefix for group uses $name = $prefix ? Name::concat($prefix, $use->name) : $use->name; // Type is determined either by individual element or whole use declaration $type |= $use->type; - // Constant names are case sensitive, everything else case insensitive - if ($type === Stmt\Use_::TYPE_CONSTANT) { - $aliasName = $use->alias; - } else { - $aliasName = strtolower($use->alias); - } - - if (isset($this->aliases[$type][$aliasName])) { - $typeStringMap = array( - Stmt\Use_::TYPE_NORMAL => '', - Stmt\Use_::TYPE_FUNCTION => 'function ', - Stmt\Use_::TYPE_CONSTANT => 'const ', - ); - - $this->errorHandler->handleError(new Error( - sprintf( - 'Cannot use %s%s as %s because the name is already in use', - $typeStringMap[$type], $name, $use->alias - ), - $use->getAttributes() - )); - return; - } - - $this->aliases[$type][$aliasName] = $name; + $this->nameContext->addAlias( + $name, (string) $use->getAlias(), $type, $use->getAttributes() + ); } /** @param Stmt\Function_|Stmt\ClassMethod|Expr\Closure $node */ @@ -184,7 +168,26 @@ class NameResolver extends NodeVisitorAbstract return $node; } - protected function resolveClassName(Name $name) { + /** + * Resolve name, according to name resolver options. + * + * @param Name $name Function or constant name to resolve + * @param int $type One of Stmt\Use_::TYPE_* + * + * @return Name Resolved name, or original name with attribute + */ + protected function resolveName(Name $name, int $type) : Name { + if (!$this->replaceNodes) { + $resolvedName = $this->nameContext->getResolvedName($name, $type); + if (null !== $resolvedName) { + $name->setAttribute('resolvedName', $resolvedName); + } else { + $name->setAttribute('namespacedName', FullyQualified::concat( + $this->nameContext->getNamespace(), $name, $name->getAttributes())); + } + return $name; + } + if ($this->preserveOriginalNames) { // Save the original name $originalName = $name; @@ -192,81 +195,24 @@ class NameResolver extends NodeVisitorAbstract $name->setAttribute('originalName', $originalName); } - // don't resolve special class names - if (in_array(strtolower($name->toString()), array('self', 'parent', 'static'))) { - if (!$name->isUnqualified()) { - $this->errorHandler->handleError(new Error( - sprintf("'\\%s' is an invalid class name", $name->toString()), - $name->getAttributes() - )); - } - return $name; + $resolvedName = $this->nameContext->getResolvedName($name, $type); + if (null !== $resolvedName) { + return $resolvedName; } - // fully qualified names are already resolved - if ($name->isFullyQualified()) { - return $name; - } - - $aliasName = strtolower($name->getFirst()); - if (!$name->isRelative() && isset($this->aliases[Stmt\Use_::TYPE_NORMAL][$aliasName])) { - // resolve aliases (for non-relative names) - $alias = $this->aliases[Stmt\Use_::TYPE_NORMAL][$aliasName]; - return FullyQualified::concat($alias, $name->slice(1), $name->getAttributes()); - } - - // if no alias exists prepend current namespace - return FullyQualified::concat($this->namespace, $name, $name->getAttributes()); + // unqualified names inside a namespace cannot be resolved at compile-time + // add the namespaced version of the name as an attribute + $name->setAttribute('namespacedName', FullyQualified::concat( + $this->nameContext->getNamespace(), $name, $name->getAttributes())); + return $name; } - protected function resolveOtherName(Name $name, $type) { - if ($this->preserveOriginalNames) { - // Save the original name - $originalName = $name; - $name = clone $originalName; - $name->setAttribute('originalName', $originalName); - } - - // fully qualified names are already resolved - if ($name->isFullyQualified()) { - return $name; - } - - // resolve aliases for qualified names - $aliasName = strtolower($name->getFirst()); - if ($name->isQualified() && isset($this->aliases[Stmt\Use_::TYPE_NORMAL][$aliasName])) { - $alias = $this->aliases[Stmt\Use_::TYPE_NORMAL][$aliasName]; - return FullyQualified::concat($alias, $name->slice(1), $name->getAttributes()); - } - - if ($name->isUnqualified()) { - if ($type === Stmt\Use_::TYPE_CONSTANT) { - // constant aliases are case-sensitive, function aliases case-insensitive - $aliasName = $name->getFirst(); - } - - if (isset($this->aliases[$type][$aliasName])) { - // resolve unqualified aliases - return new FullyQualified($this->aliases[$type][$aliasName], $name->getAttributes()); - } - - if (null === $this->namespace) { - // outside of a namespace unaliased unqualified is same as fully qualified - return new FullyQualified($name, $name->getAttributes()); - } - - // unqualified names inside a namespace cannot be resolved at compile-time - // add the namespaced version of the name as an attribute - $name->setAttribute('namespacedName', - FullyQualified::concat($this->namespace, $name, $name->getAttributes())); - return $name; - } - - // if no alias exists prepend current namespace - return FullyQualified::concat($this->namespace, $name, $name->getAttributes()); + protected function resolveClassName(Name $name) { + return $this->resolveName($name, Stmt\Use_::TYPE_NORMAL); } protected function addNamespacedName(Node $node) { - $node->namespacedName = Name::concat($this->namespace, $node->name); + $node->namespacedName = Name::concat( + $this->nameContext->getNamespace(), (string) $node->name); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php index 3e1743a7..d378d670 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php @@ -1,4 +1,4 @@ -parsers = $parsers; } - public function parse($code, ErrorHandler $errorHandler = null) { + public function parse(string $code, ErrorHandler $errorHandler = null) { if (null === $errorHandler) { $errorHandler = new ErrorHandler\Throwing; } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php index 52ca59cf..f16c811b 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php @@ -18,16 +18,16 @@ use PhpParser\Node\Stmt; class Php5 extends \PhpParser\ParserAbstract { protected $tokenToSymbolMapSize = 392; - protected $actionTableSize = 1020; - protected $gotoTableSize = 591; + protected $actionTableSize = 1075; + protected $gotoTableSize = 700; protected $invalidSymbol = 157; protected $errorSymbol = 1; protected $defaultAction = -32766; protected $unexpectedTokenRule = 32767; - protected $YY2TBLSTATE = 405; - protected $YYNLSTATES = 667; + protected $YY2TBLSTATE = 406; + protected $numNonLeafStates = 671; protected $symbolToName = array( "EOF", @@ -233,108 +233,114 @@ class Php5 extends \PhpParser\ParserAbstract ); protected $action = array( - 672, 673, 674, 675, 676,-32766, 677, 678, 679, 715, - 716, 216, 217, 218, 219, 220, 221, 222, 223, 224, - 0, 225, 226, 227, 228, 229, 230, 231, 232, 233, - 234, 235, 236,-32766,-32766,-32766,-32766,-32766,-32766,-32766, - -32766,-32767,-32767,-32767,-32767, 441, 237, 238,-32766,-32766, - -32766,-32766, 680,-32766, 1036,-32766,-32766,-32766,-32766,-32766, - -32766,-32767,-32767,-32767,-32767,-32767, 681, 682, 683, 684, - 685, 686, 687, 909, 329, 747,-32766,-32766,-32766,-32766, - -32766, 282, 688, 689, 690, 691, 692, 693, 694, 695, - 696, 697, 698, 718, 719, 720, 721, 722, 710, 711, - 712, 713, 714, 699, 700, 701, 702, 703, 704, 705, - 741, 742, 743, 744, 745, 746, 706, 707, 708, 709, - 739, 730, 728, 729, 725, 726, 1178, 717, 723, 724, - 731, 732, 734, 733, 735, 736, 52, 53, 420, 54, - 55, 727, 738, 737, 23, 56, 57, 284, 58,-32766, - -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766, 7,-32767, - -32767,-32767,-32767, 50, 325,-32766, 585, 945, 946, 947, - 944, 943, 942, 937, 1213, 27, 1215, 1214, 763, 764, - 821, 59, 60,-32766,-32766,-32766, 809, 61, 1172, 62, - 291, 292, 63, 64, 65, 66, 67, 68, 69, 70, - 334, 24, 299, 71, 413,-32766,-32766,-32766, 1185, 1087, - 1088, 749, 633, 1178, 213, 214, 215, 464,-32766,-32766, - -32766, 822, 407, 1099, 311,-32766, 1186,-32766,-32766,-32766, - -32766,-32766,-32766, 1036, 200, -269, 428,-32766,-32766,-32766, - -32766,-32766,-32766,-32766,-32766, 120, 491, 945, 946, 947, - 944, 943, 942, 306, 473, 474, 293, 623, 125,-32766, - 893, 894, 339, 477, 478,-32766, 1093, 1094, 1095, 1096, - 1090, 1091, 307, 492,-32766, 440, 425, 492, 1097, 1092, - 425, 121, -220, 869, 1182, 39, 280, 334, 321, 900, - 322, 421, -122, -122, -122, -4, 822, 463, 99, 100, - 101, 811, 301, 119, 38, 19, 422, -122, 465, -122, - 466, -122, 467, -122, 102, 423, -122, -122, -122, 28, - 29, 468, 424, 624, 30, 469, 425, 812, 72, 297, - 923, 349, 350, 470, 471,-32766,-32766,-32766, 419, 472, - 1036, 447, 793, 840, 475, 476,-32767,-32767,-32767,-32767, - 94, 95, 96, 97, 98,-32766, 126,-32766,-32766,-32766, - -32766, 1137, 213, 214, 215, 295, 421, 239, 824, 638, - -122, 1036, 463, 893, 894, 1205, 811, 1036, 1204, 38, - 19, 422, 200, 465, 356, 466, 492, 467, 127, 425, - 423, 213, 214, 215, 28, 29, 468, 424, 414, 30, - 469, 1036, 870, 72, 320, 822, 349, 350, 470, 471, - 34, 200, 214, 215, 472, 460, 762, 755, 840, 475, - 476, 213, 214, 215, 295, -216, 76, 77, 78, 46, - 298, 200, 412, 653, 338, 438, 31, 294, 333, 8, - 348, 200, 241, 824, 638, -4, 32, 332, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 1210, 301, 204, 822, 421, 805, 124,-32766,-32766, - -32766, 463, 899, 1054, 102, 811, 18, 206, 38, 19, - 422, 518, 465, 1172, 466, 546, 467, 47,-32766, 423, - -32766,-32766, 647, 28, 29, 468, 822, 801, 30, 469, - 415, 116, 72, 803, 49, 349, 350,-32766,-32766,-32766, - -32766,-32766,-32766, 472, 477, 808, 234, 235, 236, 213, - 214, 215, 1036, 215, 644, 1138, 124,-32766,-32766,-32766, - -32766,-32766, 237, 238, 421, 231, 232, 233, 1099, 200, - 463, 200, 824, 638, 811, 439, 918, 38, 19, 422, - 1036, 465, 242, 466, 749, 467, 1178, 339, 423, 96, - 97, 98, 28, 29, 468, 822, 421, 30, 469, 117, - 919, 72, 463, 283, 349, 350, 811, 244, 1036, 38, - 19, 422, 472, 465, 243, 466, 118, 467, 377, 1064, - 423, 1036, 207, 642, 28, 29, 468, 822, 129, 30, - 469, 296, 576, 72,-32766,-32766, 349, 350, 123, 205, - 492, 824, 638, 425, 472, 115,-32766,-32766,-32766, 434, - 492, 200, 640, 425, 820, 641,-32766,-32766, 429,-32766, - 334, 237, 238, 454, 591, 421,-32766, 130, 357, 449, - 20, 463, 128, 856, 638, 811, 763, 764, 38, 19, - 422, 313, 465, 646, 466, 650, 467, 599, 600, 423, - 833, 301, 605, 28, 29, 468, 822, 421, 30, 469, - 756, 643, 72, 463, 299, 349, 350, 811, 922, 666, - 38, 19, 422, 472, 465, 102, 466, 51, 467, 934, - 656, 423, 512, 433, 48, 28, 29, 468, 41, 42, - 30, 469, 43, 44, 72, 45, 435, 349, 350, 1057, - 750, 1208, 824, 638, 776, 472, 749, 33, 103, 104, - 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 534, 533, 517, 513, 524, 437, 421, 602, 516, 622, - 612, 619, 463, 582, 824, 638, 811, 595,-32766, 38, - 19, 422, 632, 465, 579, 466, 240, 467, 975, 977, - 423, 609, 1144, 279, 28, 29, 468, 12, -80, 30, - 469, 537, 432, 72, 208, 209, 349, 350, 458, 1098, - 210, 596, 211, 328, 472, 326, 11, 842, 323, 393, - 4, 385, 408, 303, 202, 1034, 0, 0, 324, 208, - 209, 841, 1087, 1088, 0, 210,-32766, 211, -497, -498, - 1089, 312, 310, 824, 638, 477, 0, 0, 0, 202, - 0, -398, 0, 0, 9, 0, 0, 1087, 1088, 3, - -497,-32766, -406, 370, -407, 1089, 835, 639, 0, 384, - 372, 409, 526, 434, 0, 0, 864, 857, 863, 872, - 0, 813, 798, 819, 807, 761, 661, 565, 760, 1093, - 1094, 1095, 1096, 1090, 1091, 383, 37, 36, 759, 926, - 810, 1097, 1092, 854, 852, 302, 806, 929, 212, 818, - -32766, 930, 565, 928, 1093, 1094, 1095, 1096, 1090, 1091, - 383, 927, 796, 804, 660, 802, 1097, 1092, 649, 651, - 75, 0, 652, 212, 654,-32766, 655, 658, 663, 664, - 665, 405, 122, 330, 331, 406, 0, 1211, 757, 758, - 839, 838, 766, 453, 1209, 1179, 1177, 1163, 1175, 1078, - 911, 1183, 1173, 829, 836, 1038, 1039, 827, 935, 1212, - 765, 837, 794, 662, 1050, 768, 767, 861, 862, 0, - 304, 290, 289, 25, 26, 281, 203, 74, 305, 336, - 411, 417, 35, 73,-32766, 40, 22, 0, 1015, 569, - -217, 1016, 1103, 1080, 901, 1040, 1044, 1041, 629, 559, - 461, 457, 455, 450, 378, 16, 15, 14, -216, 0, - 0, -416, 0, 1045, 603, 1157, 1104, 1207, 1077, 1174, - 1158, 1162, 1176, 1063, 1048, 1049, 1046, 1047, 0, 1143 + 676, 677, 678, 679, 680,-32766, 681, 682, 683, 719, + 720, 218, 219, 220, 221, 222, 223, 224, 225, 226, + 0, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 236, 237, 238,-32766,-32766,-32766,-32766,-32766,-32766,-32766, + -32766,-32767,-32767,-32767,-32767, 421, 239, 240,-32766,-32766, + -32766,-32766, 684,-32766, 311,-32766,-32766,-32766,-32766,-32766, + -32766,-32767,-32767,-32767,-32767,-32767, 685, 686, 687, 688, + 689, 690, 691, 1180, 10, 751,-32766,-32766,-32766,-32766, + -32766, 424, 692, 693, 694, 695, 696, 697, 698, 699, + 700, 701, 702, 722, 723, 724, 725, 726, 714, 715, + 716, 717, 718, 703, 704, 705, 706, 707, 708, 709, + 745, 746, 747, 748, 749, 750, 710, 711, 712, 713, + 743, 734, 732, 733, 729, 730, 282, 721, 727, 728, + 735, 736, 738, 737, 739, 740, 54, 55, 425, 56, + 57, 731, 742, 741, 25, 58, 59, 339, 60,-32766, + -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766, 9,-32767, + -32767,-32767,-32767, 52, 327,-32766, 1044, 952, 953, 954, + 951, 950, 949, 944,-32766,-32766,-32766, 48, 770, 771, + 828, 61, 62, 125, -272, 206, 815, 63, 1180, 64, + 293, 294, 65, 66, 67, 68, 69, 70, 71, 72, + 420, 26, 301, 73, 417,-32766,-32766,-32766,-32766, 1095, + 1096, 755, 753, 758,-32766, 926, 876, 474,-32766,-32766, + -32766, 829, 410,-32766, 309,-32766, 1062,-32766,-32766,-32766, + -32766,-32766,-32766, 215, 216, 217, 437,-32766,-32766,-32766, + -32766,-32766,-32766,-32766,-32766, 122, 498, 952, 953, 954, + 951, 950, 949, 202, 482, 483, 284, 627, 127, 118, + 900, 901, 339, 484, 485, -219, 1101, 1102, 1103, 1104, + 1098, 1099, 312, 499, 353, 423, 433, 499, 1105, 1100, + 433, 525, -223,-32766,-32766, 41, 422, 335, 323, 907, + 324, 426, -125, -125, -125, -4, 829, 473, 101, 102, + 103, 817, 303, 1044, 40, 21, 427, -125, 475, -125, + 476, -125, 477, -125, 104, 428, 215, 216, 217, 31, + 32, 429, 430, 628, 33, 478, 433, 819, 74, 592, + 930, 351, 352, 479, 480, 877, 202, 243, 1107, 481, + 297, 769, 800, 847, 431, 432, 300, 236, 237, 238, + 35, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 239, 240, 1044, 426, 416, 831, 642, + -125, 829, 473, 215, 216, 217, 817, 1146, 241, 40, + 21, 427, 350, 475, 447, 476, 1107, 477, 297, 1044, + 428, 983, 985, 202, 31, 32, 429, 430, 408, 33, + 478, 1195, 1222, 74, 322, 1223, 351, 352, 479, 480, + -32766,-32766,-32766, 1044, 481, 814, 925, 762, 847, 431, + 432,-32767,-32767,-32767,-32767, 96, 97, 98, 99, 100, + -32766, 20,-32766,-32766,-32766,-32766, 1194, 123, 336, 810, + 484, 426, 36, 831, 642, -4, 829, 473, 900, 901, + 338, 817, 126, 1044, 40, 21, 427, 906, 475, 299, + 476, 499, 477, -501, 433, 428, -203, -203, -203, 31, + 32, 429, 430, 217, 33, 478, 285, 758, 74, 551, + 1213, 351, 352, 479, 480,-32766,-32766,-32766, 334, 481, + 51, 202, 800, 847, 431, 432, 1044, 755, 30, 758, + 126,-32766,-32766,-32766, 448,-32766, 331,-32766,-32766,-32766, + 49, 450, 753,-32766,-32766,-32766, 426, 1044, 831, 642, + -203,-32766, 473,-32766,-32766, 812, 817,-32766,-32766, 40, + 21, 427, 1072, 475, 121, 476, 202, 477, 29, 296, + 428, -204, -204, -204, 31, 32, 429, 430, 117, 33, + 478, 418, 1044, 74, 207, 829, 351, 352, 479, 480, + 215, 216, 217, 499, 481, 208, 433, 800, 847, 431, + 432, 438, 120, 335, 1044, 298, 78, 79, 80,-32766, + 202, 239, 240, 645, 128, 98, 99, 100, 335, 233, + 234, 235, 119, 831, 642, -204, 34, 295, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, + 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, + 103, 246, 303, 244, 829, 426, 216, 217, 215, 216, + 217, 473, 808, 499, 104, 817, 433, 131, 40, 21, + 427, 583, 475, 77, 476, 202, 477, 335, 202, 428, + 462, 598, 648, 31, 32, 429, 829, 443, 33, 478, + 644, 245, 74, 457, 22, 351, 352,-32766,-32766,-32766, + 132, 361, 209, 481, 770, 771, 605, 606, 941, 658, + 929, 670, 763, 647, 646, -82, 840,-32766, 303, 649, + 652, 130, 827, 315, 426, 104,-32766, 53, 46, 47, + 473, 301, 831, 642, 817, 44, 45, 40, 21, 427, + 129, 475, 43, 476, 50, 477, 611, 753, 428, 531, + 758, 755, 31, 32, 429, 829, 426, 33, 478, 756, + -32766, 74, 473, 957, 351, 352, 817, 586, 636, 40, + 21, 427, 481, 475, 446, 476, 615, 477, 849, 848, + 428, 326, 1106, 655, 31, 32, 429, 829, 623, 33, + 478, 330, 281, 74, 449, 11, 351, 352, -80, 589, + 12, 863, 642, 602, 481, 1145, 328, 467, 441, -219, + 0, 603, 411, 0, 0, 650, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 426, 0, -502, 0, 0, + 0, 473, 0, 831, 642, 817, 325, -501, 40, 21, + 427, 308, 475, 310, 476, 484, 477, 1152, 0, 428, + 0, 0, 0, 31, 32, 429, 829, 426, 33, 478, + 6, 360, 74, 473, -410, 351, 352, 817, -402, 5, + 40, 21, 427, 481, 475, 14, 476, -411, 477, 842, + 412, 428, 533, 443, 394, 31, 32, 429, 386, 385, + 33, 478, 374, 816, 74, 663, 662, 351, 352, 39, + 38, 767, 831, 642, 766, 481, 809, 811, 935, 813, + 825, 933, 768, 818, 934, 937, 936, 859, 861, 864, + 803, 871, 870, 879, 820, 805, 426, 826, 869, 407, + 333, 332, 473, 124, 831, 642, 817, 406, 77, 40, + 21, 427, 667, 475, 666, 476, 242, 477, 665, 660, + 428, 657, 656, 654, 31, 32, 429, 653, 651, 33, + 478, 643, 340, 74, 210, 211, 351, 352, 942, 834, + 212, 1047, 213, 843, 481, 772, 775, 774, 868, 1218, + 1188, 1186, 1171, 1184, 204, 1086, 918, 1192, 1182, 210, + 211, 773, 1095, 1096, 1058, 212,-32766, 213, 844, 845, + 1097, 1046, 836, 831, 642, 307, 1220, 764, 765, 204, + 1221, 1219, 801, 664, 461, 846, 0, 1095, 1096, 306, + 409,-32766, 305, 304, 24, 1097, 27, 292, 291, 283, + 415, 28, 37, 42, 75, 205, 76,-32766, 0, -220, + 1048, 1024, 1023, 1088, 576, 1111, 908, 572, 1052, 1101, + 1102, 1103, 1104, 1098, 1099, 384, 1049, 633, 566, 471, + 466, 1105, 1100, 465, 458, 379, 18, 17, 214, 286, + -32766, 16, 572, 609, 1101, 1102, 1103, 1104, 1098, 1099, + 384, 1042, -420, 0, 1166, 1165, 1105, 1100, 1112, 1216, + 1085, 1183, 1055, 214, 1170,-32766, 1185, 0, 1071, 1056, + 1057, 1054, 1053, 0, 1151 ); protected $actionCheck = array( @@ -343,177 +349,184 @@ class Php5 extends \PhpParser\ParserAbstract 0, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 8, 9, 10, 31, 32, 33, 34, 35, 36, 37, 38, 39, 7, 66, 67, 31, 32, - 33, 34, 54, 28, 12, 30, 31, 32, 33, 34, + 33, 34, 54, 28, 7, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 68, 69, 70, 71, 72, 73, 74, 79, 7, 77, 31, 32, 33, 34, 35, 7, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 79, 129, 130, 131, + 122, 123, 124, 125, 126, 127, 13, 129, 130, 131, 132, 133, 134, 135, 136, 137, 2, 3, 4, 5, 6, 143, 144, 145, 7, 11, 12, 153, 14, 31, 32, 33, 34, 35, 36, 37, 38, 39, 103, 41, - 42, 43, 44, 67, 109, 79, 82, 112, 113, 114, - 115, 116, 117, 118, 77, 7, 79, 80, 102, 103, - 1, 47, 48, 8, 9, 10, 148, 53, 79, 55, + 42, 43, 44, 67, 109, 79, 12, 112, 113, 114, + 115, 116, 117, 118, 8, 9, 10, 67, 102, 103, + 1, 47, 48, 29, 79, 7, 148, 53, 79, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 153, 67, 68, 69, 70, 8, 9, 10, 1, 75, - 76, 77, 77, 79, 8, 9, 10, 83, 8, 9, - 10, 1, 146, 139, 128, 28, 152, 30, 31, 32, - 33, 34, 35, 12, 28, 79, 102, 151, 28, 153, + 7, 67, 68, 69, 70, 8, 9, 10, 103, 75, + 76, 77, 77, 79, 109, 148, 29, 83, 8, 9, + 10, 1, 146, 118, 128, 28, 152, 30, 31, 32, + 33, 34, 35, 8, 9, 10, 102, 151, 28, 153, 30, 31, 32, 33, 34, 149, 112, 112, 113, 114, - 115, 116, 117, 7, 120, 121, 35, 77, 149, 103, - 130, 131, 153, 129, 130, 109, 132, 133, 134, 135, - 136, 137, 138, 143, 118, 7, 146, 143, 144, 145, - 146, 7, 152, 29, 77, 151, 13, 153, 154, 152, + 115, 116, 117, 28, 120, 121, 7, 77, 149, 149, + 130, 131, 153, 129, 130, 152, 132, 133, 134, 135, + 136, 137, 138, 143, 7, 7, 146, 143, 144, 145, + 146, 82, 152, 8, 9, 151, 7, 153, 154, 152, 156, 71, 72, 73, 74, 0, 1, 77, 50, 51, - 52, 81, 54, 13, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 66, 95, 96, 97, 98, 99, - 100, 101, 102, 143, 104, 105, 146, 148, 108, 7, - 150, 111, 112, 113, 114, 8, 9, 10, 7, 119, - 12, 7, 122, 123, 124, 125, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 28, 149, 30, 31, 32, - 33, 155, 8, 9, 10, 35, 71, 13, 148, 149, - 150, 12, 77, 130, 131, 79, 81, 12, 82, 84, - 85, 86, 28, 88, 7, 90, 143, 92, 67, 146, - 95, 8, 9, 10, 99, 100, 101, 102, 103, 104, - 105, 12, 148, 108, 109, 1, 111, 112, 113, 114, - 13, 28, 9, 10, 119, 7, 148, 122, 123, 124, - 125, 8, 9, 10, 35, 152, 8, 9, 10, 67, - 35, 28, 7, 29, 67, 29, 140, 141, 143, 7, - 7, 28, 29, 148, 149, 150, 28, 7, 30, 31, + 52, 81, 54, 12, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 66, 95, 8, 9, 10, 99, + 100, 101, 102, 143, 104, 105, 146, 148, 108, 82, + 150, 111, 112, 113, 114, 148, 28, 29, 139, 119, + 35, 148, 122, 123, 124, 125, 35, 50, 51, 52, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 66, 67, 12, 71, 7, 148, 149, + 150, 1, 77, 8, 9, 10, 81, 152, 13, 84, + 85, 86, 7, 88, 29, 90, 139, 92, 35, 12, + 95, 56, 57, 28, 99, 100, 101, 102, 103, 104, + 105, 152, 77, 108, 109, 80, 111, 112, 113, 114, + 8, 9, 10, 12, 119, 148, 148, 122, 123, 124, + 125, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 28, 152, 30, 31, 32, 33, 1, 7, 143, 148, + 129, 71, 13, 148, 149, 150, 1, 77, 130, 131, + 67, 81, 147, 12, 84, 85, 86, 152, 88, 7, + 90, 143, 92, 128, 146, 95, 96, 97, 98, 99, + 100, 101, 102, 10, 104, 105, 35, 79, 108, 78, + 82, 111, 112, 113, 114, 8, 9, 10, 7, 119, + 67, 28, 122, 123, 124, 125, 12, 77, 7, 79, + 147, 8, 9, 10, 149, 28, 7, 30, 31, 32, + 67, 128, 77, 31, 32, 33, 71, 12, 148, 149, + 150, 28, 77, 30, 31, 148, 81, 31, 32, 84, + 85, 86, 112, 88, 13, 90, 28, 92, 140, 141, + 95, 96, 97, 98, 99, 100, 101, 102, 15, 104, + 105, 123, 12, 108, 15, 1, 111, 112, 113, 114, + 8, 9, 10, 143, 119, 15, 146, 122, 123, 124, + 125, 151, 149, 153, 12, 35, 8, 9, 10, 151, + 28, 66, 67, 29, 149, 47, 48, 49, 153, 47, + 48, 49, 149, 148, 149, 150, 28, 35, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 150, 54, 7, 1, 71, 148, 147, 8, 9, - 10, 77, 152, 152, 66, 81, 152, 15, 84, 85, - 86, 82, 88, 79, 90, 128, 92, 67, 28, 95, - 30, 31, 29, 99, 100, 101, 1, 148, 104, 105, - 123, 149, 108, 148, 67, 111, 112, 8, 9, 10, - 31, 32, 33, 119, 129, 148, 50, 51, 52, 8, - 9, 10, 12, 10, 29, 152, 147, 28, 151, 30, - 31, 32, 66, 67, 71, 47, 48, 49, 139, 28, - 77, 28, 148, 149, 81, 149, 148, 84, 85, 86, - 12, 88, 15, 90, 77, 92, 79, 153, 95, 47, - 48, 49, 99, 100, 101, 1, 71, 104, 105, 149, - 148, 108, 77, 35, 111, 112, 81, 15, 12, 84, - 85, 86, 119, 88, 15, 90, 149, 92, 78, 112, - 95, 12, 15, 29, 99, 100, 101, 1, 149, 104, - 105, 35, 153, 108, 31, 32, 111, 112, 29, 15, - 143, 148, 149, 146, 119, 15, 8, 9, 10, 146, - 143, 28, 149, 146, 29, 29, 8, 9, 151, 31, - 153, 66, 67, 72, 73, 71, 28, 97, 98, 72, - 73, 77, 29, 148, 149, 81, 102, 103, 84, 85, - 86, 29, 88, 29, 90, 29, 92, 106, 107, 95, - 35, 54, 74, 99, 100, 101, 1, 71, 104, 105, - 148, 149, 108, 77, 68, 111, 112, 81, 148, 149, - 84, 85, 86, 119, 88, 66, 90, 67, 92, 148, - 149, 95, 77, 77, 67, 99, 100, 101, 67, 67, - 104, 105, 67, 67, 108, 67, 77, 111, 112, 79, - 77, 77, 148, 149, 77, 119, 77, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 77, 77, 77, 77, 82, 86, 71, 79, 79, 79, - 79, 91, 77, 96, 148, 149, 81, 96, 82, 84, - 85, 86, 89, 88, 87, 90, 29, 92, 56, 57, - 95, 93, 139, 94, 99, 100, 101, 94, 94, 104, - 105, 94, 102, 108, 47, 48, 111, 112, 102, 139, - 53, 109, 55, 126, 119, 110, 142, 123, 126, 146, - 142, 146, 146, 151, 67, 154, -1, -1, 127, 47, - 48, 123, 75, 76, -1, 53, 79, 55, 128, 128, - 83, 128, 128, 148, 149, 129, -1, -1, -1, 67, - -1, 142, -1, -1, 142, -1, -1, 75, 76, 142, - 128, 79, 142, 142, 142, 83, 147, 149, -1, 146, - 146, 146, 146, 146, -1, -1, 148, 148, 148, 148, - -1, 148, 148, 148, 148, 148, 148, 130, 148, 132, - 133, 134, 135, 136, 137, 138, 148, 148, 148, 148, - 148, 144, 145, 148, 148, 151, 148, 148, 151, 148, - 153, 148, 130, 148, 132, 133, 134, 135, 136, 137, - 138, 148, 148, 148, 148, 148, 144, 145, 149, 149, - 149, -1, 149, 151, 149, 153, 149, 149, 149, 149, - 149, 149, 149, 149, 149, 149, -1, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, -1, - 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, - 151, 151, 151, 151, 151, 151, 151, -1, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 152, -1, - -1, 154, -1, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, -1, 156 + 52, 15, 54, 15, 1, 71, 9, 10, 8, 9, + 10, 77, 148, 143, 66, 81, 146, 149, 84, 85, + 86, 153, 88, 149, 90, 28, 92, 153, 28, 95, + 72, 73, 29, 99, 100, 101, 1, 146, 104, 105, + 149, 15, 108, 72, 73, 111, 112, 8, 9, 10, + 97, 98, 15, 119, 102, 103, 106, 107, 148, 149, + 148, 149, 148, 149, 29, 29, 35, 28, 54, 29, + 29, 29, 29, 29, 71, 66, 31, 67, 67, 67, + 77, 68, 148, 149, 81, 67, 67, 84, 85, 86, + 67, 88, 67, 90, 67, 92, 74, 77, 95, 82, + 79, 77, 99, 100, 101, 1, 71, 104, 105, 77, + 82, 108, 77, 79, 111, 112, 81, 87, 89, 84, + 85, 86, 119, 88, 86, 90, 93, 92, 123, 123, + 95, 127, 139, 29, 99, 100, 101, 1, 91, 104, + 105, 126, 94, 108, 94, 94, 111, 112, 94, 96, + 142, 148, 149, 96, 119, 155, 110, 102, 102, 152, + -1, 109, 146, -1, -1, 29, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 71, -1, 128, -1, -1, + -1, 77, -1, 148, 149, 81, 126, 128, 84, 85, + 86, 128, 88, 128, 90, 129, 92, 139, -1, 95, + -1, -1, -1, 99, 100, 101, 1, 71, 104, 105, + 142, 142, 108, 77, 142, 111, 112, 81, 142, 142, + 84, 85, 86, 119, 88, 142, 90, 142, 92, 147, + 146, 95, 146, 146, 146, 99, 100, 101, 146, 146, + 104, 105, 146, 148, 108, 148, 148, 111, 112, 148, + 148, 148, 148, 149, 148, 119, 148, 148, 148, 148, + 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, + 148, 148, 148, 148, 148, 148, 71, 148, 150, 149, + 149, 149, 77, 149, 148, 149, 81, 149, 149, 84, + 85, 86, 149, 88, 149, 90, 29, 92, 149, 149, + 95, 149, 149, 149, 99, 100, 101, 149, 149, 104, + 105, 149, 151, 108, 47, 48, 111, 112, 150, 150, + 53, 150, 55, 150, 119, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 67, 150, 150, 150, 150, 47, + 48, 150, 75, 76, 150, 53, 79, 55, 150, 150, + 83, 150, 150, 148, 149, 151, 150, 150, 150, 67, + 150, 150, 150, 150, 150, 150, -1, 75, 76, 151, + 151, 79, 151, 151, 151, 83, 151, 151, 151, 151, + 151, 151, 151, 151, 151, 151, 151, 151, -1, 152, + 152, 152, 152, 152, 152, 152, 152, 130, 152, 132, + 133, 134, 135, 136, 137, 138, 152, 152, 152, 152, + 152, 144, 145, 152, 152, 152, 152, 152, 151, 153, + 153, 152, 130, 155, 132, 133, 134, 135, 136, 137, + 138, 154, 154, -1, 155, 155, 144, 145, 155, 155, + 155, 155, 155, 151, 155, 153, 155, -1, 155, 155, + 155, 155, 155, -1, 156 ); protected $actionBase = array( - 0, 220, 295, 109, 109, 180, 745, -2, -2, -2, - -2, -2, 135, 574, 473, 404, 473, 606, 505, 675, - 675, 675, 330, 389, 221, 221, 831, 221, 359, 365, - 328, 520, 589, 548, 576, 42, 42, 42, 42, 134, - 134, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 254, 179, 290, 397, 757, 755, 738, 741, 833, - 679, 829, 784, 785, 623, 786, 787, 788, 789, 790, - 783, 791, 849, 792, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 418, 418, -3, 354, 383, 413, 206, - 628, 521, 521, 521, 521, 521, 521, 521, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 403, 618, 618, 618, 523, - 737, 603, 762, 762, 762, 762, 762, 762, 762, 762, - 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, - 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, - 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, - 762, 762, 762, 762, 762, 470, -20, -20, 509, 608, - 327, 583, 210, 489, 197, 25, 25, 25, 25, 25, - 17, 45, 5, 5, 5, 5, 712, 305, 305, 305, - 305, 118, 118, 118, 118, 780, 781, 801, 804, 395, - 395, 696, 696, 616, 773, 522, 522, 498, 498, 487, - 487, 487, 487, 487, 487, 487, 487, 487, 487, 387, - 156, 823, 130, 130, 130, 130, 243, 409, 633, 863, - 207, 207, 207, 243, 248, 248, 248, 476, 476, 476, - 76, 662, 296, 86, 86, 86, 86, 296, 86, 86, - 554, 554, 554, 483, 761, 676, 477, 430, 97, 459, - 657, 807, 661, 808, 540, 702, 96, 656, 705, -6, - 680, 577, 571, 561, 689, 406, -6, 254, 551, 447, - 617, 732, 663, 268, 730, 377, 38, 367, 532, 362, - 414, 334, 774, 720, 827, 826, 74, 321, 691, 617, - 617, 617, 137, 84, 775, 772, 362, 273, 575, 575, - 575, 575, 806, 776, 575, 575, 575, 575, 805, 800, - 432, 408, 782, 331, 731, 649, 649, 649, 649, 649, - 649, 635, 649, 813, 666, 825, 825, 664, 668, 635, - 824, 824, 824, 824, 635, 649, 825, 825, 635, 616, - 825, 168, 635, 672, 649, 667, 667, 824, 756, 718, - 666, 669, 681, 825, 825, 825, 681, 664, 635, 824, - 682, 699, 466, 825, 824, 632, 632, 682, 635, 632, - 668, 632, 20, 605, 641, 821, 822, 820, 625, 698, - 688, 674, 811, 810, 816, 665, 626, 814, 812, 706, - 717, 716, 639, 610, 642, 645, 646, 648, 697, 637, - 694, 680, 707, 629, 629, 629, 690, 658, 690, 629, - 629, 629, 629, 629, 629, 629, 629, 848, 700, 701, - 693, 659, 715, 604, 704, 687, 472, 768, 650, 706, - 706, 802, 835, 842, 847, 651, 643, 734, 837, 690, - 862, 729, 274, 587, 652, 803, 703, 647, 655, 690, - 809, 690, 769, 690, 834, 799, 644, 706, 779, 629, - 832, 861, 860, 859, 858, 857, 856, 855, 854, 630, - 853, 714, 677, 841, 246, 815, 689, 692, 653, 713, - 67, 852, 778, 690, 690, 770, 761, 690, 771, 711, - 728, 845, 710, 840, 851, 650, 839, 690, 686, 850, - 67, 634, 598, 828, 678, 708, 819, 671, 830, 818, - 759, 547, 579, 777, 636, 754, 844, 843, 846, 709, - 760, 763, 572, 660, 640, 670, 793, 765, 817, 735, - 794, 795, 836, 684, 707, 654, 685, 683, 673, 767, - 796, 838, 736, 739, 743, 797, 753, 798, 0, 0, + 0, 220, 295, 445, 370, 109, 109, 180, 730, -2, + -2, 135, -2, -2, -2, 655, 756, 724, 756, 554, + 623, 825, 825, 825, 305, 353, 562, 562, 861, 401, + 562, 484, 291, 377, 154, 441, 540, 505, 505, 505, + 505, 134, 134, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 187, 179, 521, 429, 728, 729, 731, + 732, 858, 668, 859, 799, 800, 662, 801, 802, 803, + 805, 806, 834, 807, 888, 808, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, -3, 365, 225, + 308, 620, 275, 552, 552, 552, 552, 552, 552, 552, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 617, 659, 659, + 659, 463, 887, 508, 912, 912, 912, 912, 912, 912, + 912, 912, 912, 912, 912, 912, 912, 912, 912, 912, + 912, 912, 912, 912, 912, 912, 912, 912, 912, 912, + 912, 912, 912, 912, 912, 912, 912, 912, 912, 912, + 912, 912, 912, 912, 912, 912, 912, 493, -20, -20, + 477, 665, 402, 496, 210, 482, 197, 25, 25, 25, + 25, 25, 17, 45, 5, 5, 5, 5, 335, 380, + 380, 380, 380, 118, 118, 118, 118, 835, 819, 818, + 814, 311, 311, 686, 686, 633, 754, 538, 538, 542, + 542, 420, 420, 420, 420, 420, 420, 420, 420, 420, + 420, 428, 105, 856, 130, 130, 130, 130, 435, 435, + 435, 318, 199, 678, 918, 318, 248, 248, 248, 297, + 297, 297, 76, 637, 398, 86, 86, 86, 86, 398, + 86, 86, 572, 572, 572, 494, 511, 648, 325, 488, + 490, 443, 673, 798, 677, 748, 532, 705, 96, 636, + 704, 886, 676, 886, 591, 578, 570, 696, 355, 842, + -6, 187, 530, 423, 634, 715, 193, 726, 267, 38, + 383, 534, 110, 279, 752, 723, 862, 860, 249, 669, + 634, 634, 634, 137, 247, 751, 758, 110, 113, 515, + 515, 515, 515, 797, 750, 515, 515, 515, 515, 796, + 795, 67, 268, 811, 74, 733, 644, 644, 640, 640, + 644, 644, 644, 644, 654, 651, 644, 850, 843, 843, + 640, 641, 640, 654, 651, 852, 852, 852, 852, 640, + 651, 640, 640, 644, 640, 843, 843, 651, 633, 843, + 491, 651, 680, 644, 635, 635, 852, 718, 717, 640, + 640, 624, 843, 843, 843, 624, 651, 852, 672, 702, + 178, 843, 852, 664, 641, 664, 672, 651, 664, 641, + 641, 664, 20, 656, 645, 851, 853, 839, 782, 626, + 625, 847, 846, 855, 848, 845, 663, 706, 734, 735, + 533, 638, 639, 631, 632, 697, 647, 683, 676, 707, + 629, 629, 629, 679, 688, 679, 629, 629, 629, 629, + 629, 629, 629, 629, 917, 692, 689, 685, 658, 749, + 539, 716, 670, 550, 770, 613, 706, 706, 832, 874, + 883, 898, 897, 652, 842, 876, 679, 907, 722, 430, + 657, 841, 833, 713, 712, 679, 838, 679, 769, 679, + 866, 831, 643, 830, 706, 828, 629, 864, 916, 915, + 914, 913, 911, 909, 899, 906, 630, 905, 747, 650, + 882, 47, 854, 696, 628, 708, 746, 499, 904, 827, + 679, 679, 765, 759, 679, 763, 745, 721, 889, 744, + 881, 903, 613, 878, 679, 675, 900, 499, 660, 642, + 857, 653, 743, 849, 863, 781, 779, 608, 646, 826, + 661, 742, 885, 884, 627, 741, 778, 606, 774, 667, + 822, 773, 824, 740, 821, 793, 875, 674, 707, 703, + 666, 671, 649, 772, 791, 877, 739, 738, 737, 789, + 736, 788, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 134, 134, - -2, -2, -2, -2, 0, 0, 0, 0, 0, -2, + 0, 0, 134, 134, 134, 134, -2, -2, -2, -2, + 0, 0, -2, 0, 0, 0, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 134, 134, 134, 0, 0, 134, 134, + 134, 134, 0, 0, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, @@ -522,44 +535,43 @@ class Php5 extends \PhpParser\ParserAbstract 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 134, 134, 134, 134, 134, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 418, -20, -20, -20, -20, 418, -20, -20, - -20, -20, -20, -20, -20, 418, 418, 418, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, -20, 418, 418, 418, -20, 487, -20, 487, - 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, - 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, - 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, - 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, - 487, 487, 418, 0, 0, 418, -20, 418, -20, 418, - -20, 418, 418, 418, 418, 418, 418, -20, -20, -20, - -20, -20, -20, 0, 248, 248, 248, 248, -20, -20, - -20, -20, 55, 55, 55, 55, 487, 487, 487, 487, - 487, 487, 248, 248, 476, 476, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 487, 55, 487, 649, - 649, 649, 649, 649, 296, 296, 296, 47, 47, 47, - 649, 0, 0, 0, 0, 0, 0, 649, 296, 0, - 487, 487, 487, 487, 0, 487, 487, 649, 649, 649, - 649, 47, 296, 649, 825, 0, 47, 550, 550, 550, - 550, 67, 362, 0, 649, 649, 0, 669, 0, 0, - 0, 825, 0, 0, 0, 0, 0, 629, 274, 734, - 0, 433, 0, 0, 0, 0, 0, 0, 0, 643, - 433, 322, 322, 0, 0, 630, 629, 629, 629, 0, - 0, 643, 643, 0, 0, 0, 0, 0, 0, 440, - 643, 0, 0, 0, 0, 440, 425, 0, 0, 425, - 0, 67 + 134, 134, 134, 134, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 568, -20, + -20, -20, -20, 568, -20, -20, -20, -20, -20, -20, + -20, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, -20, 568, + 568, 568, -20, 420, -20, 420, 420, 420, 420, 420, + 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, + 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, + 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, + 420, 420, 420, 420, 420, 420, 420, 420, 568, 0, + 0, 568, -20, 568, -20, 568, -20, 568, 568, 568, + 568, 568, 568, -20, -20, -20, -20, -20, -20, 0, + 248, 248, 248, 248, -20, -20, -20, -20, 55, 55, + 55, 55, 420, 420, 420, 420, 420, 420, 248, 248, + 297, 297, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 420, 55, 420, 644, 644, 644, 644, 641, + 641, 641, 644, 398, 398, 398, 644, 0, 0, 0, + 0, 0, 0, 644, 398, 0, 420, 420, 420, 420, + 0, 420, 420, 644, 644, 644, 641, 644, 398, 641, + 641, 644, 843, 573, 573, 573, 573, 499, 110, 0, + 644, 644, 641, 641, 641, 0, 0, 0, 843, 0, + 640, 0, 0, 0, 0, 629, 430, 0, 375, 0, + 0, 0, 0, 0, 0, 652, 375, 452, 452, 0, + 630, 629, 629, 629, 0, 0, 652, 652, 0, 0, + 0, 0, 0, 0, 481, 652, 0, 0, 0, 0, + 481, 360, 0, 0, 360, 0, 499 ); protected $actionDefault = array( 3,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767, 525, 525,32767, 481,32767,32767, - 32767,32767,32767,32767,32767, 287, 287, 287,32767,32767, - 32767, 513, 513, 513, 513, 513, 513, 513, 513, 513, - 513, 513,32767,32767,32767,32767,32767, 369,32767,32767, + 32767,32767,32767,32767,32767,32767, 530, 530,32767,32767, + 485,32767,32767,32767,32767,32767,32767, 291, 291, 291, + 32767,32767,32767, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518,32767,32767,32767,32767,32767, 373, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, @@ -567,220 +579,243 @@ class Php5 extends \PhpParser\ParserAbstract 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767, 375, 530,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767, 379, 535,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767, 350, 351, 353, 354, 286, 514, - 237, 376, 529, 285, 239, 314, 485,32767,32767,32767, - 316, 116, 248, 193, 484, 119, 284, 224, 368, 370, - 315, 291, 296, 297, 298, 299, 300, 301, 302, 303, - 304, 305, 306, 307, 290, 441, 347, 346, 345, 443, - 32767, 442, 478, 478, 481,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767, 354, 355, 357, 358, + 290, 519, 240, 380, 534, 289, 242, 318, 489,32767, + 32767,32767, 320, 119, 251, 196, 488, 122, 288, 227, + 372, 374, 319, 295, 300, 301, 302, 303, 304, 305, + 306, 307, 308, 309, 310, 311, 294, 445, 351, 350, + 349, 447,32767, 446, 482, 482, 485,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767, 312, 469, 468, 313, 439, - 317, 440, 319, 444, 318, 335, 336, 333, 334, 337, - 446, 445, 462, 463, 460, 461, 289, 338, 339, 340, - 341, 464, 465, 466, 467, 271, 271, 271, 271,32767, - 32767, 524, 524,32767,32767, 326, 327, 453, 454,32767, + 32767,32767,32767,32767,32767,32767,32767, 316, 473, 472, + 317, 443, 321, 444, 323, 448, 322, 339, 340, 337, + 338, 341, 450, 449, 466, 467, 464, 465, 293, 342, + 343, 344, 345, 468, 469, 470, 471, 274, 274, 274, + 274,32767,32767, 529, 529,32767,32767, 330, 331, 457, + 458,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767, 275,32767, 231, 231, 231, 231,32767,32767, + 32767, 231,32767,32767,32767,32767, 325, 326, 324, 452, + 453, 451,32767, 419,32767,32767,32767,32767,32767, 421, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 272,32767, 228, 228, 228, 228, 228,32767,32767,32767, - 32767,32767,32767,32767, 321, 322, 320, 448, 449, 447, - 32767, 415,32767,32767,32767,32767,32767, 417,32767,32767, - 32767,32767,32767,32767,32767,32767,32767, 486,32767,32767, - 32767,32767,32767,32767,32767, 499, 404,32767,32767,32767, - 397, 212, 214, 161, 472,32767,32767,32767,32767, 504, - 331,32767,32767,32767,32767,32767,32767, 539,32767, 499, - 32767,32767,32767,32767,32767,32767,32767,32767, 344, 323, - 324, 325,32767,32767,32767,32767, 503, 497, 456, 457, - 458, 459,32767,32767, 450, 451, 452, 455,32767,32767, + 32767, 490,32767,32767,32767,32767,32767, 503, 408,32767, + 32767,32767, 401,32767, 215, 217, 164, 476,32767,32767, + 32767,32767,32767, 508, 335,32767,32767,32767,32767,32767, + 544,32767, 503,32767,32767,32767,32767,32767,32767, 348, + 327, 328, 329,32767,32767,32767,32767, 507, 501, 460, + 461, 462, 463,32767,32767, 454, 455, 456, 459,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767, 165,32767, 412,32767, 418, 418,32767,32767, 165, - 32767,32767,32767,32767, 165,32767, 502, 501, 165,32767, - 398, 480, 165, 178,32767, 176, 176,32767, 198, 198, - 32767,32767, 180, 473, 492,32767, 180,32767, 165,32767, - 386, 167, 480,32767,32767, 230, 230, 386, 165, 230, - 32767, 230,32767, 82, 422,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767,32767, 399, - 32767,32767,32767,32767, 365, 366, 475, 488,32767, 489, - 32767, 397,32767, 329, 330, 332, 309,32767, 311, 355, - 356, 357, 358, 359, 360, 361, 363,32767, 402,32767, - 405,32767,32767,32767, 84, 108, 247,32767, 537, 84, - 400,32767,32767, 294, 537,32767,32767,32767,32767, 532, - 32767,32767, 288,32767,32767,32767, 84,32767, 84, 243, - 32767, 163,32767, 522,32767, 497,32767, 401,32767, 328, - 32767,32767,32767,32767,32767,32767,32767,32767,32767, 498, - 32767,32767,32767,32767, 219,32767, 435,32767, 84,32767, - 179,32767,32767, 292, 238,32767,32767, 531,32767,32767, - 32767,32767,32767,32767,32767,32767,32767, 164,32767,32767, - 181,32767,32767, 497,32767,32767,32767,32767,32767,32767, - 32767,32767, 283,32767,32767,32767,32767,32767, 497,32767, - 32767,32767, 223,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767, 82, 60,32767, 265,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767, 121, 121, - 3, 121, 121, 3, 121, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 121, 121, 121, 206, 250, 209, - 198, 198, 158, 250, 250, 250, 257 + 32767,32767,32767,32767,32767, 168,32767, 416, 422, 422, + 32767,32767,32767,32767, 168,32767,32767,32767,32767,32767, + 168,32767,32767,32767,32767, 506, 505, 168,32767, 402, + 484, 168, 181,32767, 179, 179,32767, 201, 201,32767, + 32767, 183, 477, 496,32767, 183, 168,32767, 390, 170, + 484,32767,32767, 233,32767, 233, 390, 168, 233,32767, + 32767, 233,32767, 84, 426,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767, 403,32767,32767, + 32767, 369, 370, 479, 492,32767, 493,32767, 401,32767, + 333, 334, 336, 313,32767, 315, 359, 360, 361, 362, + 363, 364, 365, 367,32767, 406,32767, 409,32767,32767, + 32767, 86, 111, 250,32767, 542, 86, 404,32767,32767, + 298, 542,32767,32767,32767,32767, 537,32767,32767, 292, + 32767,32767,32767, 86, 86, 246,32767, 166,32767, 527, + 32767, 543,32767, 501, 405,32767, 332,32767,32767,32767, + 32767,32767,32767,32767,32767,32767, 502,32767,32767,32767, + 32767, 222,32767, 439,32767, 86,32767, 182,32767,32767, + 296, 241,32767,32767, 536,32767,32767,32767,32767,32767, + 32767,32767,32767,32767, 167,32767,32767, 184,32767,32767, + 501,32767,32767,32767,32767,32767,32767,32767, 287,32767, + 32767,32767,32767,32767, 501,32767,32767, 226,32767,32767, + 32767,32767,32767,32767,32767,32767,32767, 84, 60,32767, + 268,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767, 124, 124, 3, 124, 124, 3, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, 124, 209, + 253, 212, 201, 201, 161, 253, 253, 253, 124, 124, + 260 ); protected $goto = array( - 160, 160, 134, 134, 139, 134, 135, 136, 137, 142, - 144, 181, 162, 158, 158, 158, 158, 139, 139, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 154, 155, 156, 157, 178, 133, 179, 493, 494, 360, - 495, 499, 500, 501, 502, 503, 504, 505, 506, 962, - 138, 140, 141, 143, 165, 170, 180, 196, 245, 248, - 250, 252, 254, 255, 256, 257, 258, 259, 267, 268, - 269, 270, 285, 286, 314, 315, 316, 379, 380, 381, - 549, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 194, 145, 146, 147, 161, 148, 163, - 149, 197, 164, 150, 151, 152, 198, 153, 131, 625, - 567, 754, 567, 567, 567, 567, 567, 567, 567, 567, - 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, - 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, - 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, - 567, 567, 567, 567, 567, 1100, 753, 1100, 1100, 1100, - 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, - 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, - 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, - 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, - 523, 784, 497, 497, 497, 497, 497, 497, 6, 508, - 634, 508, 497, 497, 497, 497, 497, 497, 497, 497, - 497, 497, 509, 550, 509, 580, 606, 522, 885, 885, - 1190, 1190, 815, 849, 849, 849, 849, 168, 844, 850, - 522, 522, 171, 172, 173, 388, 389, 390, 391, 167, - 195, 199, 201, 249, 251, 253, 260, 261, 262, 263, - 264, 265, 271, 272, 273, 274, 287, 288, 317, 318, - 319, 394, 395, 396, 397, 169, 174, 246, 247, 175, - 176, 177, 387, 608, 543, 543, 573, 539, 583, 586, - 631, 855, 541, 541, 496, 498, 529, 545, 574, 577, - 587, 593, 341, 1169, 566, 1169, 566, 566, 566, 566, - 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, - 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, - 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, - 566, 566, 566, 566, 566, 566, 566, 566, 566, 514, - 443, 445, 933, 636, 327, 309, 1101, 618, 931, 519, - 519, 519, 519, 777, 551, 552, 553, 554, 555, 556, - 557, 558, 560, 589, 903, 611, 538, 519, 617, 548, - 358, 544, 572, 430, 430, 430, 430, 430, 430, 1194, - 777, 777, 361, 430, 430, 430, 430, 430, 430, 430, - 430, 430, 430, 1065, 1161, 1065, 892, 892, 892, 892, - 892, 1168, 598, 1168, 590, 344, 404, 892, 369, 369, - 369, 1058, 1184, 1184, 1184, 1076, 1075, 1065, 1065, 1065, - 1065, 1149, 1065, 1065, 519, 519, 536, 568, 519, 519, - 615, 519, 369, 510, 960, 510, 1167, 386, 770, 770, - 778, 778, 778, 780, 520, 769, 276, 277, 278, 535, - 607, 659, 562, 547, 594, 868, 882, 613, 867, 616, - 878, 620, 621, 628, 630, 635, 637, 1081, 375, 1201, - 1201, 1187, 1009, 889, 1019, 17, 13, 355, 790, 752, - 1200, 1200, 898, 1061, 1062, 362, 941, 1058, 1201, 527, - 871, 561, 851, 540, 657, 347, 511, 880, 875, 1200, - 1059, 1160, 1059, 21, 398, 373, 773, 1203, 604, 451, - 1060, 771, 907, 342, 343, 368, 645, 402, 446, 10, - 1056, 1051, 912, 781, 578, 1146, 859, 459, 949, 0, + 162, 162, 136, 136, 141, 144, 136, 137, 138, 139, + 146, 183, 164, 160, 160, 160, 160, 141, 141, 161, + 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, + 156, 157, 158, 159, 180, 135, 181, 500, 501, 364, + 502, 506, 507, 508, 509, 510, 511, 512, 513, 970, + 140, 142, 143, 145, 167, 172, 182, 198, 247, 250, + 252, 254, 256, 257, 258, 259, 260, 261, 269, 270, + 271, 272, 287, 288, 316, 317, 318, 380, 381, 382, + 556, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 147, 148, 149, 163, 150, 165, + 151, 199, 166, 152, 153, 154, 200, 155, 133, 629, + 574, 761, 574, 574, 574, 574, 574, 574, 574, 574, + 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, + 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, + 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, + 574, 574, 574, 574, 574, 1108, 637, 1108, 1108, 1108, + 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, + 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, + 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, + 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, + 343, 791, 504, 504, 504, 504, 504, 504, 517, 515, + 517, 515, 504, 504, 504, 504, 504, 504, 504, 504, + 504, 504, 516, 557, 516, 8, 760, 529, 892, 892, + 1199, 1199, 754, 856, 856, 856, 856, 170, 851, 857, + 529, 529, 173, 174, 175, 389, 390, 391, 392, 169, + 197, 201, 203, 251, 253, 255, 262, 263, 264, 265, + 266, 267, 273, 274, 275, 276, 289, 290, 319, 320, + 321, 395, 396, 397, 398, 171, 176, 248, 249, 177, + 178, 179, 388, 614, 549, 549, 580, 545, 590, 593, + 635, 822, 547, 547, 503, 505, 536, 553, 581, 584, + 594, 600, 530, 1177, 573, 1177, 573, 573, 573, 573, + 573, 573, 573, 573, 573, 573, 573, 573, 573, 573, + 573, 573, 573, 573, 573, 573, 573, 573, 573, 573, + 573, 573, 573, 573, 573, 573, 573, 573, 573, 573, + 573, 573, 573, 573, 573, 573, 573, 573, 573, 618, + 521, 555, 621, 862, 579, 362, 597, 346, 405, 910, + 526, 526, 526, 550, 526, 558, 559, 560, 561, 562, + 563, 564, 565, 567, 596, 587, 612, 544, 526, 278, + 279, 280, 1203, 439, 439, 439, 439, 439, 439, 1084, + 1083, 784, 604, 439, 439, 439, 439, 439, 439, 439, + 439, 439, 439, 1073, 365, 1073, 899, 899, 899, 899, + 1210, 1210, 1157, 899, 344, 345, 613, 899, 784, 784, + 1196, 329, 314, 3, 4, 377, 1210, 1073, 1073, 1073, + 1073, 1017, 1073, 1073, 526, 526, 1209, 1209, 543, 575, + 526, 526, 470, 896, 526, 905, 1169, 370, 370, 370, + 399, 349, 1209, 1191, 1191, 1191, 780, 371, 370, 370, + 1212, 527, 1066, 375, 370, 778, 914, 403, 372, 372, + 372, 554, 370, 1224, 1059, 777, 777, 759, 788, 785, + 785, 785, 787, 919, 956, 776, 916, 523, 916, 866, + 878, 860, 858, 860, 659, 372, 518, 887, 882, 387, + 542, 668, 661, 569, 541, 601, 889, 619, 620, 885, + 624, 625, 632, 634, 639, 641, 948, 452, 454, 940, + 640, 455, 468, 1089, 1109, 622, 938, 1064, 1176, 585, + 1176, 1027, 19, 15, 358, 1193, 1193, 1193, 359, 1154, + 1069, 1070, 0, 0, 1066, 534, 968, 0, 0, 546, + 0, 0, 568, 520, 540, 0, 523, 1067, 1168, 1067, + 0, 0, 1175, 23, 459, 520, 1068, 540, 610, 0, + 0, 0, 0, 0, 519, 13, 524, 442, 0, 444, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 783, 1217, 0, 0, 0, 617, + 0, 0, 0, 0, 1065, 626, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 528 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 535 ); protected $gotoCheck = array( - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 53, - 63, 12, 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 119, 11, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 94, 25, 110, 110, 110, 110, 110, 110, 91, 63, - 5, 63, 110, 110, 110, 110, 110, 110, 110, 110, - 110, 110, 110, 40, 110, 36, 36, 40, 71, 71, - 71, 71, 46, 63, 63, 63, 63, 23, 63, 63, - 40, 40, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 47, 47, 47, 47, 47, 47, 56, 56, - 56, 29, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 66, 111, 53, 111, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 8, - 7, 7, 7, 7, 118, 118, 7, 7, 7, 8, - 8, 8, 8, 19, 103, 103, 103, 103, 103, 103, - 103, 103, 103, 103, 78, 57, 8, 8, 57, 2, - 57, 102, 2, 53, 53, 53, 53, 53, 53, 132, - 19, 19, 43, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 76, 53, 53, 53, 53, 53, - 53, 112, 120, 112, 64, 64, 64, 53, 116, 116, - 116, 76, 112, 112, 112, 117, 117, 53, 53, 53, - 53, 124, 53, 53, 8, 8, 8, 8, 8, 8, - 53, 8, 116, 115, 94, 115, 112, 116, 19, 19, - 19, 19, 19, 19, 8, 19, 61, 61, 61, 28, - 45, 28, 28, 8, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 28, 28, 30, 44, 134, - 134, 130, 95, 73, 30, 30, 30, 30, 10, 10, - 133, 133, 75, 76, 76, 54, 91, 76, 134, 54, - 10, 30, 10, 54, 10, 14, 10, 10, 10, 133, - 76, 76, 76, 30, 18, 13, 21, 133, 30, 54, - 76, 20, 79, 66, 66, 9, 68, 17, 59, 54, - 108, 106, 80, 22, 60, 123, 65, 101, 93, -1, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 56, + 66, 15, 66, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 123, 8, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 69, 28, 114, 114, 114, 114, 114, 114, 119, 66, + 119, 66, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 46, 114, 94, 14, 46, 74, 74, + 74, 74, 5, 66, 66, 66, 66, 26, 66, 66, + 46, 46, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 50, 50, 50, 50, 50, 50, 59, 59, + 59, 49, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 98, 115, 56, 115, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 60, + 10, 2, 60, 32, 2, 60, 67, 67, 67, 81, + 10, 10, 10, 106, 10, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 39, 39, 10, 10, 64, + 64, 64, 137, 56, 56, 56, 56, 56, 56, 121, + 121, 22, 124, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 45, 56, 56, 56, 56, 56, + 139, 139, 128, 56, 69, 69, 48, 56, 22, 22, + 135, 122, 122, 29, 29, 47, 139, 56, 56, 56, + 56, 99, 56, 56, 10, 10, 138, 138, 10, 10, + 10, 10, 56, 76, 10, 78, 79, 12, 12, 12, + 21, 17, 138, 8, 8, 8, 24, 11, 12, 12, + 138, 10, 79, 16, 12, 23, 82, 20, 120, 120, + 120, 10, 12, 12, 110, 22, 22, 13, 25, 22, + 22, 22, 22, 83, 96, 22, 12, 12, 12, 68, + 13, 13, 13, 13, 13, 120, 13, 13, 13, 120, + 31, 71, 31, 31, 8, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 94, 7, 7, 7, + 7, 62, 105, 33, 7, 7, 7, 112, 116, 63, + 116, 33, 33, 33, 33, 116, 116, 116, 57, 127, + 79, 79, -1, -1, 79, 57, 98, -1, -1, 57, + -1, -1, 33, 8, 8, -1, 12, 79, 79, 79, + -1, -1, 116, 33, 57, 8, 79, 8, 33, -1, + -1, -1, -1, -1, 8, 57, 8, 8, -1, 8, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 8, 8, -1, -1, -1, 12, + -1, -1, -1, -1, 12, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 94 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 98 ); protected $gotoBase = array( - 0, 0, -261, 0, 0, 198, 0, 347, 29, 192, - 487, 154, 109, 168, 185, 0, 0, 121, 183, 43, - 173, 184, 93, 37, 0, 193, 0, 0, -180, 273, - 64, 0, 0, 0, 0, 0, 189, 0, 0, -22, - 201, 0, 0, 354, 188, 180, 216, 3, 0, 0, - 0, 0, 0, 104, 71, 0, -15, -81, 0, 92, - 88, -207, 0, -90, 90, 89, -137, 0, 169, 0, - 0, -51, 0, 177, 0, 179, 67, 0, 351, 166, - 91, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 196, 0, 78, 161, 181, 0, 0, 0, 0, - 0, 80, 356, 322, 0, 0, 115, 0, 111, 0, - -77, 4, 112, 0, 0, 144, 108, 114, 33, -45, - 209, 0, 0, 83, 227, 0, 0, 0, 0, 0, - 199, 0, 362, 182, 171, 0, 0 + 0, 0, -293, 0, 0, 221, 0, 512, 145, 0, + 28, 121, 135, 475, 224, 109, 114, 129, 0, 0, + 60, 117, 69, 115, 122, 58, 35, 0, 191, -245, + 0, -143, 333, 106, 0, 0, 0, 0, 0, 337, + 0, 0, -24, 0, 0, 364, 199, 133, 134, 273, + 1, 0, 0, 0, 0, 0, 102, 108, 0, -17, + -116, 0, 76, 74, -286, 0, -92, 30, 67, -248, + 0, 140, 0, 0, -53, 0, 132, 0, 130, 105, + 0, 334, 113, 62, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 214, 0, 61, 0, 261, 128, + 0, 0, 0, 0, 0, 56, 336, 321, 0, 0, + 55, 0, 103, 0, -79, 2, 227, 0, 0, -93, + 160, 80, 98, -47, 187, 0, 0, 79, 206, 0, + 0, 0, 0, 0, 0, 136, 0, 352, 123, 97, + 0, 0 ); protected $gotoDefault = array( - -32768, 462, 668, 2, 669, 740, 748, 601, 479, 515, - 853, 791, 792, 364, 410, 480, 363, 399, 392, 779, - 772, 774, 782, 166, 400, 785, 1, 787, 521, 823, - 1010, 351, 795, 352, 592, 797, 531, 799, 800, 132, - 481, 365, 366, 532, 374, 581, 814, 266, 371, 816, - 353, 817, 826, 354, 614, 597, 563, 610, 482, 442, - 575, 275, 542, 1073, 570, 858, 340, 866, 648, 874, - 877, 483, 564, 888, 448, 896, 1086, 382, 902, 908, - 913, 916, 418, 401, 588, 920, 921, 5, 925, 626, - 627, 940, 300, 948, 961, 416, 1029, 1031, 484, 485, - 525, 456, 507, 530, 486, 1052, 436, 403, 1055, 487, - 488, 426, 427, 1070, 346, 1154, 345, 444, 308, 1141, - 584, 1105, 452, 1193, 1150, 337, 489, 490, 359, 376, - 1188, 431, 1195, 1202, 335, 367, 571 + -32768, 472, 672, 2, 673, 744, 752, 607, 486, 638, + 487, 522, 1187, 797, 798, 799, 367, 413, 488, 366, + 400, 393, 786, 779, 781, 789, 168, 401, 792, 1, + 794, 528, 830, 1018, 354, 802, 355, 599, 804, 538, + 806, 807, 134, 368, 369, 539, 489, 376, 588, 821, + 268, 373, 823, 356, 824, 833, 357, 469, 464, 570, + 616, 434, 451, 582, 277, 548, 1081, 577, 865, 342, + 873, 669, 881, 884, 490, 571, 895, 456, 903, 1094, + 383, 909, 915, 920, 923, 414, 402, 595, 927, 928, + 7, 932, 630, 631, 947, 302, 955, 608, 969, 419, + 1037, 1039, 491, 492, 532, 463, 514, 537, 493, 1060, + 445, 404, 1063, 494, 495, 435, 436, 1078, 348, 1162, + 347, 453, 313, 1149, 591, 1113, 460, 1202, 1158, 341, + 496, 497, 363, 1181, 378, 1197, 440, 1204, 1211, 337, + 552, 578 ); protected $ruleToNonTerminal = array( @@ -792,53 +827,54 @@ class Php5 extends \PhpParser\ParserAbstract 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 8, 8, 9, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 14, 14, 15, 15, - 15, 15, 17, 17, 13, 13, 18, 18, 19, 19, - 20, 20, 21, 21, 16, 16, 22, 24, 24, 25, - 26, 26, 28, 27, 27, 27, 27, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 10, 10, 50, 50, - 52, 51, 51, 44, 44, 54, 54, 55, 55, 11, - 12, 12, 12, 58, 58, 58, 59, 59, 62, 62, - 60, 60, 64, 64, 37, 37, 46, 46, 49, 49, - 49, 48, 48, 65, 38, 38, 38, 38, 66, 66, - 67, 67, 68, 68, 35, 35, 31, 31, 69, 33, - 33, 70, 32, 32, 34, 34, 45, 45, 45, 56, - 56, 72, 72, 73, 73, 75, 75, 75, 74, 74, - 57, 57, 76, 76, 76, 77, 77, 78, 78, 78, - 41, 41, 79, 79, 79, 42, 42, 80, 80, 61, - 61, 81, 81, 81, 81, 86, 86, 87, 87, 88, - 88, 88, 88, 88, 89, 90, 90, 85, 85, 82, - 82, 84, 84, 92, 92, 91, 91, 91, 91, 91, - 91, 83, 83, 93, 93, 43, 43, 36, 36, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 30, 30, 40, 40, 98, 98, 99, - 99, 99, 99, 105, 94, 94, 101, 101, 107, 107, - 108, 109, 109, 109, 109, 109, 109, 63, 63, 53, - 53, 53, 95, 95, 113, 113, 110, 110, 114, 114, - 114, 114, 96, 96, 96, 100, 100, 100, 106, 106, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 23, 23, 23, 23, 23, 23, 121, - 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 121, 104, 104, 97, 97, 97, 97, 120, 120, - 123, 123, 122, 122, 124, 124, 47, 47, 47, 47, - 126, 126, 125, 125, 125, 125, 125, 127, 127, 112, - 112, 115, 115, 111, 111, 128, 128, 128, 128, 116, - 116, 116, 116, 103, 103, 117, 117, 117, 117, 71, - 129, 129, 130, 130, 130, 102, 102, 131, 131, 132, - 132, 132, 132, 118, 118, 118, 118, 134, 135, 133, - 133, 133, 133, 133, 133, 133, 136, 136, 136 + 7, 7, 8, 9, 10, 10, 11, 12, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 17, + 17, 18, 18, 18, 18, 20, 20, 16, 16, 21, + 21, 22, 22, 23, 23, 24, 24, 19, 19, 25, + 27, 27, 28, 29, 29, 31, 30, 30, 30, 30, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 13, + 13, 53, 53, 55, 54, 54, 47, 47, 57, 57, + 58, 58, 14, 15, 15, 15, 61, 61, 61, 62, + 62, 65, 65, 63, 63, 67, 67, 40, 40, 49, + 49, 52, 52, 52, 51, 51, 68, 41, 41, 41, + 41, 69, 69, 70, 70, 71, 71, 38, 38, 34, + 34, 72, 36, 36, 73, 35, 35, 37, 37, 48, + 48, 48, 59, 59, 75, 75, 76, 76, 78, 78, + 78, 77, 77, 60, 60, 79, 79, 79, 80, 80, + 81, 81, 81, 43, 43, 82, 82, 82, 44, 44, + 83, 83, 64, 64, 84, 84, 84, 84, 89, 89, + 90, 90, 91, 91, 91, 91, 91, 92, 93, 93, + 88, 88, 85, 85, 87, 87, 95, 95, 94, 94, + 94, 94, 94, 94, 86, 86, 97, 96, 96, 45, + 45, 39, 39, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 33, 33, 46, + 46, 102, 102, 103, 103, 103, 103, 109, 98, 98, + 105, 105, 111, 111, 112, 113, 113, 113, 113, 113, + 113, 66, 66, 56, 56, 56, 99, 99, 117, 117, + 114, 114, 118, 118, 118, 118, 100, 100, 100, 104, + 104, 104, 110, 110, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 26, 26, 26, + 26, 26, 26, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 125, 125, 125, 125, 108, 108, 101, 101, + 101, 101, 124, 124, 127, 127, 126, 126, 128, 128, + 50, 50, 50, 50, 130, 130, 129, 129, 129, 129, + 129, 131, 131, 116, 116, 119, 119, 115, 115, 133, + 132, 132, 132, 132, 120, 120, 120, 120, 107, 107, + 121, 121, 121, 121, 74, 134, 134, 135, 135, 135, + 106, 106, 136, 136, 137, 137, 137, 137, 122, 122, + 122, 122, 139, 140, 138, 138, 138, 138, 138, 138, + 138, 141, 141, 141 ); protected $ruleToLength = array( @@ -850,2292 +886,1750 @@ class Php5 extends \PhpParser\ParserAbstract 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 1, 1, 1, 1, 1, 3, - 5, 4, 3, 4, 2, 3, 1, 1, 7, 8, - 6, 7, 3, 1, 3, 1, 3, 1, 1, 3, - 1, 2, 1, 2, 3, 1, 3, 3, 1, 3, - 2, 0, 1, 1, 1, 1, 1, 3, 5, 8, - 3, 5, 9, 3, 2, 3, 2, 3, 2, 3, - 2, 3, 3, 3, 1, 2, 5, 7, 9, 5, - 6, 3, 3, 2, 2, 1, 1, 1, 0, 2, - 8, 0, 4, 1, 3, 0, 1, 0, 1, 10, - 7, 6, 5, 1, 2, 2, 0, 2, 0, 2, - 0, 2, 1, 3, 1, 4, 1, 4, 1, 1, - 4, 1, 3, 3, 3, 4, 4, 5, 0, 2, - 4, 3, 1, 1, 1, 4, 0, 2, 3, 0, - 2, 4, 0, 2, 0, 3, 1, 2, 1, 1, - 0, 1, 3, 4, 6, 1, 1, 1, 0, 1, - 0, 2, 2, 3, 3, 1, 3, 1, 2, 2, - 3, 1, 1, 2, 4, 3, 1, 1, 3, 2, - 0, 3, 3, 9, 3, 1, 3, 0, 2, 4, - 5, 4, 4, 4, 3, 1, 1, 1, 3, 1, - 1, 0, 1, 1, 2, 1, 1, 1, 1, 1, - 1, 1, 3, 1, 3, 3, 1, 0, 1, 1, - 3, 3, 4, 4, 1, 2, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, - 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, - 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 1, 3, 5, 4, 3, 4, 4, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 1, 1, 1, 3, 2, 1, - 2, 10, 11, 3, 3, 2, 4, 4, 3, 4, - 4, 4, 4, 7, 3, 2, 0, 4, 1, 3, - 2, 2, 4, 6, 2, 2, 4, 1, 1, 1, - 2, 3, 1, 1, 1, 1, 1, 1, 3, 3, - 4, 4, 0, 2, 1, 0, 1, 1, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 3, 2, 1, 3, 1, 4, 3, 1, 3, + 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, + 1, 1, 3, 5, 4, 3, 4, 2, 3, 1, + 1, 7, 8, 6, 7, 3, 1, 3, 1, 3, + 1, 1, 3, 1, 2, 1, 2, 3, 1, 3, + 3, 1, 3, 2, 0, 1, 1, 1, 1, 1, + 3, 5, 8, 3, 5, 9, 3, 2, 3, 2, + 3, 2, 3, 3, 3, 3, 1, 2, 2, 5, + 7, 9, 5, 6, 3, 3, 2, 2, 1, 1, + 1, 0, 2, 8, 0, 4, 1, 3, 0, 1, + 0, 1, 10, 7, 6, 5, 1, 2, 2, 0, + 2, 0, 2, 0, 2, 1, 3, 1, 4, 1, + 4, 1, 1, 4, 1, 3, 3, 3, 4, 4, + 5, 0, 2, 4, 3, 1, 1, 1, 4, 0, + 2, 3, 0, 2, 4, 0, 2, 0, 3, 1, + 2, 1, 1, 0, 1, 3, 4, 6, 1, 1, + 1, 0, 1, 0, 2, 2, 3, 3, 1, 3, + 1, 2, 2, 3, 1, 1, 2, 4, 3, 1, + 1, 3, 2, 0, 3, 3, 9, 3, 1, 3, + 0, 2, 4, 5, 4, 4, 4, 3, 1, 1, + 1, 3, 1, 1, 0, 1, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 3, 1, 1, 3, 3, + 1, 0, 1, 1, 3, 3, 4, 4, 1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, - 3, 3, 3, 3, 3, 3, 3, 3, 5, 4, - 4, 3, 1, 3, 1, 1, 3, 3, 0, 2, - 0, 1, 3, 1, 3, 1, 1, 1, 1, 1, - 6, 4, 3, 4, 2, 4, 4, 1, 3, 1, - 2, 1, 1, 4, 1, 3, 6, 4, 4, 4, - 4, 1, 4, 0, 1, 1, 3, 1, 1, 4, - 3, 1, 1, 1, 0, 0, 2, 3, 1, 3, - 1, 4, 2, 2, 2, 1, 2, 1, 1, 1, - 4, 3, 3, 3, 6, 3, 1, 1, 1 + 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 1, 3, 5, + 4, 3, 4, 4, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, + 1, 3, 2, 1, 2, 10, 11, 3, 3, 2, + 4, 4, 3, 4, 4, 4, 4, 7, 3, 2, + 0, 4, 1, 3, 2, 2, 4, 6, 2, 2, + 4, 1, 1, 1, 2, 3, 1, 1, 1, 1, + 1, 1, 3, 3, 4, 4, 0, 2, 1, 0, + 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 3, 2, 1, 3, 1, + 4, 3, 1, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 5, 4, 4, 3, 1, 3, 1, 1, + 3, 3, 0, 2, 0, 1, 3, 1, 3, 1, + 1, 1, 1, 1, 6, 4, 3, 4, 2, 4, + 4, 1, 3, 1, 2, 1, 1, 4, 1, 1, + 3, 6, 4, 4, 4, 4, 1, 4, 0, 1, + 1, 3, 1, 1, 4, 3, 1, 1, 1, 0, + 0, 2, 3, 1, 3, 1, 4, 2, 2, 2, + 1, 2, 1, 1, 1, 4, 3, 3, 3, 6, + 3, 1, 1, 1 ); - protected function reduceRule0() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule1() { - $this->semValue = $this->handleNamespaces($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule2() { - if (is_array($this->semStack[$this->stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); } else { $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; }; - } - - protected function reduceRule3() { - $this->semValue = array(); - } - - protected function reduceRule4() { - $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $nop = null; }; - if ($nop !== null) { $this->semStack[$this->stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule5() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule6() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule7() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule8() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule9() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule10() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule11() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule12() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule13() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule14() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule15() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule16() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule17() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule18() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule19() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule20() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule21() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule22() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule23() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule24() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule25() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule26() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule27() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule28() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule29() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule30() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule31() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule32() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule33() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule34() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule35() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule36() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule37() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule38() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule39() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule40() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule41() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule42() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule43() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule44() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule45() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule46() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule47() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule48() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule49() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule50() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule51() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule52() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule53() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule54() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule55() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule56() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule57() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule58() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule59() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule60() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule61() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule62() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule63() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule64() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule65() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule66() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule67() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule68() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule69() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule70() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule71() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule72() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule73() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule74() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule75() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule76() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule77() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule78() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule79() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule80() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule81() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule82() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule83() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule84() { - $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule85() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule86() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule87() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule88() { - $this->semValue = new Stmt\HaltCompiler($this->lexer->handleHaltCompiler(), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule89() { - $this->semValue = new Stmt\Namespace_($this->semStack[$this->stackPos-(3-2)], null, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); + protected function initReduceCallbacks() { + $this->reduceCallbacks = [ + 0 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 1 => function ($stackPos) { + $this->semValue = $this->handleNamespaces($this->semStack[$stackPos-(1-1)]); + }, + 2 => function ($stackPos) { + if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }; + }, + 3 => function ($stackPos) { + $this->semValue = array(); + }, + 4 => function ($stackPos) { + $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $nop = null; }; + if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 5 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 6 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 7 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 8 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 9 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 10 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 11 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 12 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 13 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 14 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 15 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 16 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 17 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 18 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 19 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 20 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 21 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 22 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 23 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 24 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 25 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 26 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 27 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 28 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 29 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 30 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 31 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 32 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 33 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 34 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 35 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 36 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 37 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 38 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 39 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 40 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 41 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 42 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 43 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 44 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 45 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 46 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 47 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 48 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 49 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 50 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 51 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 52 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 53 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 54 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 55 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 56 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 57 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 58 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 59 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 60 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 61 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 62 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 63 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 64 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 65 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 66 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 67 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 68 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 69 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 70 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 71 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 72 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 73 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 74 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 75 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 76 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 77 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 78 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 79 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 80 => function ($stackPos) { + $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 81 => function ($stackPos) { + $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 82 => function ($stackPos) { + $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 83 => function ($stackPos) { + $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 84 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 85 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 86 => function ($stackPos) { + $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 87 => function ($stackPos) { + $this->semValue = new Expr\Variable(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 88 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 89 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 90 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 91 => function ($stackPos) { + $this->semValue = new Stmt\HaltCompiler($this->lexer->handleHaltCompiler(), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 92 => function ($stackPos) { + $this->semValue = new Stmt\Namespace_($this->semStack[$stackPos-(3-2)], null, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_SEMICOLON); $this->checkNamespace($this->semValue); - } - - protected function reduceRule90() { - $this->semValue = new Stmt\Namespace_($this->semStack[$this->stackPos-(5-2)], $this->semStack[$this->stackPos-(5-4)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); + }, + 93 => function ($stackPos) { + $this->semValue = new Stmt\Namespace_($this->semStack[$stackPos-(5-2)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_BRACED); $this->checkNamespace($this->semValue); - } - - protected function reduceRule91() { - $this->semValue = new Stmt\Namespace_(null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); + }, + 94 => function ($stackPos) { + $this->semValue = new Stmt\Namespace_(null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_BRACED); $this->checkNamespace($this->semValue); - } + }, + 95 => function ($stackPos) { + $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(3-2)], Stmt\Use_::TYPE_NORMAL, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 96 => function ($stackPos) { + $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 97 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 98 => function ($stackPos) { + $this->semValue = new Stmt\Const_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 99 => function ($stackPos) { + $this->semValue = Stmt\Use_::TYPE_FUNCTION; + }, + 100 => function ($stackPos) { + $this->semValue = Stmt\Use_::TYPE_CONSTANT; + }, + 101 => function ($stackPos) { + $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$stackPos-(7-3)], $this->startAttributeStack[$stackPos-(7-3)] + $this->endAttributeStack[$stackPos-(7-3)]), $this->semStack[$stackPos-(7-6)], $this->semStack[$stackPos-(7-2)], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + }, + 102 => function ($stackPos) { + $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$stackPos-(8-4)], $this->startAttributeStack[$stackPos-(8-4)] + $this->endAttributeStack[$stackPos-(8-4)]), $this->semStack[$stackPos-(8-7)], $this->semStack[$stackPos-(8-2)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes); + }, + 103 => function ($stackPos) { + $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$stackPos-(6-2)], $this->startAttributeStack[$stackPos-(6-2)] + $this->endAttributeStack[$stackPos-(6-2)]), $this->semStack[$stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + }, + 104 => function ($stackPos) { + $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$stackPos-(7-3)], $this->startAttributeStack[$stackPos-(7-3)] + $this->endAttributeStack[$stackPos-(7-3)]), $this->semStack[$stackPos-(7-6)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + }, + 105 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 106 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 107 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 108 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 109 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 110 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 111 => function ($stackPos) { + $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(1-1)); + }, + 112 => function ($stackPos) { + $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(3-3)); + }, + 113 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 114 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 115 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; $this->semValue->type = Stmt\Use_::TYPE_NORMAL; + }, + 116 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; $this->semValue->type = $this->semStack[$stackPos-(2-1)]; + }, + 117 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 118 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 119 => function ($stackPos) { + $this->semValue = new Node\Const_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 120 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 121 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 122 => function ($stackPos) { + $this->semValue = new Node\Const_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 123 => function ($stackPos) { + if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }; + }, + 124 => function ($stackPos) { + $this->semValue = array(); + }, + 125 => function ($stackPos) { + $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $nop = null; }; + if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 126 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 127 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 128 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 129 => function ($stackPos) { + throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 130 => function ($stackPos) { - protected function reduceRule92() { - $this->semValue = new Stmt\Use_($this->semStack[$this->stackPos-(3-2)], Stmt\Use_::TYPE_NORMAL, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule93() { - $this->semValue = new Stmt\Use_($this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-2)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule94() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule95() { - $this->semValue = new Stmt\Const_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule96() { - $this->semValue = Stmt\Use_::TYPE_FUNCTION; - } - - protected function reduceRule97() { - $this->semValue = Stmt\Use_::TYPE_CONSTANT; - } - - protected function reduceRule98() { - $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(7-3)], $this->startAttributeStack[$this->stackPos-(7-3)] + $this->endAttributeStack[$this->stackPos-(7-3)]), $this->semStack[$this->stackPos-(7-6)], $this->semStack[$this->stackPos-(7-2)], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - } - - protected function reduceRule99() { - $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(8-4)], $this->startAttributeStack[$this->stackPos-(8-4)] + $this->endAttributeStack[$this->stackPos-(8-4)]), $this->semStack[$this->stackPos-(8-7)], $this->semStack[$this->stackPos-(8-2)], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes); - } - - protected function reduceRule100() { - $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-2)] + $this->endAttributeStack[$this->stackPos-(6-2)]), $this->semStack[$this->stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - } - - protected function reduceRule101() { - $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(7-3)], $this->startAttributeStack[$this->stackPos-(7-3)] + $this->endAttributeStack[$this->stackPos-(7-3)]), $this->semStack[$this->stackPos-(7-6)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - } - - protected function reduceRule102() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule103() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule104() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule105() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule106() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule107() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule108() { - $this->semValue = new Stmt\UseUse($this->semStack[$this->stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $this->stackPos-(1-1)); - } - - protected function reduceRule109() { - $this->semValue = new Stmt\UseUse($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $this->stackPos-(3-3)); - } - - protected function reduceRule110() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule111() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule112() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; $this->semValue->type = Stmt\Use_::TYPE_NORMAL; - } - - protected function reduceRule113() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; $this->semValue->type = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule114() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule115() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule116() { - $this->semValue = new Node\Const_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule117() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule118() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule119() { - $this->semValue = new Node\Const_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule120() { - if (is_array($this->semStack[$this->stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); } else { $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; }; - } - - protected function reduceRule121() { - $this->semValue = array(); - } - - protected function reduceRule122() { - $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $nop = null; }; - if ($nop !== null) { $this->semStack[$this->stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule123() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule124() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule125() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule126() { - throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule127() { - - if ($this->semStack[$this->stackPos-(3-2)]) { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; $attrs = $this->startAttributeStack[$this->stackPos-(3-1)]; $stmts = $this->semValue; if (!empty($attrs['comments'])) {$stmts[0]->setAttribute('comments', array_merge($attrs['comments'], $stmts[0]->getAttribute('comments', []))); }; + if ($this->semStack[$stackPos-(3-2)]) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; $attrs = $this->startAttributeStack[$stackPos-(3-1)]; $stmts = $this->semValue; if (!empty($attrs['comments'])) {$stmts[0]->setAttribute('comments', array_merge($attrs['comments'], $stmts[0]->getAttribute('comments', []))); }; } else { - $startAttributes = $this->startAttributeStack[$this->stackPos-(3-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $this->semValue = null; }; + $startAttributes = $this->startAttributeStack[$stackPos-(3-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; }; if (null === $this->semValue) { $this->semValue = array(); } } - } - - protected function reduceRule128() { - $this->semValue = new Stmt\If_($this->semStack[$this->stackPos-(5-2)], ['stmts' => is_array($this->semStack[$this->stackPos-(5-3)]) ? $this->semStack[$this->stackPos-(5-3)] : array($this->semStack[$this->stackPos-(5-3)]), 'elseifs' => $this->semStack[$this->stackPos-(5-4)], 'else' => $this->semStack[$this->stackPos-(5-5)]], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule129() { - $this->semValue = new Stmt\If_($this->semStack[$this->stackPos-(8-2)], ['stmts' => $this->semStack[$this->stackPos-(8-4)], 'elseifs' => $this->semStack[$this->stackPos-(8-5)], 'else' => $this->semStack[$this->stackPos-(8-6)]], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes); - } - - protected function reduceRule130() { - $this->semValue = new Stmt\While_($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule131() { - $this->semValue = new Stmt\Do_($this->semStack[$this->stackPos-(5-4)], is_array($this->semStack[$this->stackPos-(5-2)]) ? $this->semStack[$this->stackPos-(5-2)] : array($this->semStack[$this->stackPos-(5-2)]), $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule132() { - $this->semValue = new Stmt\For_(['init' => $this->semStack[$this->stackPos-(9-3)], 'cond' => $this->semStack[$this->stackPos-(9-5)], 'loop' => $this->semStack[$this->stackPos-(9-7)], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes); - } - - protected function reduceRule133() { - $this->semValue = new Stmt\Switch_($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule134() { - $this->semValue = new Stmt\Break_(null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule135() { - $this->semValue = new Stmt\Break_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule136() { - $this->semValue = new Stmt\Continue_(null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule137() { - $this->semValue = new Stmt\Continue_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule138() { - $this->semValue = new Stmt\Return_(null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule139() { - $this->semValue = new Stmt\Return_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule140() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule141() { - $this->semValue = new Stmt\Global_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule142() { - $this->semValue = new Stmt\Static_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule143() { - $this->semValue = new Stmt\Echo_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule144() { - $this->semValue = new Stmt\InlineHTML($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule145() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule146() { - $this->semValue = new Stmt\Unset_($this->semStack[$this->stackPos-(5-3)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule147() { - $this->semValue = new Stmt\Foreach_($this->semStack[$this->stackPos-(7-3)], $this->semStack[$this->stackPos-(7-5)][0], ['keyVar' => null, 'byRef' => $this->semStack[$this->stackPos-(7-5)][1], 'stmts' => $this->semStack[$this->stackPos-(7-7)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - } - - protected function reduceRule148() { - $this->semValue = new Stmt\Foreach_($this->semStack[$this->stackPos-(9-3)], $this->semStack[$this->stackPos-(9-7)][0], ['keyVar' => $this->semStack[$this->stackPos-(9-5)], 'byRef' => $this->semStack[$this->stackPos-(9-7)][1], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes); - } - - protected function reduceRule149() { - $this->semValue = new Stmt\Declare_($this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule150() { - $this->semValue = new Stmt\TryCatch($this->semStack[$this->stackPos-(6-3)], $this->semStack[$this->stackPos-(6-5)], $this->semStack[$this->stackPos-(6-6)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); $this->checkTryCatch($this->semValue); - } - - protected function reduceRule151() { - $this->semValue = new Stmt\Throw_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule152() { - $this->semValue = new Stmt\Goto_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule153() { - $this->semValue = new Stmt\Label($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule154() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule155() { - $this->semValue = array(); /* means: no statement */ - } - - protected function reduceRule156() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule157() { - $startAttributes = $this->startAttributeStack[$this->stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $this->semValue = null; }; + }, + 131 => function ($stackPos) { + $this->semValue = new Stmt\If_($this->semStack[$stackPos-(5-2)], ['stmts' => is_array($this->semStack[$stackPos-(5-3)]) ? $this->semStack[$stackPos-(5-3)] : array($this->semStack[$stackPos-(5-3)]), 'elseifs' => $this->semStack[$stackPos-(5-4)], 'else' => $this->semStack[$stackPos-(5-5)]], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 132 => function ($stackPos) { + $this->semValue = new Stmt\If_($this->semStack[$stackPos-(8-2)], ['stmts' => $this->semStack[$stackPos-(8-4)], 'elseifs' => $this->semStack[$stackPos-(8-5)], 'else' => $this->semStack[$stackPos-(8-6)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes); + }, + 133 => function ($stackPos) { + $this->semValue = new Stmt\While_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 134 => function ($stackPos) { + $this->semValue = new Stmt\Do_($this->semStack[$stackPos-(5-4)], is_array($this->semStack[$stackPos-(5-2)]) ? $this->semStack[$stackPos-(5-2)] : array($this->semStack[$stackPos-(5-2)]), $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 135 => function ($stackPos) { + $this->semValue = new Stmt\For_(['init' => $this->semStack[$stackPos-(9-3)], 'cond' => $this->semStack[$stackPos-(9-5)], 'loop' => $this->semStack[$stackPos-(9-7)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); + }, + 136 => function ($stackPos) { + $this->semValue = new Stmt\Switch_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 137 => function ($stackPos) { + $this->semValue = new Stmt\Break_(null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 138 => function ($stackPos) { + $this->semValue = new Stmt\Break_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 139 => function ($stackPos) { + $this->semValue = new Stmt\Continue_(null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 140 => function ($stackPos) { + $this->semValue = new Stmt\Continue_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 141 => function ($stackPos) { + $this->semValue = new Stmt\Return_(null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 142 => function ($stackPos) { + $this->semValue = new Stmt\Return_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 143 => function ($stackPos) { + $this->semValue = new Stmt\Global_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 144 => function ($stackPos) { + $this->semValue = new Stmt\Static_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 145 => function ($stackPos) { + $this->semValue = new Stmt\Echo_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 146 => function ($stackPos) { + $this->semValue = new Stmt\InlineHTML($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 147 => function ($stackPos) { + $this->semValue = new Stmt\Expression($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 148 => function ($stackPos) { + $this->semValue = new Stmt\Expression($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 149 => function ($stackPos) { + $this->semValue = new Stmt\Unset_($this->semStack[$stackPos-(5-3)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 150 => function ($stackPos) { + $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-5)][0], ['keyVar' => null, 'byRef' => $this->semStack[$stackPos-(7-5)][1], 'stmts' => $this->semStack[$stackPos-(7-7)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + }, + 151 => function ($stackPos) { + $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(9-3)], $this->semStack[$stackPos-(9-7)][0], ['keyVar' => $this->semStack[$stackPos-(9-5)], 'byRef' => $this->semStack[$stackPos-(9-7)][1], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); + }, + 152 => function ($stackPos) { + $this->semValue = new Stmt\Declare_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 153 => function ($stackPos) { + $this->semValue = new Stmt\TryCatch($this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-5)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->checkTryCatch($this->semValue); + }, + 154 => function ($stackPos) { + $this->semValue = new Stmt\Throw_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 155 => function ($stackPos) { + $this->semValue = new Stmt\Goto_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 156 => function ($stackPos) { + $this->semValue = new Stmt\Label($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 157 => function ($stackPos) { + $this->semValue = new Stmt\Expression($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 158 => function ($stackPos) { + $this->semValue = array(); /* means: no statement */ + }, + 159 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 160 => function ($stackPos) { + $startAttributes = $this->startAttributeStack[$stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; }; if ($this->semValue === null) $this->semValue = array(); /* means: no statement */ - } - - protected function reduceRule158() { - $this->semValue = array(); - } - - protected function reduceRule159() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule160() { - $this->semValue = new Stmt\Catch_(array($this->semStack[$this->stackPos-(8-3)]), substr($this->semStack[$this->stackPos-(8-4)], 1), $this->semStack[$this->stackPos-(8-7)], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes); - } - - protected function reduceRule161() { - $this->semValue = null; - } - - protected function reduceRule162() { - $this->semValue = new Stmt\Finally_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule163() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule164() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule165() { - $this->semValue = false; - } - - protected function reduceRule166() { - $this->semValue = true; - } - - protected function reduceRule167() { - $this->semValue = false; - } - - protected function reduceRule168() { - $this->semValue = true; - } - - protected function reduceRule169() { - $this->semValue = new Stmt\Function_($this->semStack[$this->stackPos-(10-3)], ['byRef' => $this->semStack[$this->stackPos-(10-2)], 'params' => $this->semStack[$this->stackPos-(10-5)], 'returnType' => $this->semStack[$this->stackPos-(10-7)], 'stmts' => $this->semStack[$this->stackPos-(10-9)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes); - } - - protected function reduceRule170() { - $this->semValue = new Stmt\Class_($this->semStack[$this->stackPos-(7-2)], ['type' => $this->semStack[$this->stackPos-(7-1)], 'extends' => $this->semStack[$this->stackPos-(7-3)], 'implements' => $this->semStack[$this->stackPos-(7-4)], 'stmts' => $this->semStack[$this->stackPos-(7-6)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - $this->checkClass($this->semValue, $this->stackPos-(7-2)); - } - - protected function reduceRule171() { - $this->semValue = new Stmt\Interface_($this->semStack[$this->stackPos-(6-2)], ['extends' => $this->semStack[$this->stackPos-(6-3)], 'stmts' => $this->semStack[$this->stackPos-(6-5)]], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - $this->checkInterface($this->semValue, $this->stackPos-(6-2)); - } - - protected function reduceRule172() { - $this->semValue = new Stmt\Trait_($this->semStack[$this->stackPos-(5-2)], ['stmts' => $this->semStack[$this->stackPos-(5-4)]], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule173() { - $this->semValue = 0; - } - - protected function reduceRule174() { - $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; - } - - protected function reduceRule175() { - $this->semValue = Stmt\Class_::MODIFIER_FINAL; - } - - protected function reduceRule176() { - $this->semValue = null; - } - - protected function reduceRule177() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule178() { - $this->semValue = array(); - } - - protected function reduceRule179() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule180() { - $this->semValue = array(); - } - - protected function reduceRule181() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule182() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule183() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule184() { - $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule185() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule186() { - $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule187() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule188() { - $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule189() { - $this->semValue = null; - } - - protected function reduceRule190() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule191() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule192() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule193() { - $this->semValue = new Stmt\DeclareDeclare($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule194() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule195() { - $this->semValue = $this->semStack[$this->stackPos-(4-3)]; - } - - protected function reduceRule196() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule197() { - $this->semValue = $this->semStack[$this->stackPos-(5-3)]; - } - - protected function reduceRule198() { - $this->semValue = array(); - } - - protected function reduceRule199() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule200() { - $this->semValue = new Stmt\Case_($this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule201() { - $this->semValue = new Stmt\Case_(null, $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule202() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule203() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule204() { - $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule205() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule206() { - $this->semValue = array(); - } - - protected function reduceRule207() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule208() { - $this->semValue = new Stmt\ElseIf_($this->semStack[$this->stackPos-(3-2)], is_array($this->semStack[$this->stackPos-(3-3)]) ? $this->semStack[$this->stackPos-(3-3)] : array($this->semStack[$this->stackPos-(3-3)]), $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule209() { - $this->semValue = array(); - } - - protected function reduceRule210() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule211() { - $this->semValue = new Stmt\ElseIf_($this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule212() { - $this->semValue = null; - } - - protected function reduceRule213() { - $this->semValue = new Stmt\Else_(is_array($this->semStack[$this->stackPos-(2-2)]) ? $this->semStack[$this->stackPos-(2-2)] : array($this->semStack[$this->stackPos-(2-2)]), $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule214() { - $this->semValue = null; - } - - protected function reduceRule215() { - $this->semValue = new Stmt\Else_($this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule216() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false); - } - - protected function reduceRule217() { - $this->semValue = array($this->semStack[$this->stackPos-(2-2)], true); - } - - protected function reduceRule218() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false); - } - - protected function reduceRule219() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule220() { - $this->semValue = array(); - } - - protected function reduceRule221() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule222() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule223() { - $this->semValue = new Node\Param(substr($this->semStack[$this->stackPos-(4-4)], 1), null, $this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); $this->checkParam($this->semValue); - } - - protected function reduceRule224() { - $this->semValue = new Node\Param(substr($this->semStack[$this->stackPos-(6-4)], 1), $this->semStack[$this->stackPos-(6-6)], $this->semStack[$this->stackPos-(6-1)], $this->semStack[$this->stackPos-(6-2)], $this->semStack[$this->stackPos-(6-3)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); $this->checkParam($this->semValue); - } - - protected function reduceRule225() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule226() { - $this->semValue = 'array'; - } - - protected function reduceRule227() { - $this->semValue = 'callable'; - } - - protected function reduceRule228() { - $this->semValue = null; - } - - protected function reduceRule229() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule230() { - $this->semValue = null; - } - - protected function reduceRule231() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule232() { - $this->semValue = array(); - } - - protected function reduceRule233() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule234() { - $this->semValue = array(new Node\Arg($this->semStack[$this->stackPos-(3-2)], false, false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes)); - } - - protected function reduceRule235() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule236() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule237() { - $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(1-1)], false, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule238() { - $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(2-2)], true, false, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule239() { - $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(2-2)], false, true, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule240() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule241() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule242() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule243() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule244() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule245() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule246() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule247() { - $this->semValue = new Stmt\StaticVar(substr($this->semStack[$this->stackPos-(1-1)], 1), null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule248() { - $this->semValue = new Stmt\StaticVar(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule249() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule250() { - $this->semValue = array(); - } - - protected function reduceRule251() { - $this->semValue = new Stmt\Property($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $this->stackPos-(3-1)); - } - - protected function reduceRule252() { - $this->semValue = new Stmt\ClassConst($this->semStack[$this->stackPos-(3-2)], 0, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule253() { - $this->semValue = new Stmt\ClassMethod($this->semStack[$this->stackPos-(9-4)], ['type' => $this->semStack[$this->stackPos-(9-1)], 'byRef' => $this->semStack[$this->stackPos-(9-3)], 'params' => $this->semStack[$this->stackPos-(9-6)], 'returnType' => $this->semStack[$this->stackPos-(9-8)], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes); - $this->checkClassMethod($this->semValue, $this->stackPos-(9-1)); - } - - protected function reduceRule254() { - $this->semValue = new Stmt\TraitUse($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule255() { - $this->semValue = array(); - } - - protected function reduceRule256() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule257() { - $this->semValue = array(); - } - - protected function reduceRule258() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule259() { - $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule260() { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(5-1)][0], $this->semStack[$this->stackPos-(5-1)][1], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-4)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule261() { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], $this->semStack[$this->stackPos-(4-3)], null, $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule262() { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule263() { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule264() { - $this->semValue = array($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)]); - } - - protected function reduceRule265() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule266() { - $this->semValue = array(null, $this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule267() { - $this->semValue = null; - } - - protected function reduceRule268() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule269() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule270() { - $this->semValue = 0; - } - - protected function reduceRule271() { - $this->semValue = 0; - } - - protected function reduceRule272() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule273() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule274() { - $this->checkModifier($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->stackPos-(2-2)); $this->semValue = $this->semStack[$this->stackPos-(2-1)] | $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule275() { - $this->semValue = Stmt\Class_::MODIFIER_PUBLIC; - } - - protected function reduceRule276() { - $this->semValue = Stmt\Class_::MODIFIER_PROTECTED; - } - - protected function reduceRule277() { - $this->semValue = Stmt\Class_::MODIFIER_PRIVATE; - } - - protected function reduceRule278() { - $this->semValue = Stmt\Class_::MODIFIER_STATIC; - } - - protected function reduceRule279() { - $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; - } - - protected function reduceRule280() { - $this->semValue = Stmt\Class_::MODIFIER_FINAL; - } - - protected function reduceRule281() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule282() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule283() { - $this->semValue = new Stmt\PropertyProperty(substr($this->semStack[$this->stackPos-(1-1)], 1), null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule284() { - $this->semValue = new Stmt\PropertyProperty(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule285() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule286() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule287() { - $this->semValue = array(); - } - - protected function reduceRule288() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule289() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule290() { - $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule291() { - $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule292() { - $this->semValue = new Expr\AssignRef($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule293() { - $this->semValue = new Expr\AssignRef($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule294() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule295() { - $this->semValue = new Expr\Clone_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule296() { - $this->semValue = new Expr\AssignOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule297() { - $this->semValue = new Expr\AssignOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule298() { - $this->semValue = new Expr\AssignOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule299() { - $this->semValue = new Expr\AssignOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule300() { - $this->semValue = new Expr\AssignOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule301() { - $this->semValue = new Expr\AssignOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule302() { - $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule303() { - $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule304() { - $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule305() { - $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule306() { - $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule307() { - $this->semValue = new Expr\AssignOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule308() { - $this->semValue = new Expr\PostInc($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule309() { - $this->semValue = new Expr\PreInc($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule310() { - $this->semValue = new Expr\PostDec($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule311() { - $this->semValue = new Expr\PreDec($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule312() { - $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule313() { - $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule314() { - $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule315() { - $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule316() { - $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule317() { - $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule318() { - $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule319() { - $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule320() { - $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule321() { - $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule322() { - $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule323() { - $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule324() { - $this->semValue = new Expr\BinaryOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule325() { - $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule326() { - $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule327() { - $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule328() { - $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule329() { - $this->semValue = new Expr\UnaryPlus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule330() { - $this->semValue = new Expr\UnaryMinus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule331() { - $this->semValue = new Expr\BooleanNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule332() { - $this->semValue = new Expr\BitwiseNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule333() { - $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule334() { - $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule335() { - $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule336() { - $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule337() { - $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule338() { - $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule339() { - $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule340() { - $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule341() { - $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule342() { - $this->semValue = new Expr\Instanceof_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule343() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule344() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule345() { - $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(5-1)], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule346() { - $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(4-1)], null, $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule347() { - $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule348() { - $this->semValue = new Expr\Isset_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule349() { - $this->semValue = new Expr\Empty_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule350() { - $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule351() { - $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule352() { - $this->semValue = new Expr\Eval_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule353() { - $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule354() { - $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule355() { - $this->semValue = new Expr\Cast\Int_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule356() { - $this->semValue = new Expr\Cast\Double($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule357() { - $this->semValue = new Expr\Cast\String_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule358() { - $this->semValue = new Expr\Cast\Array_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule359() { - $this->semValue = new Expr\Cast\Object_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule360() { - $this->semValue = new Expr\Cast\Bool_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule361() { - $this->semValue = new Expr\Cast\Unset_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule362() { - $attrs = $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes; - $attrs['kind'] = strtolower($this->semStack[$this->stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE; - $this->semValue = new Expr\Exit_($this->semStack[$this->stackPos-(2-2)], $attrs); - } - - protected function reduceRule363() { - $this->semValue = new Expr\ErrorSuppress($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule364() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule365() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule366() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule367() { - $this->semValue = new Expr\ShellExec($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule368() { - $this->semValue = new Expr\Print_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule369() { - $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule370() { - $this->semValue = new Expr\YieldFrom($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule371() { - $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$this->stackPos-(10-2)], 'params' => $this->semStack[$this->stackPos-(10-4)], 'uses' => $this->semStack[$this->stackPos-(10-6)], 'returnType' => $this->semStack[$this->stackPos-(10-7)], 'stmts' => $this->semStack[$this->stackPos-(10-9)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes); - } - - protected function reduceRule372() { - $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$this->stackPos-(11-3)], 'params' => $this->semStack[$this->stackPos-(11-5)], 'uses' => $this->semStack[$this->stackPos-(11-7)], 'returnType' => $this->semStack[$this->stackPos-(11-8)], 'stmts' => $this->semStack[$this->stackPos-(11-10)]], $this->startAttributeStack[$this->stackPos-(11-1)] + $this->endAttributes); - } - - protected function reduceRule373() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule374() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule375() { - $this->semValue = new Expr\Yield_($this->semStack[$this->stackPos-(2-2)], null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule376() { - $this->semValue = new Expr\Yield_($this->semStack[$this->stackPos-(4-4)], $this->semStack[$this->stackPos-(4-2)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule377() { - $attrs = $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG; - $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(4-3)], $attrs); - } - - protected function reduceRule378() { - $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT; - $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(3-2)], $attrs); - } - - protected function reduceRule379() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule380() { - $attrs = $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$this->stackPos-(4-1)][0] === "'" || ($this->semStack[$this->stackPos-(4-1)][1] === "'" && ($this->semStack[$this->stackPos-(4-1)][0] === 'b' || $this->semStack[$this->stackPos-(4-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED); - $this->semValue = new Expr\ArrayDimFetch(new Scalar\String_(Scalar\String_::parse($this->semStack[$this->stackPos-(4-1)]), $attrs), $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule381() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule382() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule383() { - $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$this->stackPos-(7-3)], 'implements' => $this->semStack[$this->stackPos-(7-4)], 'stmts' => $this->semStack[$this->stackPos-(7-6)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(7-2)]); + }, + 161 => function ($stackPos) { + $this->semValue = array(); + }, + 162 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 163 => function ($stackPos) { + $this->semValue = new Stmt\Catch_(array($this->semStack[$stackPos-(8-3)]), $this->semStack[$stackPos-(8-4)], $this->semStack[$stackPos-(8-7)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes); + }, + 164 => function ($stackPos) { + $this->semValue = null; + }, + 165 => function ($stackPos) { + $this->semValue = new Stmt\Finally_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 166 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 167 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 168 => function ($stackPos) { + $this->semValue = false; + }, + 169 => function ($stackPos) { + $this->semValue = true; + }, + 170 => function ($stackPos) { + $this->semValue = false; + }, + 171 => function ($stackPos) { + $this->semValue = true; + }, + 172 => function ($stackPos) { + $this->semValue = new Stmt\Function_($this->semStack[$stackPos-(10-3)], ['byRef' => $this->semStack[$stackPos-(10-2)], 'params' => $this->semStack[$stackPos-(10-5)], 'returnType' => $this->semStack[$stackPos-(10-7)], 'stmts' => $this->semStack[$stackPos-(10-9)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes); + }, + 173 => function ($stackPos) { + $this->semValue = new Stmt\Class_($this->semStack[$stackPos-(7-2)], ['type' => $this->semStack[$stackPos-(7-1)], 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + $this->checkClass($this->semValue, $stackPos-(7-2)); + }, + 174 => function ($stackPos) { + $this->semValue = new Stmt\Interface_($this->semStack[$stackPos-(6-2)], ['extends' => $this->semStack[$stackPos-(6-3)], 'stmts' => $this->semStack[$stackPos-(6-5)]], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + $this->checkInterface($this->semValue, $stackPos-(6-2)); + }, + 175 => function ($stackPos) { + $this->semValue = new Stmt\Trait_($this->semStack[$stackPos-(5-2)], ['stmts' => $this->semStack[$stackPos-(5-4)]], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 176 => function ($stackPos) { + $this->semValue = 0; + }, + 177 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; + }, + 178 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_FINAL; + }, + 179 => function ($stackPos) { + $this->semValue = null; + }, + 180 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 181 => function ($stackPos) { + $this->semValue = array(); + }, + 182 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 183 => function ($stackPos) { + $this->semValue = array(); + }, + 184 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 185 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 186 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 187 => function ($stackPos) { + $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]); + }, + 188 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 189 => function ($stackPos) { + $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]); + }, + 190 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 191 => function ($stackPos) { + $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]); + }, + 192 => function ($stackPos) { + $this->semValue = null; + }, + 193 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 194 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 195 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 196 => function ($stackPos) { + $this->semValue = new Stmt\DeclareDeclare($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 197 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 198 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-3)]; + }, + 199 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 200 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(5-3)]; + }, + 201 => function ($stackPos) { + $this->semValue = array(); + }, + 202 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 203 => function ($stackPos) { + $this->semValue = new Stmt\Case_($this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 204 => function ($stackPos) { + $this->semValue = new Stmt\Case_(null, $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 205 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 206 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 207 => function ($stackPos) { + $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]); + }, + 208 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 209 => function ($stackPos) { + $this->semValue = array(); + }, + 210 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 211 => function ($stackPos) { + $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(3-2)], is_array($this->semStack[$stackPos-(3-3)]) ? $this->semStack[$stackPos-(3-3)] : array($this->semStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 212 => function ($stackPos) { + $this->semValue = array(); + }, + 213 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 214 => function ($stackPos) { + $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 215 => function ($stackPos) { + $this->semValue = null; + }, + 216 => function ($stackPos) { + $this->semValue = new Stmt\Else_(is_array($this->semStack[$stackPos-(2-2)]) ? $this->semStack[$stackPos-(2-2)] : array($this->semStack[$stackPos-(2-2)]), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 217 => function ($stackPos) { + $this->semValue = null; + }, + 218 => function ($stackPos) { + $this->semValue = new Stmt\Else_($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 219 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)], false); + }, + 220 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(2-2)], true); + }, + 221 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)], false); + }, + 222 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 223 => function ($stackPos) { + $this->semValue = array(); + }, + 224 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 225 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 226 => function ($stackPos) { + $this->semValue = new Node\Param($this->semStack[$stackPos-(4-4)], null, $this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); $this->checkParam($this->semValue); + }, + 227 => function ($stackPos) { + $this->semValue = new Node\Param($this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-6)], $this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-3)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->checkParam($this->semValue); + }, + 228 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 229 => function ($stackPos) { + $this->semValue = new Node\Identifier('array', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 230 => function ($stackPos) { + $this->semValue = new Node\Identifier('callable', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 231 => function ($stackPos) { + $this->semValue = null; + }, + 232 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 233 => function ($stackPos) { + $this->semValue = null; + }, + 234 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 235 => function ($stackPos) { + $this->semValue = array(); + }, + 236 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 237 => function ($stackPos) { + $this->semValue = array(new Node\Arg($this->semStack[$stackPos-(3-2)], false, false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes)); + }, + 238 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 239 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 240 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(1-1)], false, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 241 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], true, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 242 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], false, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 243 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 244 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 245 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 246 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 247 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 248 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 249 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 250 => function ($stackPos) { + $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 251 => function ($stackPos) { + $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 252 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 253 => function ($stackPos) { + $this->semValue = array(); + }, + 254 => function ($stackPos) { + $this->semValue = new Stmt\Property($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $stackPos-(3-1)); + }, + 255 => function ($stackPos) { + $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(3-2)], 0, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 256 => function ($stackPos) { + $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(9-4)], ['type' => $this->semStack[$stackPos-(9-1)], 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); + $this->checkClassMethod($this->semValue, $stackPos-(9-1)); + }, + 257 => function ($stackPos) { + $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 258 => function ($stackPos) { + $this->semValue = array(); + }, + 259 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 260 => function ($stackPos) { + $this->semValue = array(); + }, + 261 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 262 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 263 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 264 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 265 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 266 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 267 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]); + }, + 268 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 269 => function ($stackPos) { + $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]); + }, + 270 => function ($stackPos) { + $this->semValue = null; + }, + 271 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 272 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 273 => function ($stackPos) { + $this->semValue = 0; + }, + 274 => function ($stackPos) { + $this->semValue = 0; + }, + 275 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 276 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 277 => function ($stackPos) { + $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)]; + }, + 278 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_PUBLIC; + }, + 279 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_PROTECTED; + }, + 280 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_PRIVATE; + }, + 281 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_STATIC; + }, + 282 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; + }, + 283 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_FINAL; + }, + 284 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 285 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 286 => function ($stackPos) { + $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 287 => function ($stackPos) { + $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 288 => function ($stackPos) { + $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 289 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 290 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 291 => function ($stackPos) { + $this->semValue = array(); + }, + 292 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 293 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 294 => function ($stackPos) { + $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 295 => function ($stackPos) { + $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 296 => function ($stackPos) { + $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 297 => function ($stackPos) { + $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 298 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 299 => function ($stackPos) { + $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 300 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 301 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 302 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 303 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 304 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 305 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 306 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 307 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 308 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 309 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 310 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 311 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 312 => function ($stackPos) { + $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 313 => function ($stackPos) { + $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 314 => function ($stackPos) { + $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 315 => function ($stackPos) { + $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 316 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 317 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 318 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 319 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 320 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 321 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 322 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 323 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 324 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 325 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 326 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 327 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 328 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 329 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 330 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 331 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 332 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 333 => function ($stackPos) { + $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 334 => function ($stackPos) { + $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 335 => function ($stackPos) { + $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 336 => function ($stackPos) { + $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 337 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 338 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 339 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 340 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 341 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 342 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 343 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 344 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 345 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 346 => function ($stackPos) { + $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 347 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 348 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 349 => function ($stackPos) { + $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 350 => function ($stackPos) { + $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 351 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 352 => function ($stackPos) { + $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 353 => function ($stackPos) { + $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 354 => function ($stackPos) { + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 355 => function ($stackPos) { + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 356 => function ($stackPos) { + $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 357 => function ($stackPos) { + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 358 => function ($stackPos) { + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 359 => function ($stackPos) { + $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 360 => function ($stackPos) { + $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 361 => function ($stackPos) { + $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 362 => function ($stackPos) { + $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 363 => function ($stackPos) { + $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 364 => function ($stackPos) { + $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 365 => function ($stackPos) { + $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 366 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes; + $attrs['kind'] = strtolower($this->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE; + $this->semValue = new Expr\Exit_($this->semStack[$stackPos-(2-2)], $attrs); + }, + 367 => function ($stackPos) { + $this->semValue = new Expr\ErrorSuppress($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 368 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 369 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 370 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 371 => function ($stackPos) { + $this->semValue = new Expr\ShellExec($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 372 => function ($stackPos) { + $this->semValue = new Expr\Print_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 373 => function ($stackPos) { + $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 374 => function ($stackPos) { + $this->semValue = new Expr\YieldFrom($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 375 => function ($stackPos) { + $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(10-2)], 'params' => $this->semStack[$stackPos-(10-4)], 'uses' => $this->semStack[$stackPos-(10-6)], 'returnType' => $this->semStack[$stackPos-(10-7)], 'stmts' => $this->semStack[$stackPos-(10-9)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes); + }, + 376 => function ($stackPos) { + $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(11-3)], 'params' => $this->semStack[$stackPos-(11-5)], 'uses' => $this->semStack[$stackPos-(11-7)], 'returnType' => $this->semStack[$stackPos-(11-8)], 'stmts' => $this->semStack[$stackPos-(11-10)]], $this->startAttributeStack[$stackPos-(11-1)] + $this->endAttributes); + }, + 377 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 378 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 379 => function ($stackPos) { + $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(2-2)], null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 380 => function ($stackPos) { + $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 381 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG; + $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $attrs); + }, + 382 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT; + $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $attrs); + }, + 383 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 384 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(4-1)][0] === "'" || ($this->semStack[$stackPos-(4-1)][1] === "'" && ($this->semStack[$stackPos-(4-1)][0] === 'b' || $this->semStack[$stackPos-(4-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED); + $this->semValue = new Expr\ArrayDimFetch(new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(4-1)]), $attrs), $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 385 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 386 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 387 => function ($stackPos) { + $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes), $this->semStack[$stackPos-(7-2)]); $this->checkClass($this->semValue[0], -1); - } - - protected function reduceRule384() { - $this->semValue = new Expr\New_($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule385() { - list($class, $ctorArgs) = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule386() { - $this->semValue = array(); - } - - protected function reduceRule387() { - $this->semValue = $this->semStack[$this->stackPos-(4-3)]; - } - - protected function reduceRule388() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule389() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule390() { - $this->semValue = new Expr\ClosureUse(substr($this->semStack[$this->stackPos-(2-2)], 1), $this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule391() { - $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule392() { - $this->semValue = new Expr\StaticCall($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule393() { - $this->semValue = new Expr\StaticCall($this->semStack[$this->stackPos-(6-1)], $this->semStack[$this->stackPos-(6-4)], $this->semStack[$this->stackPos-(6-6)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - } - - protected function reduceRule394() { - - if ($this->semStack[$this->stackPos-(2-1)] instanceof Node\Expr\StaticPropertyFetch) { - $this->semValue = new Expr\StaticCall($this->semStack[$this->stackPos-(2-1)]->class, new Expr\Variable($this->semStack[$this->stackPos-(2-1)]->name, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } elseif ($this->semStack[$this->stackPos-(2-1)] instanceof Node\Expr\ArrayDimFetch) { - $tmp = $this->semStack[$this->stackPos-(2-1)]; - while ($tmp->var instanceof Node\Expr\ArrayDimFetch) { - $tmp = $tmp->var; - } - - $this->semValue = new Expr\StaticCall($tmp->var->class, $this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - $tmp->var = new Expr\Variable($tmp->var->name, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } else { - throw new \Exception; - } - - } - - protected function reduceRule395() { - $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule396() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule397() { - $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule398() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule399() { - $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule400() { - $this->semValue = new Name\FullyQualified($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule401() { - $this->semValue = new Name\Relative($this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule402() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule403() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule404() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule405() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule406() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule407() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule408() { - $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule409() { - $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule410() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule411() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule412() { - $this->semValue = null; - } - - protected function reduceRule413() { - $this->semValue = null; - } - - protected function reduceRule414() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule415() { - $this->semValue = array(); - } - - protected function reduceRule416() { - $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$this->stackPos-(1-1)], '`', false), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes)); - } - - protected function reduceRule417() { - foreach ($this->semStack[$this->stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', false); } }; $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule418() { - $this->semValue = array(); - } - - protected function reduceRule419() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule420() { - $this->semValue = $this->parseLNumber($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes, true); - } - - protected function reduceRule421() { - $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$this->stackPos-(1-1)]), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule422() { - $attrs = $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$this->stackPos-(1-1)][0] === "'" || ($this->semStack[$this->stackPos-(1-1)][1] === "'" && ($this->semStack[$this->stackPos-(1-1)][0] === 'b' || $this->semStack[$this->stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED); - $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$this->stackPos-(1-1)], false), $attrs); - } - - protected function reduceRule423() { - $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule424() { - $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule425() { - $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule426() { - $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule427() { - $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule428() { - $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule429() { - $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule430() { - $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule431() { - $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];; - $this->semValue = new Scalar\String_(Scalar\String_::parseDocString($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-2)], false), $attrs); - } - - protected function reduceRule432() { - $attrs = $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(2-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(2-1)], $matches); $attrs['docLabel'] = $matches[1];; + }, + 388 => function ($stackPos) { + $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 389 => function ($stackPos) { + list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 390 => function ($stackPos) { + $this->semValue = array(); + }, + 391 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-3)]; + }, + 392 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 393 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 394 => function ($stackPos) { + $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 395 => function ($stackPos) { + $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 396 => function ($stackPos) { + $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 397 => function ($stackPos) { + $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + }, + 398 => function ($stackPos) { + $this->semValue = $this->fixupPhp5StaticPropCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 399 => function ($stackPos) { + $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 400 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 401 => function ($stackPos) { + $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 402 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 403 => function ($stackPos) { + $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 404 => function ($stackPos) { + $this->semValue = new Name\FullyQualified($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 405 => function ($stackPos) { + $this->semValue = new Name\Relative($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 406 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 407 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 408 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 409 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 410 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 411 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 412 => function ($stackPos) { + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 413 => function ($stackPos) { + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 414 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 415 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 416 => function ($stackPos) { + $this->semValue = null; + }, + 417 => function ($stackPos) { + $this->semValue = null; + }, + 418 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 419 => function ($stackPos) { + $this->semValue = array(); + }, + 420 => function ($stackPos) { + $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`', false), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes)); + }, + 421 => function ($stackPos) { + foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', false); } }; $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 422 => function ($stackPos) { + $this->semValue = array(); + }, + 423 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 424 => function ($stackPos) { + $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes, true); + }, + 425 => function ($stackPos) { + $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 426 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED); + $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(1-1)], false), $attrs); + }, + 427 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 428 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 429 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 430 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 431 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 432 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 433 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 434 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 435 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];; + $this->semValue = new Scalar\String_(Scalar\String_::parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], false), $attrs); + }, + 436 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(2-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(2-1)], $matches); $attrs['docLabel'] = $matches[1];; $this->semValue = new Scalar\String_('', $attrs); - } - - protected function reduceRule433() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule434() { - $this->semValue = new Expr\ClassConstFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule435() { - $this->semValue = new Expr\ConstFetch($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule436() { - $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule437() { - $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule438() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule439() { - $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule440() { - $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule441() { - $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule442() { - $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule443() { - $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule444() { - $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule445() { - $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule446() { - $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule447() { - $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule448() { - $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule449() { - $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule450() { - $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule451() { - $this->semValue = new Expr\BinaryOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule452() { - $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule453() { - $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule454() { - $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule455() { - $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule456() { - $this->semValue = new Expr\UnaryPlus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule457() { - $this->semValue = new Expr\UnaryMinus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule458() { - $this->semValue = new Expr\BooleanNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule459() { - $this->semValue = new Expr\BitwiseNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule460() { - $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule461() { - $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule462() { - $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule463() { - $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule464() { - $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule465() { - $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule466() { - $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule467() { - $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule468() { - $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(5-1)], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule469() { - $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(4-1)], null, $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule470() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule471() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule472() { - $this->semValue = new Expr\ConstFetch($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule473() { - $this->semValue = new Expr\ClassConstFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule474() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule475() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule476() { - $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED; - foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $attrs); - } - - protected function reduceRule477() { - $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];; - foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, true); } } $s->value = preg_replace('~(\r\n|\n|\r)\z~', '', $s->value); if ('' === $s->value) array_pop($this->semStack[$this->stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $attrs); - } - - protected function reduceRule478() { - $this->semValue = array(); - } - - protected function reduceRule479() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule480() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule481() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule482() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule483() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule484() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule485() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule486() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule487() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule488() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule489() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule490() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(6-2)], $this->semStack[$this->stackPos-(6-5)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - } - - protected function reduceRule491() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule492() { - $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule493() { - $this->semValue = new Expr\MethodCall($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule494() { - $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule495() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule496() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule497() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule498() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule499() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule500() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule501() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule502() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule503() { - $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule504() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule505() { - $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(3-1)], substr($this->semStack[$this->stackPos-(3-3)], 1), $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule506() { - $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(6-1)], $this->semStack[$this->stackPos-(6-5)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - } - - protected function reduceRule507() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule508() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule509() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule510() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule511() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule512() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule513() { - $this->semValue = null; - } - - protected function reduceRule514() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule515() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule516() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule517() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule518() { - $this->semValue = new Expr\Error($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; - } - - protected function reduceRule519() { - $this->semValue = new Expr\List_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule520() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule521() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule522() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule523() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule524() { - $this->semValue = null; - } - - protected function reduceRule525() { - $this->semValue = array(); - } - - protected function reduceRule526() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule527() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule528() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule529() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule530() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule531() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(4-4)], $this->semStack[$this->stackPos-(4-1)], true, $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule532() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(2-2)], null, true, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule533() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule534() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule535() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule536() { - $this->semValue = array($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); - } - - protected function reduceRule537() { - $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule538() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule539() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule540() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule541() { - $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule542() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule543() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule544() { - $this->semValue = new Expr\ArrayDimFetch(new Expr\Variable($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(6-4)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - } - - protected function reduceRule545() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule546() { - $this->semValue = new Scalar\String_($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule547() { - $this->semValue = $this->parseNumString($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule548() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); + }, + 437 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 438 => function ($stackPos) { + $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 439 => function ($stackPos) { + $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 440 => function ($stackPos) { + $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 441 => function ($stackPos) { + $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 442 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 443 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 444 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 445 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 446 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 447 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 448 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 449 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 450 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 451 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 452 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 453 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 454 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 455 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 456 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 457 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 458 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 459 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 460 => function ($stackPos) { + $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 461 => function ($stackPos) { + $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 462 => function ($stackPos) { + $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 463 => function ($stackPos) { + $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 464 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 465 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 466 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 467 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 468 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 469 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 470 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 471 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 472 => function ($stackPos) { + $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 473 => function ($stackPos) { + $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 474 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 475 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 476 => function ($stackPos) { + $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 477 => function ($stackPos) { + $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 478 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 479 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 480 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED; + foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs); + }, + 481 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];; + foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, true); } } $s->value = preg_replace('~(\r\n|\n|\r)\z~', '', $s->value); if ('' === $s->value) array_pop($this->semStack[$stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs); + }, + 482 => function ($stackPos) { + $this->semValue = array(); + }, + 483 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 484 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 485 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 486 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 487 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 488 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 489 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 490 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 491 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 492 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 493 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 494 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + }, + 495 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 496 => function ($stackPos) { + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 497 => function ($stackPos) { + $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 498 => function ($stackPos) { + $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 499 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 500 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 501 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 502 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 503 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 504 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 505 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 506 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 507 => function ($stackPos) { + $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 508 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 509 => function ($stackPos) { + $var = substr($this->semStack[$stackPos-(1-1)], 1); $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var; + }, + 510 => function ($stackPos) { + $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 511 => function ($stackPos) { + $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + }, + 512 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 513 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 514 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 515 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 516 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 517 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 518 => function ($stackPos) { + $this->semValue = null; + }, + 519 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 520 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 521 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 522 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 523 => function ($stackPos) { + $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; + }, + 524 => function ($stackPos) { + $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 525 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 526 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 527 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 528 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 529 => function ($stackPos) { + $this->semValue = null; + }, + 530 => function ($stackPos) { + $this->semValue = array(); + }, + 531 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 532 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 533 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 534 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 535 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 536 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 537 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 538 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 539 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 540 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 541 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); + }, + 542 => function ($stackPos) { + $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 543 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 544 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 545 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 546 => function ($stackPos) { + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 547 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 548 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 549 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + }, + 550 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 551 => function ($stackPos) { + $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 552 => function ($stackPos) { + $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 553 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + ]; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php index 56f52687..329028e0 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php @@ -18,16 +18,16 @@ use PhpParser\Node\Stmt; class Php7 extends \PhpParser\ParserAbstract { protected $tokenToSymbolMapSize = 392; - protected $actionTableSize = 891; - protected $gotoTableSize = 429; + protected $actionTableSize = 950; + protected $gotoTableSize = 488; protected $invalidSymbol = 157; protected $errorSymbol = 1; protected $defaultAction = -32766; protected $unexpectedTokenRule = 32767; - protected $YY2TBLSTATE = 328; - protected $YYNLSTATES = 576; + protected $YY2TBLSTATE = 338; + protected $numNonLeafStates = 580; protected $symbolToName = array( "EOF", @@ -233,195 +233,262 @@ class Php7 extends \PhpParser\ParserAbstract ); protected $action = array( - 581, 582, 583, 584, 585, 0, 586, 587, 588, 624, - 625, 477, 27, 99, 100, 101, 102, 103, 104, 105, - 106, 107, 108, 109, 110,-32766,-32766,-32766, 95, 96, - 97, 361, 239, 263, -282,-32766,-32766,-32766, -488, -487, - 1079, 542, 1082, 1080, 98,-32766, 272,-32766,-32766,-32766, - -32766,-32766, 589, 899, 901,-32766,-32766,-32766,-32766,-32766, - -32766,-32766,-32766, 240,-32766, 662, 590, 591, 592, 593, - 594, 595, 596,-32766, 289, 656, 867, 868, 869, 866, - 865, 864, 597, 598, 599, 600, 601, 602, 603, 604, - 605, 606, 607, 627, 628, 629, 630, 631, 619, 620, - 621, 622, 623, 608, 609, 610, 611, 612, 613, 614, - 650, 651, 652, 653, 654, 655, 615, 616, 617, 618, - 648, 639, 637, 638, 634, 635, 215, 626, 632, 633, - 640, 641, 643, 642, 644, 645, 42, 43, 390, 44, - 45, 636, 647, 646, 224, 46, 47, 982, 48,-32767, - -32767,-32767,-32767, 90, 91, 92, 93, 94, 258, 440, - 22, 867, 868, 869, 866, 865, 864, 859,-32766,-32766, - -32766, 1071, 1032, 1032, 1070, 1049, 998, 293, -443, 246, - 287, 49, 50, -488, -487, -488, -487, 51,-32766, 52, - 219, 220, 53, 54, 55, 56, 57, 58, 59, 60, - 125, 22, 232, 61, 345, 975,-32766,-32766,-32766, 999, - 1000, 658, 661, 1032, 28, -477, 1012, 998,-32766,-32766, - -32766, 737, 407, 408, 246, 1032,-32766, 246,-32766,-32766, - -32766,-32766, 25, 222, 373, 385, 349, 226,-32766, -443, - -32766,-32766,-32766, 1035, 65, 342, 416, 216, 41, 264, - 264, 1046, 7, -443, 403, 404, 120, 21, 975, 24, - -443, 822, -446, 407, 408, -227, 1004, 1005, 1006, 1007, - 1001, 1002, 243, 116, -442, -441, 265, 417, 1008, 1003, - 347, 816, 817, 1076, 994, 63, 369, 255, 362, 260, - 264, 391, -133, -133, -133, -4, 737, 392, 658, 224, - -441, 727, 264, -88, 32, 17, 393, -133, 394, -133, - 395, -133, 396, -133, 128, 397, -133, -133, -133, 34, - 35, 398, 346, 122, 36, 399, 816, 817, 62, 816, - 817, 286, 288, 400, 401, -442, -441, 465, -251, 402, - 38, 40, 713, 758, 405, 406, -172, 22, -232, -442, - -441,-32766,-32766,-32766, 374, -173, -442, -441, -445, 1032, - -477, -441, 1032, 998, 417, -479, 391, 347, 739, 547, - -133,-32766, 392,-32766,-32766, -441, 727, 678, 679, 32, - 17, 393, -441, 394, 276, 395, 357, 396, 789, 549, - 397, 71, 975, 1050, 34, 35, 398, 346, 335, 36, - 399, 247, 248, 62, 254, 737, 286, 288, 400, 401, - 408, 120, 131, 530, 402, 982, 306, 670, 758, 405, - 406, 337, 113, 115,-32766,-32766, 72, 73, 74, 242, - 529, 65, 121, 553, 502, 18, 264, 126, 274, 264, - -32766,-32766,-32766, 739, 547, -4, 26, 751, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 585, 586, 587, 588, 589, 218, 590, 591, 592, 628, + 629, 492, 32, 102, 103, 104, 105, 106, 107, 108, + 109, 110, 111, 112, 113,-32766,-32766,-32766, 98, 99, + 100, 375, 244, 489, 556,-32766,-32766,-32766, 664, 855, + 1095, 662, 0, 1096, 101,-32766, 823,-32766,-32766,-32766, + -32766,-32766, 593, 912, 914,-32766, 29,-32766,-32766,-32766, + -32766,-32766,-32766, -491, 253, 669, 594, 595, 596, 597, + 598, 599, 600, 430, 253, 660, 879, 880, 881, 878, + 877, 876, 601, 602, 603, 604, 605, 606, 607, 608, + 609, 610, 611, 631, 632, 633, 634, 635, 623, 624, + 625, 626, 627, 612, 613, 614, 615, 616, 617, 618, + 654, 655, 656, 657, 658, 659, 619, 620, 621, 622, + 652, 643, 641, 642, 638, 639, 217, 630, 636, 637, + 644, 645, 647, 646, 648, 649, 45, 46, 407, 47, + 48, 640, 651, 650, -233, 49, 50, 263, 51, 253, + 879, 880, 881, 878, 877, 876, 871,-32767,-32767,-32767, + -32767, 93, 94, 95, 96, 97, 827, 828, 390, 1063, + 667, 685, 686, 1086, -452, 995, 827, 828,-32766,-32766, + -32766, 52, 53, 117, 763, -292, -292, 54, -91, 55, + 226, 227, 56, 57, 58, 59, 60, 61, 62, 63, + -451, 25, 237, 64, 359,-32766,-32766,-32766, -491, 1012, + 1013, 409, 668, 1045, -487, 348, 119, 1011,-32766,-32766, + -32766, 745, 799, 228, 234,-32766, 454,-32766,-32766,-32766, + -32766, 28, 229, 976, 245, -452, 367, 9,-32766, 268, + -32766,-32766,-32766, 24, -176, 662, 293,-32766,-32766, -452, + 294, 827, 828, 1045, 419, 420, -452, 664, -455, 297, + 995, -451, 301, 421, 422, 664, 1017, 1018, 1019, 1020, + 1014, 1015, 248, -238, -450, -451, 352, 431, 1021, 1016, + 364, 1048, -451, 1025, -454, 66, 988, 260, 391, 265, + 270, 408, -136, -136, -136, -4, 745, 353, 358,-32766, + 430, 734, 25, -490, 37, 20, 410, -136, 411, -136, + 412, -136, 413, -136, 1045, 414, 232, 125, 1011, 38, + 39, 360, 361, 431, 40, 415, 364, 1007, 65, 277, + 270, 292, 563, 416, 417, -450, -292, -292, 1045, 418, + 122, 800, 720, 768, 362, 363, 355, 988, -500, -450, + -450, 33,-32766,-32766,-32766, -499, -450, 356, 664, -487, + 44, 539,-32766,-32766,-32766, 422, 408, 745, 747, 554, + -136, 988,-32766,-32766,-32766,-32766, 734, -290, 236, 37, + 20, 410,-32766, 411, 765, 412, 68, 413, 664, -176, + 414, 270, 235, 430, 38, 39, 360, 361, 344, 40, + 415, 516, 21, 65, 259, 1045, 292,-32766, 416, 417, + 25, -450, -292, -292, 418, 270,-32766, 677, 768, 362, + 363, 252, 1045, 430, 25, -450, 1011, 540, 123, 74, + 364, 269, -450, 833, 857, 296, 1045, 408, 279, 745, + 1011, 232, 118, 747, 554, -4, 219, 734, -490, 42, + 37, 20, 410, 357, 411, 988, 412, 133, 413, 134, + 766, 414, -217, -217, -217, 38, 39, 360, 361, 988, + 40, 415, 421, 422, 65, 124, -177, 292, 230, 416, + 417, 30, 270, 664, -258, 418, 421, 422, 720, 768, + 362, 363, 381, -500, 68, -500, -292, -292, -488, 270, + -499, 1045, -499, 231, 121, 233, 664, 477, 68, 408, + 251, 528, 529, 270, 747, 554, -217, 120, 430, 734, + 664, 114, 37, 20, 410, 115, 411, 127, 412, 131, + 413, 116, -82, 414, -218, -218, -218, 38, 39, 360, + 361, 430, 40, 415, 767, 664, 65, 664, 745, 292, + 129, 416, 417, 123, 759, 430, 247, 418, 130, 319, + 720, 768, 362, 363,-32766,-32766,-32766, 400, 8, 75, + 76, 77, 95, 96, 97, 564, 565, 567, 270, 744, + 430, 101, 430, 685, 686, 281, 747, 554, -218, 31, + 244, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 111, 239, 118, 737, 391, 92, 93, 94, 531, - 112, 392, 347, -251, 98, 727, 845, 124, 32, 17, - 393, -172, 394, 1032, 395, 130, 396, 515, 516, 397, - -173, 117, 554, 34, 35, 398, 737, 790, 36, 399, - -479, 736, 62, 383, 6, 286, 288,-32766,-32766,-32766, - 127, 311, 114, 402, 678, 679, 975, 495, 496, 816, - 817, 856, 565, 119, 552, 844, 575, 343, 223, 564, - 559, 221, 225, 239, 391, 98, 658, 439, 39, 525, - 392, 659, 775, 547, 727, 435, 971, 32, 17, 393, - 358, 394, 356, 395, 299, 396, 319, 694, 397, 1074, - 264, 451, 34, 35, 398, 737, 391, 36, 399, 453, - 511, 62, 392, 449, 286, 288, 727, 499, 540, 32, - 17, 393, 402, 394, 438, 395, 1081, 396, 354, 444, - 397,-32766, 493, 551, 34, 35, 398, 737, 503, 36, - 399, 526, -80, 62, 759, 507, 286, 288, 214, 456, - 10, 739, 547, 519, 402, 508, 975, 257, 15, 0, - 338, 0, 0, 259, 1011, 560, 760, 1014, 262, 0, - 0, 0, 0, 0, 0, 391, 0, 0, 0, 0, - 0, 392, 0, 739, 547, 727, 227, 256, 32, 17, - 393, 0, 394, 0, 395, 0, 396, 0, 0, 397, - 3, 0, 9, 34, 35, 398, 737, 391, 36, 399, - 305, -400, 62, 392, 753, 286, 288, 727, 22, 339, - 32, 17, 393, 402, 394, 327, 395, 324, 396, 316, - 1032, 397, 323, 357, 998, 34, 35, 398, 446, 773, - 36, 399, 31, 573, 62, 574, 718, 286, 288, 840, - 850, 792, 739, 547, 30, 402, 849, 852, 851, 848, - 771, 776, 716, 975, 784, 841, 783, 19, 548, 333, - 550, 555, 557, 558, 270, 271, 391, 332, 571, 570, - 407, 408, 392, 568, 739, 547, 727, 566, 563, 32, - 17, 393, 562, 394, 757, 395, 756, 396, 755, 963, - 397, -444, 65, 857, 34, 35, 398, 264, 744, 36, - 399, 962, 961, 62, 754, 746, 286, 288,-32766,-32766, - -32766, 681, 1077, 680, 402, 683, 682, 672, 673, 782, - 567, 714, 1078, 781, 1047, 1044, 1039, 1026,-32766, 1033, - -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767, - -32767, 1075, 250, 739, 547, -467, 955, -446, -445, 20, - 23, 29, 33, 37, 64, 336, 334, 273, 238, 237, - 236, 235, 218, 217, 132, 129, 123, 70, 69, 68, - 67, 66, -469, 0, 308, 473, 939, 489, 539, -230, - 942, 11, 967, 823, 996, 938, 986, 536, 388, -88, - 381, 378, 375, 309, 16, 14, 13, 12, -227, -228, - 0, -412, 0, 995, 501, 1073, 1038, 1025, 1024, 0, - 1013 + 97, 98, 99, 100, 536, 244, 43, 745, 408, 509, + 510, -177, 827, 828, 856, 577, 1064, 101, 734, -258, + 128, 37, 20, 410, 664, 411, 665, 412, 1097, 413, + 463, 662, 414, -488, 667, 558, 38, 39, 360, 745, + 885, 40, 415, 517,-32766, 65, 458, 548, 292, 261, + 531, -80, 372, 522, 508, 988, 418, 10, 770, 379, + 267, 1027, 532, 523, 769, 375, 1024, 559, 761, 555, + 12, -409, 863, 5, 295, 1092, 0, 408, 264, 262, + 0, 861, 0, 0, 0, 747, 554, 734, 0, 0, + 37, 20, 410, 0, 411, 0, 412, 0, 413, 0, + 0, 414, 0, 0, 0, 38, 39, 360, 745, 408, + 40, 415, 0, 0, 65, 350, 337, 292, 333, 734, + 332, 326, 37, 20, 410, 418, 411, 460, 412, 349, + 413, 557, 864, 414, 862, 575, 561, 38, 39, 360, + 745, 860, 40, 415, 781, 576, 65, 851, 723, 292, + 36, 725, 868, 794, 747, 554, 783, 418, 852, 793, + 786, 802, 35, 515, 562, 275, 276, 342, 560, 566, + 343, 573, 568, 570, 572, 0, 721, 1094, 408, 745, + 569, 792, 791, 762, 754, 688, 747, 554, 734, 1093, + 687, 37, 20, 410, 1091, 411, 1046, 412, 1039, 413, + 1053, 1058, 414, 1061, 680, 690, 38, 39, 360, 752, + 408, 40, 415, 689, 679, 65, 26, 23, 292, -453, + 734, -454, -455, 37, 20, 410, 418, 411, -477, 412, + -479, 413, 27, 34, 414, 41, 67, 69, 38, 39, + 360, 70, 71, 40, 415, 72, 73, 65, 126, 408, + 292, 132, 135, 224, 225, 747, 554, 240, 418, 734, + 347, 345, 37, 20, 410, 278, 411, 243, 412, 242, + 413, 241, 968, 414, 952, 955, 547, 38, 39, 360, + 504, 487, 40, 415, 315, 255, 65, 785, 554, 292, + -32766,-32766,-32766, 22, 18, 13, -236, 418, -91, -234, + 980, 834, 1009, 951, 999, 545, 405, 398, 396, 392, + -32766, 316,-32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767, + -32767,-32767,-32767, 19, 17, 16, 747, 554, 15, 14, + 1026, -233, 0, -421, 0, 1052, 1089, 1037, 1038, 1008 ); protected $actionCheck = array( - 2, 3, 4, 5, 6, 0, 8, 9, 10, 11, + 2, 3, 4, 5, 6, 13, 8, 9, 10, 11, 12, 48, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 8, 9, 10, 50, 51, - 52, 7, 54, 7, 79, 8, 9, 10, 7, 7, - 77, 77, 79, 80, 66, 28, 7, 30, 31, 32, - 33, 34, 54, 56, 57, 28, 8, 30, 31, 32, - 33, 34, 35, 7, 109, 1, 68, 69, 70, 71, - 72, 73, 74, 118, 7, 77, 112, 113, 114, 115, + 52, 146, 54, 1, 149, 8, 9, 10, 77, 1, + 77, 77, 0, 80, 66, 28, 1, 30, 31, 32, + 33, 34, 54, 56, 57, 28, 7, 30, 31, 32, + 33, 34, 35, 7, 28, 1, 68, 69, 70, 71, + 72, 73, 74, 112, 28, 77, 112, 113, 114, 115, 116, 117, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 13, 129, 130, 131, + 122, 123, 124, 125, 126, 127, 94, 129, 130, 131, 132, 133, 134, 135, 136, 137, 2, 3, 4, 5, - 6, 143, 144, 145, 35, 11, 12, 1, 14, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 109, 82, - 67, 112, 113, 114, 115, 116, 117, 118, 8, 9, - 10, 79, 79, 79, 82, 1, 83, 7, 67, 28, - 7, 47, 48, 152, 152, 154, 154, 53, 28, 55, + 6, 143, 144, 145, 152, 11, 12, 109, 14, 28, + 112, 113, 114, 115, 116, 117, 118, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 130, 131, 29, 1, + 79, 102, 103, 82, 67, 1, 130, 131, 8, 9, + 10, 47, 48, 13, 1, 102, 103, 53, 152, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 67, 67, 68, 69, 70, 112, 8, 9, 10, 75, - 76, 77, 148, 79, 13, 7, 139, 83, 8, 9, - 10, 1, 129, 130, 28, 79, 28, 28, 30, 31, - 32, 33, 140, 141, 29, 7, 102, 7, 28, 128, - 30, 31, 32, 1, 151, 7, 112, 13, 7, 156, - 156, 77, 7, 142, 120, 121, 147, 7, 112, 7, - 149, 152, 151, 129, 130, 152, 132, 133, 134, 135, - 136, 137, 138, 7, 67, 67, 67, 143, 144, 145, - 146, 130, 131, 150, 1, 151, 7, 153, 7, 155, - 156, 71, 72, 73, 74, 0, 1, 77, 77, 35, - 67, 81, 156, 152, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 15, 95, 96, 97, 98, 99, - 100, 101, 102, 149, 104, 105, 130, 131, 108, 130, - 131, 111, 112, 113, 114, 128, 128, 128, 7, 119, - 67, 67, 122, 123, 124, 125, 7, 67, 152, 142, - 142, 8, 9, 10, 149, 7, 149, 149, 151, 79, - 152, 128, 79, 83, 143, 7, 71, 146, 148, 149, - 150, 28, 77, 30, 31, 142, 81, 102, 103, 84, - 85, 86, 149, 88, 33, 90, 146, 92, 29, 149, - 95, 149, 112, 152, 99, 100, 101, 102, 103, 104, - 105, 128, 128, 108, 109, 1, 111, 112, 113, 114, - 130, 147, 15, 77, 119, 1, 142, 122, 123, 124, - 125, 146, 149, 149, 8, 9, 8, 9, 10, 29, - 79, 151, 149, 29, 72, 73, 156, 29, 143, 156, - 8, 9, 10, 148, 149, 150, 28, 35, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 15, 54, 15, 1, 71, 47, 48, 49, 143, - 15, 77, 146, 152, 66, 81, 150, 15, 84, 85, - 86, 152, 88, 79, 90, 15, 92, 72, 73, 95, - 152, 15, 29, 99, 100, 101, 1, 148, 104, 105, - 152, 29, 108, 102, 103, 111, 112, 8, 9, 10, - 97, 98, 13, 119, 102, 103, 112, 106, 107, 130, - 131, 148, 149, 29, 29, 148, 149, 123, 35, 29, - 29, 35, 35, 54, 71, 66, 77, 77, 67, 74, - 77, 77, 148, 149, 81, 77, 79, 84, 85, 86, - 77, 88, 77, 90, 77, 92, 78, 77, 95, 77, - 156, 77, 99, 100, 101, 1, 71, 104, 105, 77, - 79, 108, 77, 86, 111, 112, 81, 79, 89, 84, - 85, 86, 119, 88, 79, 90, 80, 92, 102, 82, - 95, 82, 109, 29, 99, 100, 101, 1, 87, 104, - 105, 91, 94, 108, 123, 93, 111, 112, 94, 94, - 94, 148, 149, 96, 119, 96, 112, 127, 152, -1, - 146, -1, -1, 110, 139, 29, 123, 139, 126, -1, - -1, -1, -1, -1, -1, 71, -1, -1, -1, -1, - -1, 77, -1, 148, 149, 81, 35, 126, 84, 85, - 86, -1, 88, -1, 90, -1, 92, -1, -1, 95, - 142, -1, 142, 99, 100, 101, 1, 71, 104, 105, - 142, 142, 108, 77, 147, 111, 112, 81, 67, 146, - 84, 85, 86, 119, 88, 146, 90, 146, 92, 146, - 79, 95, 146, 146, 83, 99, 100, 101, 146, 148, - 104, 105, 148, 148, 108, 148, 148, 111, 112, 148, - 148, 148, 148, 149, 148, 119, 148, 148, 148, 148, - 148, 148, 148, 112, 148, 148, 148, 152, 149, 149, - 149, 149, 149, 149, 149, 149, 71, 149, 149, 149, - 129, 130, 77, 149, 148, 149, 81, 149, 149, 84, - 85, 86, 149, 88, 150, 90, 150, 92, 150, 150, - 95, 151, 151, 150, 99, 100, 101, 156, 150, 104, - 105, 150, 150, 108, 150, 150, 111, 112, 8, 9, - 10, 150, 150, 150, 119, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 28, 150, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 150, 152, 148, 149, 151, 153, 151, 151, 151, - 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, - 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, - 151, 151, 151, -1, 152, 152, 152, 152, 152, 152, + 67, 67, 68, 69, 70, 8, 9, 10, 152, 75, + 76, 77, 148, 79, 7, 146, 7, 83, 8, 9, + 10, 1, 29, 35, 7, 28, 82, 30, 31, 32, + 33, 140, 141, 150, 7, 128, 102, 7, 28, 7, + 30, 31, 32, 7, 7, 77, 112, 8, 9, 142, + 7, 130, 131, 79, 120, 121, 149, 77, 151, 7, + 1, 128, 7, 129, 130, 77, 132, 133, 134, 135, + 136, 137, 138, 152, 67, 142, 7, 143, 144, 145, + 146, 1, 149, 139, 151, 151, 112, 153, 149, 155, + 156, 71, 72, 73, 74, 0, 1, 123, 7, 1, + 112, 81, 67, 7, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 79, 95, 35, 149, 83, 99, + 100, 101, 102, 143, 104, 105, 146, 1, 108, 7, + 156, 111, 149, 113, 114, 128, 102, 103, 79, 119, + 29, 148, 122, 123, 124, 125, 7, 112, 7, 142, + 67, 13, 8, 9, 10, 7, 149, 7, 77, 152, + 67, 77, 8, 9, 10, 130, 71, 1, 148, 149, + 150, 112, 28, 8, 30, 31, 81, 79, 35, 84, + 85, 86, 28, 88, 150, 90, 151, 92, 77, 152, + 95, 156, 35, 112, 99, 100, 101, 102, 103, 104, + 105, 72, 73, 108, 109, 79, 111, 109, 113, 114, + 67, 128, 102, 103, 119, 156, 118, 122, 123, 124, + 125, 128, 79, 112, 67, 142, 83, 143, 147, 149, + 146, 67, 149, 152, 150, 142, 79, 71, 143, 1, + 83, 35, 149, 148, 149, 150, 13, 81, 152, 67, + 84, 85, 86, 7, 88, 112, 90, 15, 92, 15, + 150, 95, 96, 97, 98, 99, 100, 101, 102, 112, + 104, 105, 129, 130, 108, 149, 7, 111, 35, 113, + 114, 7, 156, 77, 7, 119, 129, 130, 122, 123, + 124, 125, 128, 152, 151, 154, 102, 103, 7, 156, + 152, 79, 154, 35, 15, 35, 77, 78, 151, 71, + 128, 72, 73, 156, 148, 149, 150, 15, 112, 81, + 77, 15, 84, 85, 86, 15, 88, 15, 90, 15, + 92, 149, 29, 95, 96, 97, 98, 99, 100, 101, + 102, 112, 104, 105, 150, 77, 108, 77, 1, 111, + 29, 113, 114, 147, 35, 112, 29, 119, 97, 98, + 122, 123, 124, 125, 8, 9, 10, 102, 103, 8, + 9, 10, 47, 48, 49, 29, 29, 29, 156, 29, + 112, 66, 112, 102, 103, 33, 148, 149, 150, 28, + 54, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 74, 54, 67, 1, 71, 106, + 107, 152, 130, 131, 148, 149, 152, 66, 81, 152, + 67, 84, 85, 86, 77, 88, 77, 90, 80, 92, + 86, 77, 95, 152, 79, 29, 99, 100, 101, 1, + 79, 104, 105, 87, 82, 108, 82, 89, 111, 126, + 91, 94, 102, 93, 109, 112, 119, 94, 123, 94, + 126, 139, 96, 96, 123, 146, 139, 29, 147, 149, + 142, 142, 148, 142, 142, 150, -1, 71, 110, 127, + -1, 148, -1, -1, -1, 148, 149, 81, -1, -1, + 84, 85, 86, -1, 88, -1, 90, -1, 92, -1, + -1, 95, -1, -1, -1, 99, 100, 101, 1, 71, + 104, 105, -1, -1, 108, 146, 146, 111, 146, 81, + 146, 146, 84, 85, 86, 119, 88, 146, 90, 146, + 92, 149, 148, 95, 148, 148, 29, 99, 100, 101, + 1, 148, 104, 105, 148, 148, 108, 148, 148, 111, + 148, 148, 148, 148, 148, 149, 148, 119, 148, 148, + 148, 148, 148, 154, 149, 149, 149, 149, 29, 149, + 149, 149, 149, 149, 149, -1, 150, 150, 71, 1, + 150, 150, 150, 150, 150, 150, 148, 149, 81, 150, + 150, 84, 85, 86, 150, 88, 150, 90, 150, 92, + 150, 150, 95, 150, 150, 150, 99, 100, 101, 150, + 71, 104, 105, 150, 150, 108, 151, 151, 111, 151, + 81, 151, 151, 84, 85, 86, 119, 88, 151, 90, + 151, 92, 151, 151, 95, 151, 151, 151, 99, 100, + 101, 151, 151, 104, 105, 151, 151, 108, 151, 71, + 111, 151, 151, 151, 151, 148, 149, 151, 119, 81, + 151, 151, 84, 85, 86, 151, 88, 151, 90, 151, + 92, 151, 153, 95, 152, 152, 152, 99, 100, 101, + 152, 152, 104, 105, 152, 152, 108, 148, 149, 111, + 8, 9, 10, 152, 152, 152, 152, 119, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - -1, 153, -1, 154, 154, 154, 154, 154, 154, -1, - 155 + 28, 152, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 152, 152, 152, 148, 149, 152, 152, + 155, 152, -1, 153, -1, 154, 154, 154, 154, 154 ); protected $actionBase = array( - 0, 220, 295, 283, 336, 572, -2, -2, -2, -2, - -36, 505, 473, 606, 473, 574, 404, 675, 675, 675, - 109, 264, 506, 506, 506, 488, 504, 503, 507, 134, + 0, 220, 295, 438, 366, 326, 284, 596, -2, -2, + -36, -2, -2, 648, 717, 717, 547, 717, 616, 749, + 788, 788, 788, 281, 406, 188, 188, 443, 429, 188, + 443, 311, 468, 470, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39, -39, -39, -39, + -39, -39, -39, -39, -39, -39, 64, 64, 193, 32, + 338, 743, 733, 739, 752, 753, 742, 732, 433, 654, + 656, 521, 658, 660, 661, 663, 738, 619, 751, 734, + 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, + 561, 561, 561, 561, 561, 561, 365, 170, 239, 556, + 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, + 556, 556, 556, 556, 556, 556, 556, 556, 354, 354, + 354, 344, 210, 207, 197, 17, 283, 27, 892, 892, + 892, 892, 892, 116, 116, 116, 116, 357, 357, 343, + 394, 310, 234, 83, 235, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 174, 525, 525, + 121, 121, 121, 121, 259, 36, 298, 46, 144, 532, + 785, 168, 168, 492, 107, 133, -22, -22, -22, 69, + 574, 553, 553, 553, 553, 91, 91, 553, 553, -37, + 280, 283, 283, 293, 283, 481, 481, 481, 180, -115, + 572, 180, 614, 592, 577, 642, 576, 641, 382, 341, + 348, 593, 422, 560, 579, 422, 422, 422, 513, 329, + 439, 756, 64, 539, 64, 64, 64, 64, 716, 64, + 64, 64, 64, 64, 64, 139, 64, 45, 476, 193, + 183, 183, 552, 183, 536, 364, 626, 237, 474, 536, + 536, 536, 627, 628, 491, 477, -8, 631, 469, 465, + 296, 56, 557, 557, 564, 564, 571, 519, 557, 557, + 557, 557, 557, 676, 676, 564, 565, 564, 571, 694, + 564, 519, 564, 564, 557, 564, 676, 519, 209, 339, + 243, 252, 519, 350, 533, 557, 544, 544, 446, 564, + 217, 564, 236, 562, 676, 676, 562, 227, 519, 232, + 597, 607, 555, 531, 322, 527, 527, 269, 555, 291, + 519, 527, 230, 565, 255, 527, 42, 695, 696, 503, + 700, 692, 701, 720, 704, 530, 551, 545, 712, 713, + 705, 691, 675, 550, 591, 506, 510, 541, 549, 678, + 560, 529, 515, 515, 515, 549, 681, 515, 515, 515, + 515, 515, 515, 515, 515, 795, 49, 542, 554, 502, + 585, 575, 489, 633, 537, 591, 591, 636, 790, 729, + 559, 716, 762, 707, 624, 512, 781, 730, 640, 584, + 582, 728, 769, 761, 634, 506, 760, 535, 563, 637, + 591, 664, 515, 687, 689, 793, 794, 680, 791, 787, + 767, 580, 558, 792, 674, 759, 635, 632, 612, 786, + 754, 766, 673, 765, 613, 566, 757, 570, 719, 724, + 625, 665, 650, 609, 514, 649, 710, 623, 783, 569, + 782, 789, 622, 621, 442, 645, 444, 620, 711, 546, + 540, 618, 615, 758, 644, 726, 610, 643, 763, 567, + 529, 538, 578, 573, 568, 630, 764, 548, 606, 603, + 534, 594, 669, 543, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 134, 134, 134, 134, -2, -2, -2, 0, 0, + -2, 0, 0, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, @@ -432,273 +499,229 @@ class Php7 extends \PhpParser\ParserAbstract 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 64, 64, 359, 201, 670, 708, 703, - 476, 709, 524, 702, 704, 234, 671, 659, 408, 657, - 656, 655, 654, 705, 730, 585, 706, 418, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 48, 509, 416, 432, 432, 432, 432, - 432, 432, 432, 432, 432, 432, 432, 432, 432, 432, - 432, 432, 432, 432, 432, 160, 160, 160, 343, 210, - 208, 198, 17, 233, 27, 780, 780, 780, 780, 780, - 108, 108, 108, 108, 621, 621, 93, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 614, 616, - 618, 619, 414, 429, 429, 196, 196, 196, 196, 146, - 151, -45, 199, 77, 498, 735, 399, 174, 174, 111, - 207, -22, -22, -22, 275, 517, 514, 514, 514, 514, - 92, 92, 514, 514, 242, -37, 233, 233, 274, 233, - 422, 422, 422, 221, 240, 519, 221, 591, 529, 653, - 527, 649, 273, 31, 32, 484, 94, 543, 496, 94, - 421, 362, 425, 717, 64, 539, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 94, 94, 64, 205, 64, - 387, 359, 383, 489, 502, 209, 595, 339, 241, 133, - 489, 489, 489, 596, 598, 331, 113, 590, 348, 411, - 358, 351, 469, 469, 412, 478, 494, 469, 469, 469, - 469, 508, 469, 678, 678, 682, 412, 469, 678, 412, - 266, 24, 173, 67, 412, 281, 531, 469, 512, 512, - 279, 478, 515, 230, 250, 500, 678, 678, 500, 494, - 56, 412, 26, 565, 567, 493, 537, 39, 400, 400, - 238, 493, 228, 412, 400, 508, 245, 170, 400, 5, - 683, 700, 482, 699, 680, 698, 684, 697, 487, 589, - 491, 513, 692, 691, 696, 470, 485, 681, 679, 562, - 483, 456, 465, 528, 481, 620, 496, 557, 479, 479, - 479, 481, 676, 479, 479, 479, 479, 479, 479, 479, - 479, 729, 252, 538, 497, 486, 553, 525, 458, 608, - 495, 562, 562, 651, 728, 673, 474, 690, 714, 695, - 576, 472, 722, 689, 650, 556, 490, 551, 688, 721, - 713, 604, 456, 712, 652, 492, 562, 648, 479, 674, - 701, 734, 733, 677, 732, 720, 549, 516, 731, 647, - 711, 600, 599, 564, 725, 707, 719, 646, 718, 568, - 521, 727, 522, 685, 501, 686, 592, 645, 643, 299, - 571, 642, 694, 573, 724, 723, 726, 583, 588, 593, - 594, 480, 641, 397, 587, 693, 511, 475, 520, 586, - 477, 710, 635, 613, 687, 584, 561, 634, 632, 715, - 518, 557, 530, 523, 526, 499, 609, 631, 716, 510, - 582, 581, 580, 579, 628, 578, 623, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 134, 134, -2, - -2, -2, 0, 0, 0, 0, -2, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 134, 134, 0, 0, 0, 0, 0, + 134, 134, 134, 134, 134, 134, 561, 561, 561, 561, + 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, + 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 418, 418, 418, -3, 418, 418, -3, - 418, 418, 418, 418, 418, 418, -22, -22, -22, -22, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 49, 49, 49, 49, 221, -22, - -22, 221, 221, 221, 221, 221, 221, 49, 221, 92, - 92, 92, 221, 94, 94, 0, 0, 0, 0, 0, - 469, 92, 221, 221, 221, 221, 0, 0, 221, 221, - 94, 0, 0, 0, 0, 0, 469, 469, 469, 0, - 469, 92, 0, 64, 423, 423, 423, 423, 0, 0, - 0, 469, 0, 469, 515, 0, 0, 0, 0, 412, - 0, 678, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, - 690, 0, 474, 0, 0, 0, 479, 479, 479, 474, - 474, 0, 0, 474 + 0, 0, 0, 0, 0, 0, 561, 561, 561, 561, + 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, + 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, + 561, 561, 561, -3, 561, 561, -3, 561, 561, 561, + 561, 561, 561, -22, -22, -22, -22, 180, 180, 180, + 38, 38, 38, 38, 180, 180, 180, 180, 180, 180, + 180, 180, 180, 180, 180, 180, 180, 180, -22, -22, + 180, 180, 180, 180, 180, 180, 38, 180, 91, 91, + 91, 422, 422, 180, 0, 0, 0, 0, 0, 557, + 91, 180, 180, 180, 180, 0, 0, 180, 180, 565, + 422, 0, 0, 0, 0, 557, 557, 557, 0, 557, + 91, 0, 183, 64, 461, 461, 461, 461, 0, 0, + 0, 557, 0, 565, 557, 0, 0, 0, 0, 0, + 0, 519, 0, 676, 0, 0, 0, 0, 564, 0, + 0, 0, 0, 0, 0, 0, 0, 565, 0, 0, + 0, 0, 565, 0, 515, 0, 559, 0, 0, 515, + 515, 515, 559, 559, 0, 0, 0, 559 ); protected $actionDefault = array( - 3,32767,32767,32767,32767,32767,32767, 88,32767,32767, + 3,32767,32767,32767,32767,32767,32767,32767,32767, 91, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767, 88, 489, 489, 489,32767,32767,32767,32767, 302, - 302, 302,32767, 481, 439, 439, 439, 439, 439, 439, - 439, 481,32767,32767,32767,32767,32767, 381,32767,32767, + 32767,32767,32767,32767, 93, 501, 501, 493,32767, 501, + 493,32767,32767,32767, 311, 311, 311,32767, 448, 448, + 448, 448, 448, 448, 448,32767,32767,32767,32767,32767, + 390,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767,32767, 91, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767, 88,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767, 486,32767,32767,32767, + 498,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767, 364, 365, 367, - 368, 301, 440, 250, 485, 300, 126, 261, 252, 204, - 298, 236, 130, 329, 382, 331, 380, 384, 330, 307, - 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, - 321, 322, 305, 306, 383, 361, 360, 359, 327, 328, - 304, 332, 334, 304, 333, 350, 351, 348, 349, 352, - 353, 354, 355, 356,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767, 88,32767, 284, 284, - 284, 284,32767, 341, 342, 242, 242, 242, 242,32767, - 242, 285,32767,32767,32767,32767,32767,32767,32767, 433, - 358, 336, 337, 335,32767, 411,32767,32767,32767,32767, - 32767, 413,32767, 88,32767,32767, 324, 326, 405, 308, - 32767,32767, 90,32767,32767,32767,32767,32767,32767,32767, - 32767,32767, 408, 441, 441,32767,32767, 88, 399, 88, - 169, 223, 225, 174,32767, 416,32767,32767,32767,32767, + 373, 374, 376, 377, 310, 449, 257, 497, 309, 129, + 268, 259, 210, 307, 242, 133, 338, 391, 340, 389, + 393, 339, 316, 320, 321, 322, 323, 324, 325, 326, + 327, 328, 329, 330, 331, 314, 315, 392, 370, 369, + 368, 336, 337, 313, 341, 343, 313, 342, 359, 360, + 357, 358, 361, 362, 363, 364, 365,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767, 346,32767, 496,32767, 441,32767,32767, - 338, 339, 340,32767,32767, 441, 441,32767, 441,32767, - 441,32767,32767,32767, 174,32767,32767,32767,32767,32767, - 32767,32767, 90, 414, 414, 409, 174,32767,32767, 174, - 87, 87, 87, 87, 174, 87, 187,32767, 185, 185, - 87, 88, 88, 87, 87, 189,32767, 455, 189, 88, - 87, 174, 87, 209, 209, 390, 176, 89, 244, 244, - 89, 390, 87, 174, 244, 88, 87, 87, 244,32767, - 32767,32767, 82,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767,32767, 401, - 32767,32767, 421,32767, 434, 453, 399,32767, 344, 345, - 347,32767, 443, 369, 370, 371, 372, 373, 374, 375, - 377,32767, 482, 404,32767,32767, 84, 117, 260,32767, - 494, 84, 402,32767, 494,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767, 84,32767, 84,32767,32767, - 32767,32767, 478,32767, 441,32767, 403,32767, 343, 417, - 460,32767,32767, 442,32767,32767, 84,32767,32767,32767, - 32767,32767,32767,32767,32767, 421,32767,32767,32767,32767, - 32767, 441,32767,32767,32767,32767,32767,32767,32767, 297, - 32767,32767,32767,32767,32767,32767, 441,32767,32767,32767, - 32767, 235,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767, 93,32767,32767,32767, 350, 351, + 249, 249, 249, 249,32767, 249, 293,32767,32767,32767, + 32767,32767,32767,32767, 442, 367, 345, 346, 344,32767, + 420,32767,32767,32767,32767,32767, 422,32767, 91,32767, + 32767, 333, 335, 414, 317,32767,32767, 93,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767, 417, 450, + 450,32767,32767, 408, 91,32767,32767, 91, 173, 229, + 231, 178,32767, 425,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 82, 60,32767, 278,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767, 132, 132, 3, - 3, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 263, 164, 263, 217, - 263, 263, 220, 209, 209, 270 + 32767,32767,32767,32767, 355, 508,32767, 450,32767, 347, + 348, 349,32767,32767, 450, 450, 450,32767, 450,32767, + 450, 450,32767,32767,32767,32767,32767, 178,32767,32767, + 32767,32767, 93, 423, 423, 91, 91, 91, 91, 418, + 32767, 178,32767,32767,32767,32767,32767, 178, 90, 90, + 90, 90, 178, 90, 193,32767, 191, 191, 90,32767, + 92,32767, 92, 195,32767, 464, 195, 90, 178, 90, + 215, 215, 399, 180, 92, 251, 251, 92, 399, 90, + 178, 251, 90,32767, 90, 251,32767,32767,32767, 84, + 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767, 410,32767, 430,32767, 443, 462, + 408,32767, 353, 354, 356,32767, 452, 378, 379, 380, + 381, 382, 383, 384, 386,32767, 494, 413,32767,32767, + 86, 120, 267,32767, 506, 86, 411,32767, 506,32767, + 32767,32767,32767,32767,32767,32767,32767,32767,32767, 86, + 86,32767,32767,32767,32767, 489,32767, 507,32767, 450, + 412,32767, 352, 426, 469,32767,32767, 451,32767,32767, + 32767, 86,32767,32767,32767,32767,32767,32767,32767,32767, + 430,32767,32767,32767,32767,32767, 450,32767,32767,32767, + 32767,32767,32767,32767, 306,32767,32767,32767,32767,32767, + 32767, 450,32767,32767, 241,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767,32767, 84, + 60,32767, 286,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767, 135, 135, 3, 3, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 270, 168, + 270, 223, 270, 270, 226, 215, 215, 278, 135, 135 ); protected $goto = array( - 163, 163, 136, 136, 136, 146, 148, 179, 164, 161, - 161, 161, 161, 145, 162, 162, 162, 162, 162, 162, - 162, 145, 157, 158, 159, 160, 176, 174, 177, 418, - 419, 313, 420, 423, 424, 425, 426, 427, 428, 429, - 430, 886, 134, 137, 138, 139, 140, 141, 142, 143, - 144, 147, 173, 175, 178, 195, 198, 199, 201, 202, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, - 233, 234, 251, 252, 253, 320, 321, 322, 468, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 149, 194, 150, 165, 166, 167, 196, - 168, 151, 152, 153, 169, 154, 197, 135, 170, 155, - 171, 172, 156, 532, 200, 436, 734, 704, 469, 855, - 545, 279, 200, 524, 853, 470, 710, 667, 5, 462, - 669, 441, 441, 441, 261, 441, 791, 462, 770, 245, - 569, 668, 434, 800, 795, 543, 457, 454, 441, 774, - 572, 490, 492, 518, 522, 788, 527, 528, 802, 535, - 787, 537, 544, 798, 546, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 421, - 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, - 421, 421, 421, 441, 441, 486, 488, 538, 455, 476, - 441, 441, 972, 441, 229, 731, 230, 231, 442, 298, - 301, 448, 471, 472, 474, 766, 310, 541, 466, 485, - 485, 997, 997, 997, 997, 997, 997, 997, 997, 997, - 997, 997, 997, 699, 687, 829, 433, 833, 463, 695, - 1066, 1066, 777, 433, 825, 747, 480, 483, 504, 1059, - 314, 296, 807, 447, 767, 973, 505, 1066, 458, 671, - 768, 768, 768, 768, 870, 1051, 762, 769, 703, 968, - 695, 1069, 695, 974, 1028, 376, 676, 460, 726, 721, - 722, 735, 677, 723, 674, 724, 725, 8, 933, 675, - 810, 729, 1067, 1067, 821, 326, 506, 330, 317, 317, - 266, 267, 283, 464, 269, 325, 284, 328, 491, 1067, - 805, 805, 1056, 467, 479, 814, 1040, 686, 686, 285, - 280, 281, 696, 696, 696, 698, 510, 685, 497, 277, - 691, 523, 307, 688, 830, 312, 556, 969, 964, 512, - 368, 976, 482, 684, 815, 815, 815, 815, 976, 815, - 700, 815, 834, 779, 1037, 815, 384, 872, 0, 863, - 0, 1037, 0, 0, 0, 976, 976, 976, 976, 1048, - 1048, 976, 976, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 742, 0, 0, 743, 1034, 0, 0, 0, + 166, 166, 140, 140, 148, 149, 140, 148, 151, 182, + 167, 164, 164, 164, 164, 165, 165, 165, 165, 165, + 165, 165, 160, 161, 162, 163, 179, 177, 180, 432, + 433, 324, 434, 437, 438, 439, 440, 441, 442, 443, + 444, 899, 137, 141, 142, 143, 144, 145, 139, 146, + 147, 150, 176, 178, 181, 198, 201, 202, 204, 205, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 238, 239, 256, 257, 258, 329, 330, 331, 482, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, + 194, 195, 196, 152, 197, 153, 168, 169, 170, 199, + 171, 154, 155, 156, 172, 157, 200, 138, 173, 158, + 174, 175, 159, 541, 203, 450, 550, 203, 742, 306, + 310, 462, 485, 486, 488, 974, 764, 221, 975, 222, + 223, 455, 455, 455, 484, 455, 483, 867, 553, 501, + 503, 546, 535, 865, 435, 435, 435, 470, 985, 285, + 455, 435, 435, 435, 435, 435, 435, 435, 435, 435, + 435, 435, 435, 435, 436, 436, 436, 7, 702, 498, + 518, 436, 436, 436, 436, 436, 436, 436, 436, 436, + 436, 436, 436, 436, 468, 1082, 1082, 574, 505, 507, + 519, 534, 537, 812, 544, 552, 808, 495, 455, 455, + 702, 675, 1082, 702, 469, 491, 455, 455, 455, 697, + 475, 986, 691, 475, 321, 676, 1085, 266, 711, 323, + 456, 663, 250, 282, 784, 500, 500, 1010, 836, 987, + 1041, 480, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, + 1010, 1010, 1010, 1010, 1010, 706, 694, 840, 1098, 844, + 476, 693, 693, 737, 787, 738, 1075, 703, 703, 703, + 705, 692, 1065, 817, 678, 777, 304, 1083, 1083, 1055, + 1056, 308, 452, 481, 494, 882, 520, 461, 710, 473, + 981, 946, 471, 683, 1083, 733, 728, 729, 743, 820, + 684, 730, 681, 731, 732, 682, 524, 736, 393, 832, + 447, 538, 3, 4, 336, 521, 340, 447, 1054, 291, + 11, 327, 327, 271, 272, 289, 479, 334, 274, 335, + 290, 338, 506, 341, 778, 778, 778, 778, 825, 511, + 772, 779, 698, 286, 287, 452, 776, 318, 549, 283, + 314, 695, 841, 578, 989, 525, 982, 826, 826, 826, + 826, 989, 826, 707, 826, 977, 497, 1060, 1060, 845, + 826, 789, 386, 884, 401, 0, 1051, 0, 989, 989, + 989, 989, 0, 1051, 989, 989, 0, 0, 674, 0, + 1062, 1062, 984, 0, 0, 750, 0, 0, 751, 801, + 782, 782, 780, 782, 571, 0, 448, 810, 805, 1047, + 815, 815, 1072, 875, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 467, 0, 0, 0, 0, 0, + 0, 843, 0, 0, 1049, 1049, 843, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 832, 0, - 0, 832, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1041, 1042 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 449, 465, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 449, 0, 465, 0, 0, 307, 0, 453, 374, + 0, 376, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 701, 0, 1090 ); protected $gotoCheck = array( - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 60, 53, 8, 10, 33, 7, 7, - 7, 76, 53, 7, 7, 93, 13, 13, 106, 81, - 15, 8, 8, 8, 128, 8, 13, 81, 13, 128, - 13, 14, 13, 13, 13, 5, 8, 36, 8, 37, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 131, 131, 131, 131, 131, - 131, 131, 131, 131, 131, 131, 131, 131, 131, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 8, 8, 64, 64, 64, 8, 8, - 8, 8, 88, 8, 69, 52, 69, 69, 8, 46, - 46, 46, 46, 46, 46, 72, 72, 72, 8, 82, - 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 82, 82, 11, 11, 11, 71, 11, 130, 23, - 139, 139, 11, 71, 90, 11, 11, 43, 43, 138, - 62, 49, 11, 62, 11, 88, 51, 139, 62, 10, - 71, 71, 71, 71, 11, 136, 71, 71, 11, 11, - 23, 139, 23, 88, 88, 62, 10, 50, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 62, 112, 10, - 84, 10, 140, 140, 86, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 140, - 81, 81, 81, 2, 2, 87, 133, 23, 23, 17, - 76, 76, 23, 23, 23, 23, 65, 23, 21, 9, - 27, 65, 16, 25, 92, 65, 78, 121, 118, 20, - 67, 60, 68, 12, 60, 60, 60, 60, 60, 60, - 29, 60, 95, 75, 93, 60, 116, 109, -1, 106, - -1, 93, -1, -1, -1, 60, 60, 60, 60, 93, - 93, 60, 60, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 60, -1, -1, 60, 93, -1, -1, -1, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 63, 56, 10, 8, 56, 13, 49, + 49, 49, 49, 49, 49, 67, 67, 73, 67, 73, + 73, 10, 10, 10, 97, 10, 7, 7, 7, 68, + 68, 68, 7, 7, 134, 134, 134, 10, 92, 80, + 10, 134, 134, 134, 134, 134, 134, 134, 134, 134, + 134, 134, 134, 134, 136, 136, 136, 110, 26, 46, + 46, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 39, 145, 145, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 15, 10, 10, + 26, 17, 145, 26, 10, 10, 10, 10, 10, 15, + 85, 92, 15, 85, 69, 18, 145, 133, 36, 69, + 10, 5, 133, 69, 40, 86, 86, 86, 94, 92, + 92, 10, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 14, 14, 14, 12, 14, + 135, 26, 26, 55, 14, 55, 144, 26, 26, 26, + 26, 26, 142, 14, 13, 14, 52, 146, 146, 140, + 140, 65, 12, 2, 2, 14, 54, 65, 14, 53, + 14, 117, 65, 13, 146, 13, 13, 13, 13, 88, + 13, 13, 13, 13, 13, 13, 12, 13, 65, 90, + 75, 12, 37, 37, 56, 56, 56, 75, 138, 20, + 65, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 75, 75, 75, 75, 91, 24, + 75, 75, 30, 80, 80, 12, 76, 76, 76, 11, + 19, 28, 96, 82, 63, 23, 126, 63, 63, 63, + 63, 63, 63, 32, 63, 123, 72, 8, 8, 99, + 63, 79, 71, 113, 121, -1, 97, -1, 63, 63, + 63, 63, -1, 97, 63, 63, -1, -1, 16, -1, + 97, 97, 12, -1, -1, 63, -1, -1, 63, 16, + 16, 16, 16, 16, 16, -1, 16, 16, 16, 97, + 85, 85, 85, 110, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 8, -1, -1, -1, -1, -1, + -1, 97, -1, -1, 97, 97, 97, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 93, -1, - -1, 93, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 93, 93 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 8, 8, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 8, -1, 8, -1, -1, 8, -1, 8, 8, + -1, 8, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 8, -1, 8 ); protected $gotoBase = array( - 0, 0, -236, 0, 0, 135, 0, 115, -139, 55, - -18, -118, -37, 125, 139, 128, 47, 65, 0, 0, - 6, 57, 0, -15, 0, 46, 0, 58, 0, -11, - -20, 0, 0, 110, 0, 0, -401, 133, 0, 0, - 0, 0, 0, 217, 0, 0, 174, 0, 0, 219, - 59, 41, 191, 81, 0, 0, 0, 0, 0, 0, - 109, 0, -96, 0, -41, -53, 0, -19, -26, -364, - 0, 4, -42, 0, 0, -16, -253, 0, 25, 0, - 0, 96, 5, 0, 50, 0, 52, 69, -93, 0, - 223, 0, 45, 122, 0, -10, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 118, 0, 0, -28, - 0, 0, 49, 0, 0, 0, -25, 0, -6, 0, - 0, 3, 0, 0, 0, 0, 0, 0, -121, -35, - 215, -49, 0, 68, 0, 0, 224, 0, 225, -4, - 48, 0, 0 + 0, 0, -283, 0, 0, 211, 0, 131, 106, 0, + -144, 60, -21, -19, -124, -185, 376, 199, 213, 49, + 50, 0, 0, 2, 53, 0, -91, 0, 47, 0, + 55, 0, -2, -23, 0, 0, 209, -276, 0, -371, + 205, 0, 0, 0, 0, 0, 134, 0, 0, 80, + 0, 0, 229, 54, 58, 238, 87, 0, 0, 0, + 0, 0, 0, 107, 0, -90, 0, -195, -102, -182, + 0, -15, -30, -443, 0, 63, 74, 0, 0, 4, + -242, 0, 24, 0, 0, 183, 8, 0, 44, 0, + 52, 75, -155, 0, 204, 0, 45, 129, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 157, 0, 0, 5, 0, 0, 0, 37, 0, 0, + 0, -34, 0, 1, 0, 0, -1, 0, 0, 0, + 0, 0, 0, -43, -73, 224, -53, 0, 56, 0, + -26, 0, 232, 0, 227, -64, 18, 0, 0 ); protected $gotoDefault = array( - -32768, 389, 577, 2, 578, 649, 657, 513, 409, 437, - 728, 875, 690, 772, 711, 712, 302, 340, 294, 300, - 498, 487, 380, 697, 352, 689, 377, 692, 351, 701, - 133, 514, 386, 705, 1, 707, 443, 738, 291, 715, - 292, 517, 717, 450, 719, 720, 297, 303, 304, 879, - 459, 484, 730, 203, 452, 732, 290, 733, 741, 331, - 295, 363, 520, 494, 475, 509, 410, 365, 481, 228, - 461, 983, 764, 372, 360, 778, 278, 786, 561, 794, - 797, 411, 412, 370, 809, 371, 819, 813, 991, 364, - 824, 353, 831, 1023, 355, 835, 838, 341, 500, 329, - 842, 843, 4, 847, 533, 534, 862, 241, 382, 871, - 350, 885, 344, 952, 954, 445, 379, 965, 359, 521, - 387, 970, 1027, 348, 413, 366, 268, 282, 244, 414, - 431, 249, 415, 367, 1030, 318, 1052, 432, 1060, 1068, - 275, 315, 478 + -32768, 406, 581, 2, 582, 653, 661, 526, 423, 551, + 424, 451, 325, 735, 888, 755, 717, 718, 719, 311, + 351, 302, 309, 512, 502, 397, 704, 370, 696, 394, + 699, 369, 708, 136, 527, 402, 712, 1, 714, 457, + 746, 299, 722, 300, 530, 724, 464, 726, 727, 305, + 312, 313, 892, 472, 499, 739, 206, 466, 740, 298, + 741, 749, 322, 303, 380, 403, 317, 869, 490, 320, + 365, 383, 496, 220, 474, 996, 774, 389, 378, 788, + 284, 796, 579, 804, 807, 425, 426, 387, 819, 388, + 830, 824, 1004, 382, 835, 371, 842, 1036, 373, 846, + 849, 346, 513, 339, 853, 854, 6, 859, 542, 543, + 874, 246, 399, 883, 514, 368, 898, 354, 965, 967, + 459, 395, 978, 377, 533, 404, 983, 1040, 366, 427, + 384, 273, 288, 249, 428, 445, 254, 429, 385, 1043, + 1050, 328, 1066, 446, 1076, 1084, 280, 478, 493 ); protected $ruleToNonTerminal = array( @@ -710,49 +733,50 @@ class Php7 extends \PhpParser\ParserAbstract 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 8, 8, 9, 10, 10, 11, 11, 12, - 12, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 17, 17, 18, 18, 18, 18, 20, 22, - 22, 16, 24, 24, 21, 26, 26, 23, 23, 25, - 25, 27, 27, 19, 28, 28, 29, 31, 32, 32, - 33, 34, 34, 36, 35, 35, 35, 35, 37, 37, - 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, - 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, - 37, 37, 13, 13, 56, 56, 59, 59, 58, 57, - 57, 50, 61, 61, 62, 62, 63, 63, 14, 15, - 15, 15, 66, 66, 66, 67, 67, 70, 70, 68, - 68, 72, 73, 73, 44, 44, 52, 52, 55, 55, - 55, 54, 74, 74, 75, 45, 45, 45, 45, 76, - 76, 77, 77, 78, 78, 42, 42, 38, 38, 79, - 40, 40, 80, 39, 39, 41, 41, 51, 51, 51, - 51, 64, 64, 83, 83, 84, 84, 86, 86, 87, - 87, 87, 85, 85, 65, 65, 88, 88, 89, 89, - 90, 90, 90, 47, 91, 91, 92, 48, 94, 94, - 95, 95, 69, 69, 96, 96, 96, 96, 101, 101, - 102, 102, 103, 103, 103, 103, 103, 104, 105, 105, - 100, 100, 97, 97, 99, 99, 107, 107, 106, 106, - 106, 106, 106, 106, 98, 108, 108, 109, 109, 49, - 110, 110, 43, 43, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 117, 111, 111, - 116, 116, 119, 120, 120, 121, 122, 122, 122, 71, - 71, 60, 60, 60, 112, 112, 112, 124, 124, 113, - 113, 115, 115, 115, 118, 118, 129, 129, 129, 82, - 131, 131, 131, 114, 114, 114, 114, 114, 114, 114, - 114, 114, 114, 114, 114, 114, 114, 114, 114, 46, - 46, 127, 127, 127, 123, 123, 123, 132, 132, 132, - 132, 132, 132, 53, 53, 53, 93, 93, 93, 93, - 134, 126, 126, 126, 126, 126, 126, 125, 125, 125, - 133, 133, 133, 133, 81, 135, 135, 136, 136, 136, - 136, 136, 130, 137, 137, 138, 138, 138, 138, 138, - 128, 128, 128, 128, 140, 141, 139, 139, 139, 139, - 139, 139, 139, 142, 142, 142, 142 + 7, 7, 8, 9, 10, 10, 11, 12, 13, 13, + 14, 14, 15, 15, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 20, 20, 21, 21, 21, + 21, 23, 25, 25, 19, 27, 27, 24, 29, 29, + 26, 26, 28, 28, 30, 30, 22, 31, 31, 32, + 34, 35, 35, 36, 37, 37, 39, 38, 38, 38, + 38, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 16, 16, 59, 59, + 62, 62, 61, 60, 60, 53, 64, 64, 65, 65, + 66, 66, 67, 67, 17, 18, 18, 18, 70, 70, + 70, 71, 71, 74, 74, 72, 72, 76, 77, 77, + 47, 47, 55, 55, 58, 58, 58, 57, 78, 78, + 79, 48, 48, 48, 48, 80, 80, 81, 81, 82, + 82, 45, 45, 41, 41, 83, 43, 43, 84, 42, + 42, 44, 44, 54, 54, 54, 54, 68, 68, 87, + 87, 88, 88, 88, 90, 90, 91, 91, 91, 89, + 89, 69, 69, 92, 92, 93, 93, 94, 94, 94, + 50, 95, 95, 96, 51, 98, 98, 99, 99, 73, + 73, 100, 100, 100, 100, 100, 105, 105, 106, 106, + 107, 107, 107, 107, 107, 108, 109, 109, 104, 104, + 101, 101, 103, 103, 111, 111, 110, 110, 110, 110, + 110, 110, 102, 112, 112, 114, 113, 113, 52, 115, + 115, 46, 46, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 122, 116, 116, 121, + 121, 124, 125, 125, 126, 127, 127, 127, 75, 75, + 63, 63, 63, 117, 117, 117, 129, 129, 118, 118, + 120, 120, 120, 123, 123, 134, 134, 134, 86, 136, + 136, 136, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 49, 49, + 132, 132, 132, 128, 128, 128, 137, 137, 137, 137, + 137, 137, 56, 56, 56, 97, 97, 97, 97, 140, + 139, 131, 131, 131, 131, 131, 131, 130, 130, 130, + 138, 138, 138, 138, 85, 141, 141, 142, 142, 142, + 142, 142, 142, 142, 135, 143, 143, 144, 144, 144, + 144, 144, 133, 133, 133, 133, 146, 147, 145, 145, + 145, 145, 145, 145, 145, 148, 148, 148, 148 ); protected $ruleToLength = array( @@ -764,2105 +788,1640 @@ class Php7 extends \PhpParser\ParserAbstract 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 1, 1, 1, 0, 1, 0, - 1, 1, 1, 1, 1, 3, 5, 4, 3, 4, - 2, 3, 1, 1, 7, 8, 6, 7, 2, 3, - 1, 2, 3, 1, 2, 3, 1, 1, 3, 1, - 2, 1, 2, 2, 3, 1, 3, 2, 3, 1, - 3, 2, 0, 1, 1, 1, 1, 1, 3, 7, - 10, 5, 7, 9, 5, 3, 3, 3, 3, 3, - 3, 1, 2, 5, 7, 9, 5, 6, 3, 3, - 2, 1, 1, 1, 0, 2, 1, 3, 8, 0, - 4, 2, 1, 3, 0, 1, 0, 1, 10, 7, - 6, 5, 1, 2, 2, 0, 2, 0, 2, 0, - 2, 2, 1, 3, 1, 4, 1, 4, 1, 1, - 4, 2, 1, 3, 3, 3, 4, 4, 5, 0, - 2, 4, 3, 1, 1, 1, 4, 0, 2, 5, - 0, 2, 6, 0, 2, 0, 3, 1, 2, 1, - 1, 2, 0, 1, 3, 4, 6, 1, 2, 1, - 1, 1, 0, 1, 0, 2, 2, 4, 1, 3, - 1, 2, 2, 2, 3, 1, 1, 2, 3, 1, - 1, 3, 2, 0, 3, 4, 9, 3, 1, 3, - 0, 2, 4, 5, 4, 4, 4, 3, 1, 1, - 1, 3, 1, 1, 0, 1, 1, 2, 1, 1, - 1, 1, 1, 1, 2, 1, 3, 1, 3, 2, - 3, 1, 0, 1, 1, 3, 3, 3, 4, 1, - 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, + 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, + 0, 1, 0, 1, 1, 1, 1, 1, 3, 5, + 4, 3, 4, 2, 3, 1, 1, 7, 8, 6, + 7, 2, 3, 1, 2, 3, 1, 2, 3, 1, + 1, 3, 1, 2, 1, 2, 2, 3, 1, 3, + 2, 3, 1, 3, 2, 0, 1, 1, 1, 1, + 1, 3, 7, 10, 5, 7, 9, 5, 3, 3, + 3, 3, 3, 3, 1, 2, 5, 7, 9, 6, + 5, 6, 3, 3, 2, 1, 1, 1, 0, 2, + 1, 3, 8, 0, 4, 2, 1, 3, 0, 1, + 0, 1, 3, 1, 8, 7, 6, 5, 1, 2, + 2, 0, 2, 0, 2, 0, 2, 2, 1, 3, + 1, 4, 1, 4, 1, 1, 4, 2, 1, 3, + 3, 3, 4, 4, 5, 0, 2, 4, 3, 1, + 1, 1, 4, 0, 2, 5, 0, 2, 6, 0, + 2, 0, 3, 1, 2, 1, 1, 2, 0, 1, + 3, 4, 6, 4, 1, 2, 1, 1, 1, 0, + 1, 0, 2, 2, 4, 1, 3, 1, 2, 2, + 2, 3, 1, 1, 2, 3, 1, 1, 3, 2, + 0, 3, 4, 9, 3, 1, 1, 3, 0, 2, + 4, 5, 4, 4, 4, 3, 1, 1, 1, 1, + 1, 1, 0, 1, 1, 2, 1, 1, 1, 1, + 1, 1, 2, 1, 3, 1, 1, 3, 2, 3, + 1, 0, 1, 1, 3, 3, 3, 4, 1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 2, 2, 2, 2, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, - 4, 3, 4, 4, 2, 2, 4, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 1, 3, - 2, 1, 2, 4, 2, 10, 11, 7, 3, 2, - 0, 4, 2, 1, 3, 2, 2, 2, 4, 1, - 1, 1, 2, 3, 1, 1, 1, 1, 1, 0, - 3, 0, 1, 1, 0, 1, 1, 3, 3, 3, - 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 2, 3, 3, 0, - 1, 1, 3, 1, 1, 3, 1, 1, 4, 4, - 4, 1, 4, 1, 1, 3, 1, 4, 2, 2, + 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 5, 4, + 3, 4, 4, 2, 2, 4, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 1, 3, 2, + 1, 2, 4, 2, 8, 9, 7, 3, 2, 0, + 4, 2, 1, 3, 2, 2, 2, 4, 1, 1, + 1, 2, 3, 1, 1, 1, 1, 1, 0, 3, + 0, 1, 1, 0, 1, 1, 3, 3, 3, 4, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 2, 3, 3, 0, 1, + 1, 3, 1, 1, 3, 1, 1, 4, 4, 4, + 1, 4, 1, 1, 3, 1, 4, 2, 2, 1, 3, 1, 4, 4, 3, 3, 3, 1, 3, 1, - 1, 3, 1, 1, 4, 3, 1, 1, 1, 3, - 3, 0, 1, 3, 1, 3, 1, 4, 2, 0, - 2, 2, 1, 2, 1, 1, 1, 4, 3, 3, - 3, 6, 3, 1, 1, 2, 1 + 1, 3, 1, 1, 4, 3, 1, 1, 2, 1, + 3, 4, 3, 0, 1, 3, 1, 3, 1, 4, + 2, 0, 2, 2, 1, 2, 1, 1, 1, 4, + 3, 3, 3, 6, 3, 1, 1, 2, 1 ); - protected function reduceRule0() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule1() { - $this->semValue = $this->handleNamespaces($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule2() { - if (is_array($this->semStack[$this->stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); } else { $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; }; - } - - protected function reduceRule3() { - $this->semValue = array(); - } - - protected function reduceRule4() { - $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $nop = null; }; - if ($nop !== null) { $this->semStack[$this->stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule5() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule6() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule7() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule8() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule9() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule10() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule11() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule12() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule13() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule14() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule15() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule16() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule17() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule18() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule19() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule20() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule21() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule22() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule23() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule24() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule25() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule26() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule27() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule28() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule29() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule30() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule31() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule32() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule33() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule34() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule35() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule36() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule37() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule38() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule39() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule40() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule41() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule42() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule43() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule44() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule45() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule46() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule47() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule48() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule49() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule50() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule51() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule52() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule53() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule54() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule55() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule56() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule57() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule58() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule59() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule60() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule61() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule62() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule63() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule64() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule65() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule66() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule67() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule68() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule69() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule70() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule71() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule72() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule73() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule74() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule75() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule76() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule77() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule78() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule79() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule80() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule81() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule82() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule83() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule84() { - $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule85() { - /* nothing */ - } - - protected function reduceRule86() { - /* nothing */ - } - - protected function reduceRule87() { - /* nothing */ - } - - protected function reduceRule88() { - $this->emitError(new Error('A trailing comma is not allowed here', $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes)); - } - - protected function reduceRule89() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule90() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule91() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule92() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule93() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule94() { - $this->semValue = new Stmt\HaltCompiler($this->lexer->handleHaltCompiler(), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule95() { - $this->semValue = new Stmt\Namespace_($this->semStack[$this->stackPos-(3-2)], null, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); + protected function initReduceCallbacks() { + $this->reduceCallbacks = [ + 0 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 1 => function ($stackPos) { + $this->semValue = $this->handleNamespaces($this->semStack[$stackPos-(1-1)]); + }, + 2 => function ($stackPos) { + if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }; + }, + 3 => function ($stackPos) { + $this->semValue = array(); + }, + 4 => function ($stackPos) { + $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $nop = null; }; + if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 5 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 6 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 7 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 8 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 9 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 10 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 11 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 12 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 13 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 14 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 15 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 16 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 17 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 18 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 19 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 20 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 21 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 22 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 23 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 24 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 25 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 26 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 27 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 28 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 29 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 30 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 31 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 32 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 33 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 34 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 35 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 36 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 37 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 38 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 39 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 40 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 41 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 42 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 43 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 44 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 45 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 46 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 47 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 48 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 49 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 50 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 51 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 52 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 53 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 54 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 55 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 56 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 57 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 58 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 59 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 60 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 61 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 62 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 63 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 64 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 65 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 66 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 67 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 68 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 69 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 70 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 71 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 72 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 73 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 74 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 75 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 76 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 77 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 78 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 79 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 80 => function ($stackPos) { + $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 81 => function ($stackPos) { + $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 82 => function ($stackPos) { + $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 83 => function ($stackPos) { + $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 84 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 85 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 86 => function ($stackPos) { + $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 87 => function ($stackPos) { + $this->semValue = new Expr\Variable(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 88 => function ($stackPos) { + /* nothing */ + }, + 89 => function ($stackPos) { + /* nothing */ + }, + 90 => function ($stackPos) { + /* nothing */ + }, + 91 => function ($stackPos) { + $this->emitError(new Error('A trailing comma is not allowed here', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes)); + }, + 92 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 93 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 94 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 95 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 96 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 97 => function ($stackPos) { + $this->semValue = new Stmt\HaltCompiler($this->lexer->handleHaltCompiler(), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 98 => function ($stackPos) { + $this->semValue = new Stmt\Namespace_($this->semStack[$stackPos-(3-2)], null, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_SEMICOLON); $this->checkNamespace($this->semValue); - } - - protected function reduceRule96() { - $this->semValue = new Stmt\Namespace_($this->semStack[$this->stackPos-(5-2)], $this->semStack[$this->stackPos-(5-4)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); + }, + 99 => function ($stackPos) { + $this->semValue = new Stmt\Namespace_($this->semStack[$stackPos-(5-2)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_BRACED); $this->checkNamespace($this->semValue); - } - - protected function reduceRule97() { - $this->semValue = new Stmt\Namespace_(null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); + }, + 100 => function ($stackPos) { + $this->semValue = new Stmt\Namespace_(null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_BRACED); $this->checkNamespace($this->semValue); - } + }, + 101 => function ($stackPos) { + $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(3-2)], Stmt\Use_::TYPE_NORMAL, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 102 => function ($stackPos) { + $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 103 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 104 => function ($stackPos) { + $this->semValue = new Stmt\Const_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 105 => function ($stackPos) { + $this->semValue = Stmt\Use_::TYPE_FUNCTION; + }, + 106 => function ($stackPos) { + $this->semValue = Stmt\Use_::TYPE_CONSTANT; + }, + 107 => function ($stackPos) { + $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$stackPos-(7-3)], $this->startAttributeStack[$stackPos-(7-3)] + $this->endAttributeStack[$stackPos-(7-3)]), $this->semStack[$stackPos-(7-6)], $this->semStack[$stackPos-(7-2)], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + }, + 108 => function ($stackPos) { + $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$stackPos-(8-4)], $this->startAttributeStack[$stackPos-(8-4)] + $this->endAttributeStack[$stackPos-(8-4)]), $this->semStack[$stackPos-(8-7)], $this->semStack[$stackPos-(8-2)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes); + }, + 109 => function ($stackPos) { + $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$stackPos-(6-2)], $this->startAttributeStack[$stackPos-(6-2)] + $this->endAttributeStack[$stackPos-(6-2)]), $this->semStack[$stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + }, + 110 => function ($stackPos) { + $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$stackPos-(7-3)], $this->startAttributeStack[$stackPos-(7-3)] + $this->endAttributeStack[$stackPos-(7-3)]), $this->semStack[$stackPos-(7-6)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + }, + 111 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 112 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 113 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 114 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 115 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 116 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 117 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 118 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 119 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 120 => function ($stackPos) { + $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(1-1)); + }, + 121 => function ($stackPos) { + $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(3-3)); + }, + 122 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 123 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 124 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; $this->semValue->type = Stmt\Use_::TYPE_NORMAL; + }, + 125 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; $this->semValue->type = $this->semStack[$stackPos-(2-1)]; + }, + 126 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 127 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 128 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 129 => function ($stackPos) { + $this->semValue = new Node\Const_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 130 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 131 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 132 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 133 => function ($stackPos) { + $this->semValue = new Node\Const_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 134 => function ($stackPos) { + if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }; + }, + 135 => function ($stackPos) { + $this->semValue = array(); + }, + 136 => function ($stackPos) { + $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $nop = null; }; + if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 137 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 138 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 139 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 140 => function ($stackPos) { + throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 141 => function ($stackPos) { - protected function reduceRule98() { - $this->semValue = new Stmt\Use_($this->semStack[$this->stackPos-(3-2)], Stmt\Use_::TYPE_NORMAL, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule99() { - $this->semValue = new Stmt\Use_($this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-2)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule100() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule101() { - $this->semValue = new Stmt\Const_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule102() { - $this->semValue = Stmt\Use_::TYPE_FUNCTION; - } - - protected function reduceRule103() { - $this->semValue = Stmt\Use_::TYPE_CONSTANT; - } - - protected function reduceRule104() { - $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(7-3)], $this->startAttributeStack[$this->stackPos-(7-3)] + $this->endAttributeStack[$this->stackPos-(7-3)]), $this->semStack[$this->stackPos-(7-6)], $this->semStack[$this->stackPos-(7-2)], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - } - - protected function reduceRule105() { - $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(8-4)], $this->startAttributeStack[$this->stackPos-(8-4)] + $this->endAttributeStack[$this->stackPos-(8-4)]), $this->semStack[$this->stackPos-(8-7)], $this->semStack[$this->stackPos-(8-2)], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes); - } - - protected function reduceRule106() { - $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-2)] + $this->endAttributeStack[$this->stackPos-(6-2)]), $this->semStack[$this->stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - } - - protected function reduceRule107() { - $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(7-3)], $this->startAttributeStack[$this->stackPos-(7-3)] + $this->endAttributeStack[$this->stackPos-(7-3)]), $this->semStack[$this->stackPos-(7-6)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - } - - protected function reduceRule108() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule109() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule110() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule111() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule112() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule113() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule114() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule115() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule116() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule117() { - $this->semValue = new Stmt\UseUse($this->semStack[$this->stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $this->stackPos-(1-1)); - } - - protected function reduceRule118() { - $this->semValue = new Stmt\UseUse($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $this->stackPos-(3-3)); - } - - protected function reduceRule119() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule120() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule121() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; $this->semValue->type = Stmt\Use_::TYPE_NORMAL; - } - - protected function reduceRule122() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; $this->semValue->type = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule123() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule124() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule125() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule126() { - $this->semValue = new Node\Const_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule127() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule128() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule129() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule130() { - $this->semValue = new Node\Const_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule131() { - if (is_array($this->semStack[$this->stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); } else { $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; }; - } - - protected function reduceRule132() { - $this->semValue = array(); - } - - protected function reduceRule133() { - $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $nop = null; }; - if ($nop !== null) { $this->semStack[$this->stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule134() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule135() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule136() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule137() { - throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule138() { - - if ($this->semStack[$this->stackPos-(3-2)]) { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; $attrs = $this->startAttributeStack[$this->stackPos-(3-1)]; $stmts = $this->semValue; if (!empty($attrs['comments'])) {$stmts[0]->setAttribute('comments', array_merge($attrs['comments'], $stmts[0]->getAttribute('comments', []))); }; + if ($this->semStack[$stackPos-(3-2)]) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; $attrs = $this->startAttributeStack[$stackPos-(3-1)]; $stmts = $this->semValue; if (!empty($attrs['comments'])) {$stmts[0]->setAttribute('comments', array_merge($attrs['comments'], $stmts[0]->getAttribute('comments', []))); }; } else { - $startAttributes = $this->startAttributeStack[$this->stackPos-(3-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $this->semValue = null; }; + $startAttributes = $this->startAttributeStack[$stackPos-(3-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; }; if (null === $this->semValue) { $this->semValue = array(); } } - } - - protected function reduceRule139() { - $this->semValue = new Stmt\If_($this->semStack[$this->stackPos-(7-3)], ['stmts' => is_array($this->semStack[$this->stackPos-(7-5)]) ? $this->semStack[$this->stackPos-(7-5)] : array($this->semStack[$this->stackPos-(7-5)]), 'elseifs' => $this->semStack[$this->stackPos-(7-6)], 'else' => $this->semStack[$this->stackPos-(7-7)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - } - - protected function reduceRule140() { - $this->semValue = new Stmt\If_($this->semStack[$this->stackPos-(10-3)], ['stmts' => $this->semStack[$this->stackPos-(10-6)], 'elseifs' => $this->semStack[$this->stackPos-(10-7)], 'else' => $this->semStack[$this->stackPos-(10-8)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes); - } - - protected function reduceRule141() { - $this->semValue = new Stmt\While_($this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule142() { - $this->semValue = new Stmt\Do_($this->semStack[$this->stackPos-(7-5)], is_array($this->semStack[$this->stackPos-(7-2)]) ? $this->semStack[$this->stackPos-(7-2)] : array($this->semStack[$this->stackPos-(7-2)]), $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - } - - protected function reduceRule143() { - $this->semValue = new Stmt\For_(['init' => $this->semStack[$this->stackPos-(9-3)], 'cond' => $this->semStack[$this->stackPos-(9-5)], 'loop' => $this->semStack[$this->stackPos-(9-7)], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes); - } - - protected function reduceRule144() { - $this->semValue = new Stmt\Switch_($this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule145() { - $this->semValue = new Stmt\Break_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule146() { - $this->semValue = new Stmt\Continue_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule147() { - $this->semValue = new Stmt\Return_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule148() { - $this->semValue = new Stmt\Global_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule149() { - $this->semValue = new Stmt\Static_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule150() { - $this->semValue = new Stmt\Echo_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule151() { - $this->semValue = new Stmt\InlineHTML($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule152() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule153() { - $this->semValue = new Stmt\Unset_($this->semStack[$this->stackPos-(5-3)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule154() { - $this->semValue = new Stmt\Foreach_($this->semStack[$this->stackPos-(7-3)], $this->semStack[$this->stackPos-(7-5)][0], ['keyVar' => null, 'byRef' => $this->semStack[$this->stackPos-(7-5)][1], 'stmts' => $this->semStack[$this->stackPos-(7-7)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - } - - protected function reduceRule155() { - $this->semValue = new Stmt\Foreach_($this->semStack[$this->stackPos-(9-3)], $this->semStack[$this->stackPos-(9-7)][0], ['keyVar' => $this->semStack[$this->stackPos-(9-5)], 'byRef' => $this->semStack[$this->stackPos-(9-7)][1], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes); - } - - protected function reduceRule156() { - $this->semValue = new Stmt\Declare_($this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule157() { - $this->semValue = new Stmt\TryCatch($this->semStack[$this->stackPos-(6-3)], $this->semStack[$this->stackPos-(6-5)], $this->semStack[$this->stackPos-(6-6)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); $this->checkTryCatch($this->semValue); - } - - protected function reduceRule158() { - $this->semValue = new Stmt\Throw_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule159() { - $this->semValue = new Stmt\Goto_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule160() { - $this->semValue = new Stmt\Label($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule161() { - $this->semValue = array(); /* means: no statement */ - } - - protected function reduceRule162() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule163() { - $startAttributes = $this->startAttributeStack[$this->stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $this->semValue = null; }; + }, + 142 => function ($stackPos) { + $this->semValue = new Stmt\If_($this->semStack[$stackPos-(7-3)], ['stmts' => is_array($this->semStack[$stackPos-(7-5)]) ? $this->semStack[$stackPos-(7-5)] : array($this->semStack[$stackPos-(7-5)]), 'elseifs' => $this->semStack[$stackPos-(7-6)], 'else' => $this->semStack[$stackPos-(7-7)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + }, + 143 => function ($stackPos) { + $this->semValue = new Stmt\If_($this->semStack[$stackPos-(10-3)], ['stmts' => $this->semStack[$stackPos-(10-6)], 'elseifs' => $this->semStack[$stackPos-(10-7)], 'else' => $this->semStack[$stackPos-(10-8)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes); + }, + 144 => function ($stackPos) { + $this->semValue = new Stmt\While_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 145 => function ($stackPos) { + $this->semValue = new Stmt\Do_($this->semStack[$stackPos-(7-5)], is_array($this->semStack[$stackPos-(7-2)]) ? $this->semStack[$stackPos-(7-2)] : array($this->semStack[$stackPos-(7-2)]), $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + }, + 146 => function ($stackPos) { + $this->semValue = new Stmt\For_(['init' => $this->semStack[$stackPos-(9-3)], 'cond' => $this->semStack[$stackPos-(9-5)], 'loop' => $this->semStack[$stackPos-(9-7)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); + }, + 147 => function ($stackPos) { + $this->semValue = new Stmt\Switch_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 148 => function ($stackPos) { + $this->semValue = new Stmt\Break_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 149 => function ($stackPos) { + $this->semValue = new Stmt\Continue_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 150 => function ($stackPos) { + $this->semValue = new Stmt\Return_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 151 => function ($stackPos) { + $this->semValue = new Stmt\Global_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 152 => function ($stackPos) { + $this->semValue = new Stmt\Static_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 153 => function ($stackPos) { + $this->semValue = new Stmt\Echo_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 154 => function ($stackPos) { + $this->semValue = new Stmt\InlineHTML($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 155 => function ($stackPos) { + $this->semValue = new Stmt\Expression($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 156 => function ($stackPos) { + $this->semValue = new Stmt\Unset_($this->semStack[$stackPos-(5-3)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 157 => function ($stackPos) { + $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-5)][0], ['keyVar' => null, 'byRef' => $this->semStack[$stackPos-(7-5)][1], 'stmts' => $this->semStack[$stackPos-(7-7)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + }, + 158 => function ($stackPos) { + $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(9-3)], $this->semStack[$stackPos-(9-7)][0], ['keyVar' => $this->semStack[$stackPos-(9-5)], 'byRef' => $this->semStack[$stackPos-(9-7)][1], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); + }, + 159 => function ($stackPos) { + $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(6-3)], new Expr\Error($this->startAttributeStack[$stackPos-(6-4)] + $this->endAttributeStack[$stackPos-(6-4)]), ['stmts' => $this->semStack[$stackPos-(6-6)]], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + }, + 160 => function ($stackPos) { + $this->semValue = new Stmt\Declare_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 161 => function ($stackPos) { + $this->semValue = new Stmt\TryCatch($this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-5)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->checkTryCatch($this->semValue); + }, + 162 => function ($stackPos) { + $this->semValue = new Stmt\Throw_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 163 => function ($stackPos) { + $this->semValue = new Stmt\Goto_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 164 => function ($stackPos) { + $this->semValue = new Stmt\Label($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 165 => function ($stackPos) { + $this->semValue = array(); /* means: no statement */ + }, + 166 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 167 => function ($stackPos) { + $startAttributes = $this->startAttributeStack[$stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; }; if ($this->semValue === null) $this->semValue = array(); /* means: no statement */ - } - - protected function reduceRule164() { - $this->semValue = array(); - } - - protected function reduceRule165() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule166() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule167() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule168() { - $this->semValue = new Stmt\Catch_($this->semStack[$this->stackPos-(8-3)], substr($this->semStack[$this->stackPos-(8-4)], 1), $this->semStack[$this->stackPos-(8-7)], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes); - } - - protected function reduceRule169() { - $this->semValue = null; - } - - protected function reduceRule170() { - $this->semValue = new Stmt\Finally_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule171() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule172() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule173() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule174() { - $this->semValue = false; - } - - protected function reduceRule175() { - $this->semValue = true; - } - - protected function reduceRule176() { - $this->semValue = false; - } - - protected function reduceRule177() { - $this->semValue = true; - } - - protected function reduceRule178() { - $this->semValue = new Stmt\Function_($this->semStack[$this->stackPos-(10-3)], ['byRef' => $this->semStack[$this->stackPos-(10-2)], 'params' => $this->semStack[$this->stackPos-(10-5)], 'returnType' => $this->semStack[$this->stackPos-(10-7)], 'stmts' => $this->semStack[$this->stackPos-(10-9)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes); - } - - protected function reduceRule179() { - $this->semValue = new Stmt\Class_($this->semStack[$this->stackPos-(7-2)], ['type' => $this->semStack[$this->stackPos-(7-1)], 'extends' => $this->semStack[$this->stackPos-(7-3)], 'implements' => $this->semStack[$this->stackPos-(7-4)], 'stmts' => $this->semStack[$this->stackPos-(7-6)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes); - $this->checkClass($this->semValue, $this->stackPos-(7-2)); - } - - protected function reduceRule180() { - $this->semValue = new Stmt\Interface_($this->semStack[$this->stackPos-(6-2)], ['extends' => $this->semStack[$this->stackPos-(6-3)], 'stmts' => $this->semStack[$this->stackPos-(6-5)]], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - $this->checkInterface($this->semValue, $this->stackPos-(6-2)); - } - - protected function reduceRule181() { - $this->semValue = new Stmt\Trait_($this->semStack[$this->stackPos-(5-2)], ['stmts' => $this->semStack[$this->stackPos-(5-4)]], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule182() { - $this->semValue = 0; - } - - protected function reduceRule183() { - $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; - } - - protected function reduceRule184() { - $this->semValue = Stmt\Class_::MODIFIER_FINAL; - } - - protected function reduceRule185() { - $this->semValue = null; - } - - protected function reduceRule186() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule187() { - $this->semValue = array(); - } - - protected function reduceRule188() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule189() { - $this->semValue = array(); - } - - protected function reduceRule190() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule191() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule192() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule193() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule194() { - $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule195() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule196() { - $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule197() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule198() { - $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule199() { - $this->semValue = null; - } - - protected function reduceRule200() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule201() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule202() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule203() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule204() { - $this->semValue = new Stmt\DeclareDeclare($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule205() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule206() { - $this->semValue = $this->semStack[$this->stackPos-(4-3)]; - } - - protected function reduceRule207() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule208() { - $this->semValue = $this->semStack[$this->stackPos-(5-3)]; - } - - protected function reduceRule209() { - $this->semValue = array(); - } - - protected function reduceRule210() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule211() { - $this->semValue = new Stmt\Case_($this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule212() { - $this->semValue = new Stmt\Case_(null, $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule213() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule214() { - $this->semValue = $this->semStack[$this->stackPos]; - } - - protected function reduceRule215() { - $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule216() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule217() { - $this->semValue = array(); - } - - protected function reduceRule218() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule219() { - $this->semValue = new Stmt\ElseIf_($this->semStack[$this->stackPos-(5-3)], is_array($this->semStack[$this->stackPos-(5-5)]) ? $this->semStack[$this->stackPos-(5-5)] : array($this->semStack[$this->stackPos-(5-5)]), $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule220() { - $this->semValue = array(); - } - - protected function reduceRule221() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule222() { - $this->semValue = new Stmt\ElseIf_($this->semStack[$this->stackPos-(6-3)], $this->semStack[$this->stackPos-(6-6)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - } - - protected function reduceRule223() { - $this->semValue = null; - } - - protected function reduceRule224() { - $this->semValue = new Stmt\Else_(is_array($this->semStack[$this->stackPos-(2-2)]) ? $this->semStack[$this->stackPos-(2-2)] : array($this->semStack[$this->stackPos-(2-2)]), $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule225() { - $this->semValue = null; - } - - protected function reduceRule226() { - $this->semValue = new Stmt\Else_($this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule227() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false); - } - - protected function reduceRule228() { - $this->semValue = array($this->semStack[$this->stackPos-(2-2)], true); - } - - protected function reduceRule229() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false); - } - - protected function reduceRule230() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false); - } - - protected function reduceRule231() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule232() { - $this->semValue = array(); - } - - protected function reduceRule233() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule234() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule235() { - $this->semValue = new Node\Param(substr($this->semStack[$this->stackPos-(4-4)], 1), null, $this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); $this->checkParam($this->semValue); - } - - protected function reduceRule236() { - $this->semValue = new Node\Param(substr($this->semStack[$this->stackPos-(6-4)], 1), $this->semStack[$this->stackPos-(6-6)], $this->semStack[$this->stackPos-(6-1)], $this->semStack[$this->stackPos-(6-2)], $this->semStack[$this->stackPos-(6-3)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); $this->checkParam($this->semValue); - } - - protected function reduceRule237() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule238() { - $this->semValue = new Node\NullableType($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule239() { - $this->semValue = $this->handleBuiltinTypes($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule240() { - $this->semValue = 'array'; - } - - protected function reduceRule241() { - $this->semValue = 'callable'; - } - - protected function reduceRule242() { - $this->semValue = null; - } - - protected function reduceRule243() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule244() { - $this->semValue = null; - } - - protected function reduceRule245() { - $this->semValue = $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule246() { - $this->semValue = array(); - } - - protected function reduceRule247() { - $this->semValue = $this->semStack[$this->stackPos-(4-2)]; - } - - protected function reduceRule248() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule249() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule250() { - $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(1-1)], false, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule251() { - $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(2-2)], true, false, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule252() { - $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(2-2)], false, true, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule253() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule254() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule255() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule256() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule257() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule258() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule259() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule260() { - $this->semValue = new Stmt\StaticVar(substr($this->semStack[$this->stackPos-(1-1)], 1), null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule261() { - $this->semValue = new Stmt\StaticVar(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule262() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule263() { - $this->semValue = array(); - } - - protected function reduceRule264() { - $this->semValue = new Stmt\Property($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $this->stackPos-(3-1)); - } - - protected function reduceRule265() { - $this->semValue = new Stmt\ClassConst($this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-1)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); $this->checkClassConst($this->semValue, $this->stackPos-(4-1)); - } - - protected function reduceRule266() { - $this->semValue = new Stmt\ClassMethod($this->semStack[$this->stackPos-(9-4)], ['type' => $this->semStack[$this->stackPos-(9-1)], 'byRef' => $this->semStack[$this->stackPos-(9-3)], 'params' => $this->semStack[$this->stackPos-(9-6)], 'returnType' => $this->semStack[$this->stackPos-(9-8)], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes); - $this->checkClassMethod($this->semValue, $this->stackPos-(9-1)); - } - - protected function reduceRule267() { - $this->semValue = new Stmt\TraitUse($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule268() { - $this->semValue = array(); - } - - protected function reduceRule269() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule270() { - $this->semValue = array(); - } - - protected function reduceRule271() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule272() { - $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule273() { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(5-1)][0], $this->semStack[$this->stackPos-(5-1)][1], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-4)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule274() { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], $this->semStack[$this->stackPos-(4-3)], null, $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule275() { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule276() { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule277() { - $this->semValue = array($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)]); - } - - protected function reduceRule278() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule279() { - $this->semValue = array(null, $this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule280() { - $this->semValue = null; - } - - protected function reduceRule281() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule282() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule283() { - $this->semValue = 0; - } - - protected function reduceRule284() { - $this->semValue = 0; - } - - protected function reduceRule285() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule286() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule287() { - $this->checkModifier($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->stackPos-(2-2)); $this->semValue = $this->semStack[$this->stackPos-(2-1)] | $this->semStack[$this->stackPos-(2-2)]; - } - - protected function reduceRule288() { - $this->semValue = Stmt\Class_::MODIFIER_PUBLIC; - } - - protected function reduceRule289() { - $this->semValue = Stmt\Class_::MODIFIER_PROTECTED; - } - - protected function reduceRule290() { - $this->semValue = Stmt\Class_::MODIFIER_PRIVATE; - } - - protected function reduceRule291() { - $this->semValue = Stmt\Class_::MODIFIER_STATIC; - } - - protected function reduceRule292() { - $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; - } - - protected function reduceRule293() { - $this->semValue = Stmt\Class_::MODIFIER_FINAL; - } - - protected function reduceRule294() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule295() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule296() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule297() { - $this->semValue = new Stmt\PropertyProperty(substr($this->semStack[$this->stackPos-(1-1)], 1), null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule298() { - $this->semValue = new Stmt\PropertyProperty(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule299() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule300() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule301() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule302() { - $this->semValue = array(); - } - - protected function reduceRule303() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule304() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule305() { - $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule306() { - $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule307() { - $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule308() { - $this->semValue = new Expr\AssignRef($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule309() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule310() { - $this->semValue = new Expr\Clone_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule311() { - $this->semValue = new Expr\AssignOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule312() { - $this->semValue = new Expr\AssignOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule313() { - $this->semValue = new Expr\AssignOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule314() { - $this->semValue = new Expr\AssignOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule315() { - $this->semValue = new Expr\AssignOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule316() { - $this->semValue = new Expr\AssignOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule317() { - $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule318() { - $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule319() { - $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule320() { - $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule321() { - $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule322() { - $this->semValue = new Expr\AssignOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule323() { - $this->semValue = new Expr\PostInc($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule324() { - $this->semValue = new Expr\PreInc($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule325() { - $this->semValue = new Expr\PostDec($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule326() { - $this->semValue = new Expr\PreDec($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule327() { - $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule328() { - $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule329() { - $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule330() { - $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule331() { - $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule332() { - $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule333() { - $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule334() { - $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule335() { - $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule336() { - $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule337() { - $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule338() { - $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule339() { - $this->semValue = new Expr\BinaryOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule340() { - $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule341() { - $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule342() { - $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule343() { - $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule344() { - $this->semValue = new Expr\UnaryPlus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule345() { - $this->semValue = new Expr\UnaryMinus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule346() { - $this->semValue = new Expr\BooleanNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule347() { - $this->semValue = new Expr\BitwiseNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule348() { - $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule349() { - $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule350() { - $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule351() { - $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule352() { - $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule353() { - $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule354() { - $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule355() { - $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule356() { - $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule357() { - $this->semValue = new Expr\Instanceof_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule358() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule359() { - $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(5-1)], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes); - } - - protected function reduceRule360() { - $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(4-1)], null, $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule361() { - $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule362() { - $this->semValue = new Expr\Isset_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule363() { - $this->semValue = new Expr\Empty_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule364() { - $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule365() { - $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule366() { - $this->semValue = new Expr\Eval_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule367() { - $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule368() { - $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule369() { - $this->semValue = new Expr\Cast\Int_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule370() { - $this->semValue = new Expr\Cast\Double($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule371() { - $this->semValue = new Expr\Cast\String_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule372() { - $this->semValue = new Expr\Cast\Array_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule373() { - $this->semValue = new Expr\Cast\Object_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule374() { - $this->semValue = new Expr\Cast\Bool_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule375() { - $this->semValue = new Expr\Cast\Unset_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule376() { - $attrs = $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes; - $attrs['kind'] = strtolower($this->semStack[$this->stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE; - $this->semValue = new Expr\Exit_($this->semStack[$this->stackPos-(2-2)], $attrs); - } - - protected function reduceRule377() { - $this->semValue = new Expr\ErrorSuppress($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule378() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule379() { - $this->semValue = new Expr\ShellExec($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule380() { - $this->semValue = new Expr\Print_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule381() { - $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule382() { - $this->semValue = new Expr\Yield_($this->semStack[$this->stackPos-(2-2)], null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule383() { - $this->semValue = new Expr\Yield_($this->semStack[$this->stackPos-(4-4)], $this->semStack[$this->stackPos-(4-2)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule384() { - $this->semValue = new Expr\YieldFrom($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule385() { - $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$this->stackPos-(10-2)], 'params' => $this->semStack[$this->stackPos-(10-4)], 'uses' => $this->semStack[$this->stackPos-(10-6)], 'returnType' => $this->semStack[$this->stackPos-(10-7)], 'stmts' => $this->semStack[$this->stackPos-(10-9)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes); - } - - protected function reduceRule386() { - $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$this->stackPos-(11-3)], 'params' => $this->semStack[$this->stackPos-(11-5)], 'uses' => $this->semStack[$this->stackPos-(11-7)], 'returnType' => $this->semStack[$this->stackPos-(11-8)], 'stmts' => $this->semStack[$this->stackPos-(11-10)]], $this->startAttributeStack[$this->stackPos-(11-1)] + $this->endAttributes); - } - - protected function reduceRule387() { - $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$this->stackPos-(7-3)], 'implements' => $this->semStack[$this->stackPos-(7-4)], 'stmts' => $this->semStack[$this->stackPos-(7-6)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(7-2)]); + }, + 168 => function ($stackPos) { + $this->semValue = array(); + }, + 169 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 170 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 171 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 172 => function ($stackPos) { + $this->semValue = new Stmt\Catch_($this->semStack[$stackPos-(8-3)], $this->semStack[$stackPos-(8-4)], $this->semStack[$stackPos-(8-7)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes); + }, + 173 => function ($stackPos) { + $this->semValue = null; + }, + 174 => function ($stackPos) { + $this->semValue = new Stmt\Finally_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 175 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 176 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 177 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 178 => function ($stackPos) { + $this->semValue = false; + }, + 179 => function ($stackPos) { + $this->semValue = true; + }, + 180 => function ($stackPos) { + $this->semValue = false; + }, + 181 => function ($stackPos) { + $this->semValue = true; + }, + 182 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 183 => function ($stackPos) { + $this->semValue = []; + }, + 184 => function ($stackPos) { + $this->semValue = new Stmt\Function_($this->semStack[$stackPos-(8-3)], ['byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-5)], 'returnType' => $this->semStack[$stackPos-(8-7)], 'stmts' => $this->semStack[$stackPos-(8-8)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes); + }, + 185 => function ($stackPos) { + $this->semValue = new Stmt\Class_($this->semStack[$stackPos-(7-2)], ['type' => $this->semStack[$stackPos-(7-1)], 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes); + $this->checkClass($this->semValue, $stackPos-(7-2)); + }, + 186 => function ($stackPos) { + $this->semValue = new Stmt\Interface_($this->semStack[$stackPos-(6-2)], ['extends' => $this->semStack[$stackPos-(6-3)], 'stmts' => $this->semStack[$stackPos-(6-5)]], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + $this->checkInterface($this->semValue, $stackPos-(6-2)); + }, + 187 => function ($stackPos) { + $this->semValue = new Stmt\Trait_($this->semStack[$stackPos-(5-2)], ['stmts' => $this->semStack[$stackPos-(5-4)]], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 188 => function ($stackPos) { + $this->semValue = 0; + }, + 189 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; + }, + 190 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_FINAL; + }, + 191 => function ($stackPos) { + $this->semValue = null; + }, + 192 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 193 => function ($stackPos) { + $this->semValue = array(); + }, + 194 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 195 => function ($stackPos) { + $this->semValue = array(); + }, + 196 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 197 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 198 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 199 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 200 => function ($stackPos) { + $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]); + }, + 201 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 202 => function ($stackPos) { + $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]); + }, + 203 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 204 => function ($stackPos) { + $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]); + }, + 205 => function ($stackPos) { + $this->semValue = null; + }, + 206 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 207 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 208 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 209 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 210 => function ($stackPos) { + $this->semValue = new Stmt\DeclareDeclare($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 211 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 212 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-3)]; + }, + 213 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 214 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(5-3)]; + }, + 215 => function ($stackPos) { + $this->semValue = array(); + }, + 216 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 217 => function ($stackPos) { + $this->semValue = new Stmt\Case_($this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 218 => function ($stackPos) { + $this->semValue = new Stmt\Case_(null, $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 219 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 220 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos]; + }, + 221 => function ($stackPos) { + $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]); + }, + 222 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 223 => function ($stackPos) { + $this->semValue = array(); + }, + 224 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 225 => function ($stackPos) { + $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(5-3)], is_array($this->semStack[$stackPos-(5-5)]) ? $this->semStack[$stackPos-(5-5)] : array($this->semStack[$stackPos-(5-5)]), $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 226 => function ($stackPos) { + $this->semValue = array(); + }, + 227 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 228 => function ($stackPos) { + $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + }, + 229 => function ($stackPos) { + $this->semValue = null; + }, + 230 => function ($stackPos) { + $this->semValue = new Stmt\Else_(is_array($this->semStack[$stackPos-(2-2)]) ? $this->semStack[$stackPos-(2-2)] : array($this->semStack[$stackPos-(2-2)]), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 231 => function ($stackPos) { + $this->semValue = null; + }, + 232 => function ($stackPos) { + $this->semValue = new Stmt\Else_($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 233 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)], false); + }, + 234 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(2-2)], true); + }, + 235 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)], false); + }, + 236 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)], false); + }, + 237 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 238 => function ($stackPos) { + $this->semValue = array(); + }, + 239 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 240 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 241 => function ($stackPos) { + $this->semValue = new Node\Param($this->semStack[$stackPos-(4-4)], null, $this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); $this->checkParam($this->semValue); + }, + 242 => function ($stackPos) { + $this->semValue = new Node\Param($this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-6)], $this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-3)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->checkParam($this->semValue); + }, + 243 => function ($stackPos) { + $this->semValue = new Node\Param(new Expr\Error($this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes), null, $this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 244 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 245 => function ($stackPos) { + $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 246 => function ($stackPos) { + $this->semValue = $this->handleBuiltinTypes($this->semStack[$stackPos-(1-1)]); + }, + 247 => function ($stackPos) { + $this->semValue = new Node\Identifier('array', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 248 => function ($stackPos) { + $this->semValue = new Node\Identifier('callable', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 249 => function ($stackPos) { + $this->semValue = null; + }, + 250 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 251 => function ($stackPos) { + $this->semValue = null; + }, + 252 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; + }, + 253 => function ($stackPos) { + $this->semValue = array(); + }, + 254 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 255 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 256 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 257 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(1-1)], false, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 258 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], true, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 259 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], false, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 260 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 261 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 262 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 263 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 264 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 265 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 266 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 267 => function ($stackPos) { + $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 268 => function ($stackPos) { + $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 269 => function ($stackPos) { + if ($this->semStack[$stackPos-(2-2)] !== null) { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; } + }, + 270 => function ($stackPos) { + $this->semValue = array(); + }, + 271 => function ($stackPos) { + $this->semValue = new Stmt\Property($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $stackPos-(3-1)); + }, + 272 => function ($stackPos) { + $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-1)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); $this->checkClassConst($this->semValue, $stackPos-(4-1)); + }, + 273 => function ($stackPos) { + $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(9-4)], ['type' => $this->semStack[$stackPos-(9-1)], 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); + $this->checkClassMethod($this->semValue, $stackPos-(9-1)); + }, + 274 => function ($stackPos) { + $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 275 => function ($stackPos) { + $this->semValue = null; /* will be skipped */ + }, + 276 => function ($stackPos) { + $this->semValue = array(); + }, + 277 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 278 => function ($stackPos) { + $this->semValue = array(); + }, + 279 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 280 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 281 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 282 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 283 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 284 => function ($stackPos) { + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 285 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]); + }, + 286 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 287 => function ($stackPos) { + $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]); + }, + 288 => function ($stackPos) { + $this->semValue = null; + }, + 289 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 290 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 291 => function ($stackPos) { + $this->semValue = 0; + }, + 292 => function ($stackPos) { + $this->semValue = 0; + }, + 293 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 294 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 295 => function ($stackPos) { + $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)]; + }, + 296 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_PUBLIC; + }, + 297 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_PROTECTED; + }, + 298 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_PRIVATE; + }, + 299 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_STATIC; + }, + 300 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; + }, + 301 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_FINAL; + }, + 302 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 303 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 304 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 305 => function ($stackPos) { + $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 306 => function ($stackPos) { + $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 307 => function ($stackPos) { + $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 308 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 309 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 310 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 311 => function ($stackPos) { + $this->semValue = array(); + }, + 312 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 313 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 314 => function ($stackPos) { + $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 315 => function ($stackPos) { + $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 316 => function ($stackPos) { + $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 317 => function ($stackPos) { + $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 318 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 319 => function ($stackPos) { + $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 320 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 321 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 322 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 323 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 324 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 325 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 326 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 327 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 328 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 329 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 330 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 331 => function ($stackPos) { + $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 332 => function ($stackPos) { + $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 333 => function ($stackPos) { + $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 334 => function ($stackPos) { + $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 335 => function ($stackPos) { + $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 336 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 337 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 338 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 339 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 340 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 341 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 342 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 343 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 344 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 345 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 346 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 347 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 348 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 349 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 350 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 351 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 352 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 353 => function ($stackPos) { + $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 354 => function ($stackPos) { + $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 355 => function ($stackPos) { + $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 356 => function ($stackPos) { + $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 357 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 358 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 359 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 360 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 361 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 362 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 363 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 364 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 365 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 366 => function ($stackPos) { + $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 367 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 368 => function ($stackPos) { + $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + }, + 369 => function ($stackPos) { + $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 370 => function ($stackPos) { + $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 371 => function ($stackPos) { + $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 372 => function ($stackPos) { + $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 373 => function ($stackPos) { + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 374 => function ($stackPos) { + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 375 => function ($stackPos) { + $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 376 => function ($stackPos) { + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 377 => function ($stackPos) { + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 378 => function ($stackPos) { + $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 379 => function ($stackPos) { + $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 380 => function ($stackPos) { + $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 381 => function ($stackPos) { + $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 382 => function ($stackPos) { + $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 383 => function ($stackPos) { + $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 384 => function ($stackPos) { + $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 385 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes; + $attrs['kind'] = strtolower($this->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE; + $this->semValue = new Expr\Exit_($this->semStack[$stackPos-(2-2)], $attrs); + }, + 386 => function ($stackPos) { + $this->semValue = new Expr\ErrorSuppress($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 387 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 388 => function ($stackPos) { + $this->semValue = new Expr\ShellExec($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 389 => function ($stackPos) { + $this->semValue = new Expr\Print_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 390 => function ($stackPos) { + $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 391 => function ($stackPos) { + $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(2-2)], null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 392 => function ($stackPos) { + $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 393 => function ($stackPos) { + $this->semValue = new Expr\YieldFrom($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 394 => function ($stackPos) { + $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-4)], 'uses' => $this->semStack[$stackPos-(8-6)], 'returnType' => $this->semStack[$stackPos-(8-7)], 'stmts' => $this->semStack[$stackPos-(8-8)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes); + }, + 395 => function ($stackPos) { + $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'uses' => $this->semStack[$stackPos-(9-7)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); + }, + 396 => function ($stackPos) { + $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes), $this->semStack[$stackPos-(7-2)]); $this->checkClass($this->semValue[0], -1); - } - - protected function reduceRule388() { - $this->semValue = new Expr\New_($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule389() { - list($class, $ctorArgs) = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule390() { - $this->semValue = array(); - } - - protected function reduceRule391() { - $this->semValue = $this->semStack[$this->stackPos-(4-3)]; - } - - protected function reduceRule392() { - $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule393() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule394() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule395() { - $this->semValue = new Expr\ClosureUse(substr($this->semStack[$this->stackPos-(2-2)], 1), $this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule396() { - $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule397() { - $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule398() { - $this->semValue = new Expr\StaticCall($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule399() { - $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule400() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule401() { - $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule402() { - $this->semValue = new Name\FullyQualified($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule403() { - $this->semValue = new Name\Relative($this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule404() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule405() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule406() { - $this->semValue = new Expr\Error($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; - } - - protected function reduceRule407() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule408() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule409() { - $this->semValue = null; - } - - protected function reduceRule410() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule411() { - $this->semValue = array(); - } - - protected function reduceRule412() { - $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$this->stackPos-(1-1)], '`'), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes)); - } - - protected function reduceRule413() { - foreach ($this->semStack[$this->stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule414() { - $this->semValue = array(); - } - - protected function reduceRule415() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule416() { - $this->semValue = new Expr\ConstFetch($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule417() { - $this->semValue = new Expr\ClassConstFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule418() { - $this->semValue = new Expr\ClassConstFetch($this->semStack[$this->stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$this->stackPos-(3-3)] + $this->endAttributeStack[$this->stackPos-(3-3)]), $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2; - } - - protected function reduceRule419() { - $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT; - $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(3-2)], $attrs); - } - - protected function reduceRule420() { - $attrs = $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG; - $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(4-3)], $attrs); - } - - protected function reduceRule421() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule422() { - $attrs = $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$this->stackPos-(1-1)][0] === "'" || ($this->semStack[$this->stackPos-(1-1)][1] === "'" && ($this->semStack[$this->stackPos-(1-1)][0] === 'b' || $this->semStack[$this->stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED); - $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$this->stackPos-(1-1)]), $attrs); - } - - protected function reduceRule423() { - $this->semValue = $this->parseLNumber($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule424() { - $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$this->stackPos-(1-1)]), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule425() { - $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule426() { - $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule427() { - $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule428() { - $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule429() { - $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule430() { - $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule431() { - $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule432() { - $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule433() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule434() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule435() { - $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];; - $this->semValue = new Scalar\String_(Scalar\String_::parseDocString($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-2)]), $attrs); - } - - protected function reduceRule436() { - $attrs = $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(2-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(2-1)], $matches); $attrs['docLabel'] = $matches[1];; + }, + 397 => function ($stackPos) { + $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 398 => function ($stackPos) { + list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 399 => function ($stackPos) { + $this->semValue = array(); + }, + 400 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-3)]; + }, + 401 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 402 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 403 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 404 => function ($stackPos) { + $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 405 => function ($stackPos) { + $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 406 => function ($stackPos) { + $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 407 => function ($stackPos) { + $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 408 => function ($stackPos) { + $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 409 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 410 => function ($stackPos) { + $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 411 => function ($stackPos) { + $this->semValue = new Name\FullyQualified($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 412 => function ($stackPos) { + $this->semValue = new Name\Relative($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 413 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 414 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 415 => function ($stackPos) { + $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; + }, + 416 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 417 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 418 => function ($stackPos) { + $this->semValue = null; + }, + 419 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 420 => function ($stackPos) { + $this->semValue = array(); + }, + 421 => function ($stackPos) { + $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`'), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes)); + }, + 422 => function ($stackPos) { + foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 423 => function ($stackPos) { + $this->semValue = array(); + }, + 424 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 425 => function ($stackPos) { + $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 426 => function ($stackPos) { + $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 427 => function ($stackPos) { + $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2; + }, + 428 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT; + $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $attrs); + }, + 429 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG; + $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $attrs); + }, + 430 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 431 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED); + $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(1-1)]), $attrs); + }, + 432 => function ($stackPos) { + $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 433 => function ($stackPos) { + $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 434 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 435 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 436 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 437 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 438 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 439 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 440 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 441 => function ($stackPos) { + $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 442 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 443 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 444 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];; + $this->semValue = new Scalar\String_(Scalar\String_::parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)]), $attrs); + }, + 445 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(2-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(2-1)], $matches); $attrs['docLabel'] = $matches[1];; $this->semValue = new Scalar\String_('', $attrs); - } - - protected function reduceRule437() { - $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED; - foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $attrs); - } - - protected function reduceRule438() { - $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];; - foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, true); } } $s->value = preg_replace('~(\r\n|\n|\r)\z~', '', $s->value); if ('' === $s->value) array_pop($this->semStack[$this->stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $attrs); - } - - protected function reduceRule439() { - $this->semValue = null; - } - - protected function reduceRule440() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule441() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule442() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule443() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule444() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule445() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule446() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule447() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule448() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule449() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule450() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule451() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule452() { - $this->semValue = new Expr\MethodCall($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule453() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule454() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule455() { - $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule456() { - $this->semValue = substr($this->semStack[$this->stackPos-(1-1)], 1); - } - - protected function reduceRule457() { - $this->semValue = $this->semStack[$this->stackPos-(4-3)]; - } - - protected function reduceRule458() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule459() { - $this->semValue = new Expr\Error($this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2; - } - - protected function reduceRule460() { - $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule461() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule462() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule463() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule464() { - $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule465() { - $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule466() { - $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule467() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule468() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule469() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule470() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule471() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule472() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule473() { - $this->semValue = new Expr\Error($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; - } - - protected function reduceRule474() { - $this->semValue = new Expr\List_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule475() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule476() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule477() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule478() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule479() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule480() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule481() { - $this->semValue = null; - } - - protected function reduceRule482() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) unset($this->semValue[$end]); - } - - protected function reduceRule483() { - $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)]; - } - - protected function reduceRule484() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule485() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule486() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule487() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(4-4)], $this->semStack[$this->stackPos-(4-1)], true, $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule488() { - $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(2-2)], null, true, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule489() { - $this->semValue = null; - } - - protected function reduceRule490() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule491() { - $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; - } - - protected function reduceRule492() { - $this->semValue = array($this->semStack[$this->stackPos-(1-1)]); - } - - protected function reduceRule493() { - $this->semValue = array($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); - } - - protected function reduceRule494() { - $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule495() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule496() { - $this->semValue = $this->semStack[$this->stackPos-(1-1)]; - } - - protected function reduceRule497() { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); - } - - protected function reduceRule498() { - $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule499() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule500() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule501() { - $this->semValue = new Expr\ArrayDimFetch(new Expr\Variable($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(6-4)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); - } - - protected function reduceRule502() { - $this->semValue = $this->semStack[$this->stackPos-(3-2)]; - } - - protected function reduceRule503() { - $this->semValue = new Scalar\String_($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule504() { - $this->semValue = $this->parseNumString($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule505() { - $this->semValue = $this->parseNumString('-' . $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); - } - - protected function reduceRule506() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); + }, + 446 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED; + foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs); + }, + 447 => function ($stackPos) { + $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];; + foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, true); } } $s->value = preg_replace('~(\r\n|\n|\r)\z~', '', $s->value); if ('' === $s->value) array_pop($this->semStack[$stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs); + }, + 448 => function ($stackPos) { + $this->semValue = null; + }, + 449 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 450 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 451 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 452 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 453 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 454 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 455 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 456 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 457 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 458 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 459 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 460 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 461 => function ($stackPos) { + $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 462 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 463 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 464 => function ($stackPos) { + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 465 => function ($stackPos) { + $this->semValue = substr($this->semStack[$stackPos-(1-1)], 1); + }, + 466 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-3)]; + }, + 467 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 468 => function ($stackPos) { + $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2; + }, + 469 => function ($stackPos) { + $var = $this->semStack[$stackPos-(1-1)]; $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var; + }, + 470 => function ($stackPos) { + $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 471 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 472 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 473 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 474 => function ($stackPos) { + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 475 => function ($stackPos) { + $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 476 => function ($stackPos) { + $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 477 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 478 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 479 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 480 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 481 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 482 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 483 => function ($stackPos) { + $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; + }, + 484 => function ($stackPos) { + $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 485 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 486 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 487 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 488 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 489 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 490 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 491 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 492 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 493 => function ($stackPos) { + $this->semValue = null; + }, + 494 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue); + }, + 495 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 496 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 497 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 498 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 499 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 500 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 501 => function ($stackPos) { + $this->semValue = null; + }, + 502 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 503 => function ($stackPos) { + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 504 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 505 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); + }, + 506 => function ($stackPos) { + $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 507 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 508 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 509 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 510 => function ($stackPos) { + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 511 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 512 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 513 => function ($stackPos) { + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + }, + 514 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 515 => function ($stackPos) { + $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 516 => function ($stackPos) { + $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 517 => function ($stackPos) { + $this->semValue = $this->parseNumString('-' . $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 518 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + ]; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php b/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php index e0f6e259..dab6aea7 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php +++ b/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php @@ -1,4 +1,4 @@ -lexer = $lexer; - $this->errors = array(); if (isset($options['throwOnError'])) { throw new \LogicException( '"throwOnError" is no longer supported, use "errorHandler" instead'); } + + $this->initReduceCallbacks(); } /** @@ -137,45 +146,56 @@ abstract class ParserAbstract implements Parser * @param ErrorHandler|null $errorHandler Error handler to use for lexer/parser errors, defaults * to ErrorHandler\Throwing. * - * @return Node[]|null Array of statements (or null if the 'throwOnError' option is disabled and the parser was - * unable to recover from an error). + * @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and + * the parser was unable to recover from an error). */ - public function parse($code, ErrorHandler $errorHandler = null) { + public function parse(string $code, ErrorHandler $errorHandler = null) { $this->errorHandler = $errorHandler ?: new ErrorHandler\Throwing; - // Initialize the lexer $this->lexer->startLexing($code, $this->errorHandler); + $result = $this->doParse(); + // Clear out some of the interior state, so we don't hold onto unnecessary + // memory between uses of the parser + $this->startAttributeStack = []; + $this->endAttributeStack = []; + $this->semStack = []; + $this->semValue = null; + + return $result; + } + + protected function doParse() { // We start off with no lookahead-token $symbol = self::SYMBOL_NONE; // The attributes for a node are taken from the first and last token of the node. // From the first token only the startAttributes are taken and from the last only // the endAttributes. Both are merged using the array union operator (+). - $startAttributes = '*POISON'; - $endAttributes = '*POISON'; + $startAttributes = []; + $endAttributes = []; $this->endAttributes = $endAttributes; // Keep stack of start and end attributes - $this->startAttributeStack = array(); - $this->endAttributeStack = array($endAttributes); + $this->startAttributeStack = []; + $this->endAttributeStack = [$endAttributes]; // Start off in the initial state and keep a stack of previous states $state = 0; - $stateStack = array($state); + $stateStack = [$state]; // Semantic value stack (contains values of tokens and semantic action results) - $this->semStack = array(); + $this->semStack = []; // Current position in the stack(s) - $this->stackPos = 0; + $stackPos = 0; $this->errorState = 0; for (;;) { //$this->traceNewState($state, $symbol); - if ($this->actionBase[$state] == 0) { + if ($this->actionBase[$state] === 0) { $rule = $this->actionDefault[$state]; } else { if ($symbol === self::SYMBOL_NONE) { @@ -199,21 +219,21 @@ abstract class ParserAbstract implements Parser // This is necessary to assign some meaningful attributes to /* empty */ productions. They'll get // the attributes of the next token, even though they don't contain it themselves. - $this->startAttributeStack[$this->stackPos+1] = $startAttributes; - $this->endAttributeStack[$this->stackPos+1] = $endAttributes; + $this->startAttributeStack[$stackPos+1] = $startAttributes; + $this->endAttributeStack[$stackPos+1] = $endAttributes; $this->lookaheadStartAttributes = $startAttributes; //$this->traceRead($symbol); } $idx = $this->actionBase[$state] + $symbol; - if ((($idx >= 0 && $idx < $this->actionTableSize && $this->actionCheck[$idx] == $symbol) + if ((($idx >= 0 && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $symbol) || ($state < $this->YY2TBLSTATE - && ($idx = $this->actionBase[$state + $this->YYNLSTATES] + $symbol) >= 0 - && $idx < $this->actionTableSize && $this->actionCheck[$idx] == $symbol)) - && ($action = $this->action[$idx]) != $this->defaultAction) { + && ($idx = $this->actionBase[$state + $this->numNonLeafStates] + $symbol) >= 0 + && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $symbol)) + && ($action = $this->action[$idx]) !== $this->defaultAction) { /* - * >= YYNLSTATES: shift and reduce + * >= numNonLeafStates: shift and reduce * > 0: shift * = 0: accept * < 0: reduce @@ -223,11 +243,11 @@ abstract class ParserAbstract implements Parser /* shift */ //$this->traceShift($symbol); - ++$this->stackPos; - $stateStack[$this->stackPos] = $state = $action; - $this->semStack[$this->stackPos] = $tokenValue; - $this->startAttributeStack[$this->stackPos] = $startAttributes; - $this->endAttributeStack[$this->stackPos] = $endAttributes; + ++$stackPos; + $stateStack[$stackPos] = $state = $action; + $this->semStack[$stackPos] = $tokenValue; + $this->startAttributeStack[$stackPos] = $startAttributes; + $this->endAttributeStack[$stackPos] = $endAttributes; $this->endAttributes = $endAttributes; $symbol = self::SYMBOL_NONE; @@ -235,12 +255,12 @@ abstract class ParserAbstract implements Parser --$this->errorState; } - if ($action < $this->YYNLSTATES) { + if ($action < $this->numNonLeafStates) { continue; } - /* $yyn >= YYNLSTATES means shift-and-reduce */ - $rule = $action - $this->YYNLSTATES; + /* $yyn >= numNonLeafStates means shift-and-reduce */ + $rule = $action - $this->numNonLeafStates; } else { $rule = -$action; } @@ -259,7 +279,7 @@ abstract class ParserAbstract implements Parser //$this->traceReduce($rule); try { - $this->{'reduceRule' . $rule}(); + $this->reduceCallbacks[$rule]($stackPos); } catch (Error $e) { if (-1 === $e->getStartLine() && isset($startAttributes['startLine'])) { $e->setStartLine($startAttributes['startLine']); @@ -271,20 +291,20 @@ abstract class ParserAbstract implements Parser } /* Goto - shift nonterminal */ - $lastEndAttributes = $this->endAttributeStack[$this->stackPos]; - $this->stackPos -= $this->ruleToLength[$rule]; + $lastEndAttributes = $this->endAttributeStack[$stackPos]; + $stackPos -= $this->ruleToLength[$rule]; $nonTerminal = $this->ruleToNonTerminal[$rule]; - $idx = $this->gotoBase[$nonTerminal] + $stateStack[$this->stackPos]; - if ($idx >= 0 && $idx < $this->gotoTableSize && $this->gotoCheck[$idx] == $nonTerminal) { + $idx = $this->gotoBase[$nonTerminal] + $stateStack[$stackPos]; + if ($idx >= 0 && $idx < $this->gotoTableSize && $this->gotoCheck[$idx] === $nonTerminal) { $state = $this->goto[$idx]; } else { $state = $this->gotoDefault[$nonTerminal]; } - ++$this->stackPos; - $stateStack[$this->stackPos] = $state; - $this->semStack[$this->stackPos] = $this->semValue; - $this->endAttributeStack[$this->stackPos] = $lastEndAttributes; + ++$stackPos; + $stateStack[$stackPos] = $state; + $this->semStack[$stackPos] = $this->semValue; + $this->endAttributeStack[$stackPos] = $lastEndAttributes; } else { /* error */ switch ($this->errorState) { @@ -299,27 +319,27 @@ abstract class ParserAbstract implements Parser // Pop until error-expecting state uncovered while (!( (($idx = $this->actionBase[$state] + $this->errorSymbol) >= 0 - && $idx < $this->actionTableSize && $this->actionCheck[$idx] == $this->errorSymbol) + && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $this->errorSymbol) || ($state < $this->YY2TBLSTATE - && ($idx = $this->actionBase[$state + $this->YYNLSTATES] + $this->errorSymbol) >= 0 - && $idx < $this->actionTableSize && $this->actionCheck[$idx] == $this->errorSymbol) - ) || ($action = $this->action[$idx]) == $this->defaultAction) { // Not totally sure about this - if ($this->stackPos <= 0) { + && ($idx = $this->actionBase[$state + $this->numNonLeafStates] + $this->errorSymbol) >= 0 + && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $this->errorSymbol) + ) || ($action = $this->action[$idx]) === $this->defaultAction) { // Not totally sure about this + if ($stackPos <= 0) { // Could not recover from error return null; } - $state = $stateStack[--$this->stackPos]; + $state = $stateStack[--$stackPos]; //$this->tracePop($state); } //$this->traceShift($this->errorSymbol); - ++$this->stackPos; - $stateStack[$this->stackPos] = $state = $action; + ++$stackPos; + $stateStack[$stackPos] = $state = $action; // We treat the error symbol as being empty, so we reset the end attributes // to the end attributes of the last non-error symbol - $this->endAttributeStack[$this->stackPos] = $this->endAttributeStack[$this->stackPos - 1]; - $this->endAttributes = $this->endAttributeStack[$this->stackPos - 1]; + $this->endAttributeStack[$stackPos] = $this->endAttributeStack[$stackPos - 1]; + $this->endAttributes = $this->endAttributeStack[$stackPos - 1]; break; case 3: @@ -334,12 +354,12 @@ abstract class ParserAbstract implements Parser } } - if ($state < $this->YYNLSTATES) { + if ($state < $this->numNonLeafStates) { break; } - /* >= YYNLSTATES means shift-and-reduce */ - $rule = $state - $this->YYNLSTATES; + /* >= numNonLeafStates means shift-and-reduce */ + $rule = $state - $this->numNonLeafStates; } } @@ -350,7 +370,15 @@ abstract class ParserAbstract implements Parser $this->errorHandler->handleError($error); } - protected function getErrorMessage($symbol, $state) { + /** + * Format error message including expected tokens. + * + * @param int $symbol Unexpected symbol + * @param int $state State at time of error + * + * @return string Formatted error message + */ + protected function getErrorMessage(int $symbol, int $state) : string { $expectedString = ''; if ($expected = $this->getExpectedTokens($state)) { $expectedString = ', expecting ' . implode(' or ', $expected); @@ -359,24 +387,31 @@ abstract class ParserAbstract implements Parser return 'Syntax error, unexpected ' . $this->symbolToName[$symbol] . $expectedString; } - protected function getExpectedTokens($state) { - $expected = array(); + /** + * Get limited number of expected tokens in given state. + * + * @param int $state State + * + * @return string[] Expected tokens. If too many, an empty array is returned. + */ + protected function getExpectedTokens(int $state) : array { + $expected = []; $base = $this->actionBase[$state]; foreach ($this->symbolToName as $symbol => $name) { $idx = $base + $symbol; if ($idx >= 0 && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $symbol || $state < $this->YY2TBLSTATE - && ($idx = $this->actionBase[$state + $this->YYNLSTATES] + $symbol) >= 0 + && ($idx = $this->actionBase[$state + $this->numNonLeafStates] + $symbol) >= 0 && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $symbol ) { - if ($this->action[$idx] != $this->unexpectedTokenRule - && $this->action[$idx] != $this->defaultAction - && $symbol != $this->errorSymbol + if ($this->action[$idx] !== $this->unexpectedTokenRule + && $this->action[$idx] !== $this->defaultAction + && $symbol !== $this->errorSymbol ) { - if (count($expected) == 4) { + if (count($expected) === 4) { /* Too many expected tokens */ - return array(); + return []; } $expected[] = $name; @@ -429,10 +464,10 @@ abstract class ParserAbstract implements Parser /** * Moves statements of semicolon-style namespaces into $ns->stmts and checks various error conditions. * - * @param Node[] $stmts - * @return Node[] + * @param Node\Stmt[] $stmts + * @return Node\Stmt[] */ - protected function handleNamespaces(array $stmts) { + protected function handleNamespaces(array $stmts) : array { $hasErrored = false; $style = $this->getNamespacingStyle($stmts); if (null === $style) { @@ -455,12 +490,16 @@ abstract class ParserAbstract implements Parser return $stmts; } else { // For semicolon namespaces we have to move the statements after a namespace declaration into ->stmts - $resultStmts = array(); + $resultStmts = []; $targetStmts =& $resultStmts; + $lastNs = null; foreach ($stmts as $stmt) { if ($stmt instanceof Node\Stmt\Namespace_) { + if ($lastNs !== null) { + $this->fixupNamespaceAttributes($lastNs); + } if ($stmt->stmts === null) { - $stmt->stmts = array(); + $stmt->stmts = []; $targetStmts =& $stmt->stmts; $resultStmts[] = $stmt; } else { @@ -468,6 +507,7 @@ abstract class ParserAbstract implements Parser $resultStmts[] = $stmt; $targetStmts =& $resultStmts; } + $lastNs = $stmt; } elseif ($stmt instanceof Node\Stmt\HaltCompiler) { // __halt_compiler() is not moved into the namespace $resultStmts[] = $stmt; @@ -475,10 +515,38 @@ abstract class ParserAbstract implements Parser $targetStmts[] = $stmt; } } + if ($lastNs !== null) { + $this->fixupNamespaceAttributes($lastNs); + } return $resultStmts; } } + private function fixupNamespaceAttributes(Node\Stmt\Namespace_ $stmt) { + // We moved the statements into the namespace node, as such the end of the namespace node + // needs to be extended to the end of the statements. + if (empty($stmt->stmts)) { + return; + } + + // We only move the builtin end attributes here. This is the best we can do with the + // knowledge we have. + $endAttributes = ['endLine', 'endFilePos', 'endTokenPos']; + $lastStmt = $stmt->stmts[count($stmt->stmts) - 1]; + foreach ($endAttributes as $endAttribute) { + if ($lastStmt->hasAttribute($endAttribute)) { + $stmt->setAttribute($endAttribute, $lastStmt->getAttribute($endAttribute)); + } + } + } + + /** + * Determine namespacing style (semicolon or brace) + * + * @param Node[] $stmts Top-level statements. + * + * @return null|string One of "semicolon", "brace" or null (no namespaces) + */ private function getNamespacingStyle(array $stmts) { $style = null; $hasNotAllowedStmts = false; @@ -512,7 +580,7 @@ abstract class ParserAbstract implements Parser } /* There may be a hashbang line at the very start of the file */ - if ($i == 0 && $stmt instanceof Node\Stmt\InlineHTML && preg_match('/\A#!.*\r?\n\z/', $stmt->value)) { + if ($i === 0 && $stmt instanceof Node\Stmt\InlineHTML && preg_match('/\A#!.*\r?\n\z/', $stmt->value)) { continue; } @@ -522,6 +590,61 @@ abstract class ParserAbstract implements Parser return $style; } + /** + * Fix up parsing of static property calls in PHP 5. + * + * In PHP 5 A::$b[c][d] and A::$b[c][d]() have very different interpretation. The former is + * interpreted as (A::$b)[c][d], while the latter is the same as A::{$b[c][d]}(). We parse the + * latter as the former initially and this method fixes the AST into the correct form when we + * encounter the "()". + * + * @param Node\Expr\StaticPropertyFetch|Node\Expr\ArrayDimFetch $prop + * @param Node\Arg[] $args + * @param array $attributes + * + * @return Expr\StaticCall + */ + protected function fixupPhp5StaticPropCall($prop, array $args, array $attributes) : Expr\StaticCall { + if ($prop instanceof Node\Expr\StaticPropertyFetch) { + $name = $prop->name instanceof VarLikeIdentifier + ? $prop->name->toString() : $prop->name; + $var = new Expr\Variable($name, $prop->name->getAttributes()); + return new Expr\StaticCall($prop->class, $var, $args, $attributes); + } elseif ($prop instanceof Node\Expr\ArrayDimFetch) { + $tmp = $prop; + while ($tmp->var instanceof Node\Expr\ArrayDimFetch) { + $tmp = $tmp->var; + } + + /** @var Expr\StaticPropertyFetch $staticProp */ + $staticProp = $tmp->var; + + // Set start attributes to attributes of innermost node + $tmp = $prop; + $this->fixupStartAttributes($tmp, $staticProp->name); + while ($tmp->var instanceof Node\Expr\ArrayDimFetch) { + $tmp = $tmp->var; + $this->fixupStartAttributes($tmp, $staticProp->name); + } + + $name = $staticProp->name instanceof VarLikeIdentifier + ? $staticProp->name->toString() : $staticProp->name; + $tmp->var = new Expr\Variable($name, $staticProp->name->getAttributes()); + return new Expr\StaticCall($staticProp->class, $prop, $args, $attributes); + } else { + throw new \Exception; + } + } + + protected function fixupStartAttributes(Node $to, Node $from) { + $startAttributes = ['startLine', 'startFilePos', 'startTokenPos']; + foreach ($startAttributes as $startAttribute) { + if ($from->hasAttribute($startAttribute)) { + $to->setAttribute($startAttribute, $from->getAttribute($startAttribute)); + } + } + } + protected function handleBuiltinTypes(Name $name) { $scalarTypes = [ 'bool' => true, @@ -537,17 +660,22 @@ abstract class ParserAbstract implements Parser return $name; } - $lowerName = strtolower($name->toString()); - return isset($scalarTypes[$lowerName]) ? $lowerName : $name; + $lowerName = $name->toLowerString(); + if (!isset($scalarTypes[$lowerName])) { + return $name; + } + + return new Node\Identifier($lowerName, $name->getAttributes()); } - protected static $specialNames = array( - 'self' => true, - 'parent' => true, - 'static' => true, - ); - - protected function getAttributesAt($pos) { + /** + * Get combined start and end attributes at a stack location + * + * @param int $pos Stack location + * + * @return array Combined start and end attributes + */ + protected function getAttributesAt(int $pos) : array { return $this->startAttributeStack[$pos] + $this->endAttributeStack[$pos]; } @@ -561,7 +689,15 @@ abstract class ParserAbstract implements Parser } } - protected function parseNumString($str, $attributes) { + /** + * Parse a T_NUM_STRING token into either an integer or string node. + * + * @param string $str Number string + * @param array $attributes Attributes + * + * @return LNumber|String_ Integer or string node. + */ + protected function parseNumString(string $str, array $attributes) { if (!preg_match('/^(?:0|-?[1-9][0-9]*)$/', $str)) { return new String_($str, $attributes); } @@ -602,7 +738,7 @@ abstract class ParserAbstract implements Parser } protected function checkNamespace(Namespace_ $node) { - if (isset(self::$specialNames[strtolower($node->name)])) { + if ($node->name && $node->name->isSpecialClassName()) { $this->emitError(new Error( sprintf('Cannot use \'%s\' as namespace name', $node->name), $node->name->getAttributes() @@ -621,14 +757,14 @@ abstract class ParserAbstract implements Parser } protected function checkClass(Class_ $node, $namePos) { - if (null !== $node->name && isset(self::$specialNames[strtolower($node->name)])) { + if (null !== $node->name && $node->name->isSpecialClassName()) { $this->emitError(new Error( sprintf('Cannot use \'%s\' as class name as it is reserved', $node->name), $this->getAttributesAt($namePos) )); } - if (isset(self::$specialNames[strtolower($node->extends)])) { + if ($node->extends && $node->extends->isSpecialClassName()) { $this->emitError(new Error( sprintf('Cannot use \'%s\' as class name as it is reserved', $node->extends), $node->extends->getAttributes() @@ -636,7 +772,7 @@ abstract class ParserAbstract implements Parser } foreach ($node->implements as $interface) { - if (isset(self::$specialNames[strtolower($interface)])) { + if ($interface->isSpecialClassName()) { $this->emitError(new Error( sprintf('Cannot use \'%s\' as interface name as it is reserved', $interface), $interface->getAttributes() @@ -646,7 +782,7 @@ abstract class ParserAbstract implements Parser } protected function checkInterface(Interface_ $node, $namePos) { - if (null !== $node->name && isset(self::$specialNames[strtolower($node->name)])) { + if (null !== $node->name && $node->name->isSpecialClassName()) { $this->emitError(new Error( sprintf('Cannot use \'%s\' as class name as it is reserved', $node->name), $this->getAttributesAt($namePos) @@ -654,7 +790,7 @@ abstract class ParserAbstract implements Parser } foreach ($node->extends as $interface) { - if (isset(self::$specialNames[strtolower($interface)])) { + if ($interface->isSpecialClassName()) { $this->emitError(new Error( sprintf('Cannot use \'%s\' as interface name as it is reserved', $interface), $interface->getAttributes() @@ -665,7 +801,7 @@ abstract class ParserAbstract implements Parser protected function checkClassMethod(ClassMethod $node, $modifierPos) { if ($node->flags & Class_::MODIFIER_STATIC) { - switch (strtolower($node->name)) { + switch ($node->name->toLowerString()) { case '__construct': $this->emitError(new Error( sprintf('Constructor %s() cannot be static', $node->name), @@ -716,7 +852,7 @@ abstract class ParserAbstract implements Parser } protected function checkUseUse(UseUse $node, $namePos) { - if ('self' == strtolower($node->alias) || 'parent' == strtolower($node->alias)) { + if ($node->alias && $node->alias->isSpecialClassName()) { $this->emitError(new Error( sprintf( 'Cannot use %s as %s because \'%2$s\' is a special class name', diff --git a/vendor/nikic/php-parser/lib/PhpParser/ParserFactory.php b/vendor/nikic/php-parser/lib/PhpParser/ParserFactory.php index 28b9070d..f041e7ff 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/ParserFactory.php +++ b/vendor/nikic/php-parser/lib/PhpParser/ParserFactory.php @@ -1,8 +1,9 @@ -type ? $this->pType($node->type) . ' ' : '') + return ($node->type ? $this->p($node->type) . ' ' : '') . ($node->byRef ? '&' : '') . ($node->variadic ? '...' : '') - . '$' . $node->name + . $this->p($node->var) . ($node->default ? ' = ' . $this->p($node->default) : ''); } @@ -34,7 +34,15 @@ class Standard extends PrettyPrinterAbstract } protected function pNullableType(Node\NullableType $node) { - return '?' . $this->pType($node->type); + return '?' . $this->p($node->type); + } + + protected function pIdentifier(Node\Identifier $node) { + return $node->name; + } + + protected function pVarLikeIdentifier(Node\VarLikeIdentifier $node) { + return '$' . $node->name; } // Names @@ -94,24 +102,24 @@ class Standard extends PrettyPrinterAbstract $label = $node->getAttribute('docLabel'); if ($label && !$this->containsEndLabel($node->value, $label)) { if ($node->value === '') { - return $this->pNoIndent("<<<'$label'\n$label") . $this->docStringEndToken; + return "<<<'$label'\n$label" . $this->docStringEndToken; } - return $this->pNoIndent("<<<'$label'\n$node->value\n$label") + return "<<<'$label'\n$node->value\n$label" . $this->docStringEndToken; } /* break missing intentionally */ case Scalar\String_::KIND_SINGLE_QUOTED: - return '\'' . $this->pNoIndent(addcslashes($node->value, '\'\\')) . '\''; + return $this->pSingleQuotedString($node->value); case Scalar\String_::KIND_HEREDOC: $label = $node->getAttribute('docLabel'); if ($label && !$this->containsEndLabel($node->value, $label)) { if ($node->value === '') { - return $this->pNoIndent("<<<$label\n$label") . $this->docStringEndToken; + return "<<<$label\n$label" . $this->docStringEndToken; } $escaped = $this->escapeString($node->value, null); - return $this->pNoIndent("<<<$label\n" . $escaped ."\n$label") + return "<<<$label\n" . $escaped . "\n$label" . $this->docStringEndToken; } /* break missing intentionally */ @@ -129,12 +137,11 @@ class Standard extends PrettyPrinterAbstract && $node->parts[0] instanceof Scalar\EncapsedStringPart && $node->parts[0]->value === '' ) { - return $this->pNoIndent("<<<$label\n$label") . $this->docStringEndToken; + return "<<<$label\n$label" . $this->docStringEndToken; } - return $this->pNoIndent( - "<<<$label\n" . $this->pEncapsList($node->parts, null) . "\n$label" - ) . $this->docStringEndToken; + return "<<<$label\n" . $this->pEncapsList($node->parts, null) . "\n$label" + . $this->docStringEndToken; } } return '"' . $this->pEncapsList($node->parts, '"') . '"'; @@ -191,186 +198,190 @@ class Standard extends PrettyPrinterAbstract return preg_match('/^-?[0-9]+$/', $stringValue) ? $stringValue . '.0' : $stringValue; } + protected function pScalar_EncapsedStringPart(Scalar\EncapsedStringPart $node) { + throw new \LogicException('Cannot directly print EncapsedStringPart'); + } + // Assignments protected function pExpr_Assign(Expr\Assign $node) { - return $this->pInfixOp('Expr_Assign', $node->var, ' = ', $node->expr); + return $this->pInfixOp(Expr\Assign::class, $node->var, ' = ', $node->expr); } protected function pExpr_AssignRef(Expr\AssignRef $node) { - return $this->pInfixOp('Expr_AssignRef', $node->var, ' =& ', $node->expr); + return $this->pInfixOp(Expr\AssignRef::class, $node->var, ' =& ', $node->expr); } protected function pExpr_AssignOp_Plus(AssignOp\Plus $node) { - return $this->pInfixOp('Expr_AssignOp_Plus', $node->var, ' += ', $node->expr); + return $this->pInfixOp(AssignOp\Plus::class, $node->var, ' += ', $node->expr); } protected function pExpr_AssignOp_Minus(AssignOp\Minus $node) { - return $this->pInfixOp('Expr_AssignOp_Minus', $node->var, ' -= ', $node->expr); + return $this->pInfixOp(AssignOp\Minus::class, $node->var, ' -= ', $node->expr); } protected function pExpr_AssignOp_Mul(AssignOp\Mul $node) { - return $this->pInfixOp('Expr_AssignOp_Mul', $node->var, ' *= ', $node->expr); + return $this->pInfixOp(AssignOp\Mul::class, $node->var, ' *= ', $node->expr); } protected function pExpr_AssignOp_Div(AssignOp\Div $node) { - return $this->pInfixOp('Expr_AssignOp_Div', $node->var, ' /= ', $node->expr); + return $this->pInfixOp(AssignOp\Div::class, $node->var, ' /= ', $node->expr); } protected function pExpr_AssignOp_Concat(AssignOp\Concat $node) { - return $this->pInfixOp('Expr_AssignOp_Concat', $node->var, ' .= ', $node->expr); + return $this->pInfixOp(AssignOp\Concat::class, $node->var, ' .= ', $node->expr); } protected function pExpr_AssignOp_Mod(AssignOp\Mod $node) { - return $this->pInfixOp('Expr_AssignOp_Mod', $node->var, ' %= ', $node->expr); + return $this->pInfixOp(AssignOp\Mod::class, $node->var, ' %= ', $node->expr); } protected function pExpr_AssignOp_BitwiseAnd(AssignOp\BitwiseAnd $node) { - return $this->pInfixOp('Expr_AssignOp_BitwiseAnd', $node->var, ' &= ', $node->expr); + return $this->pInfixOp(AssignOp\BitwiseAnd::class, $node->var, ' &= ', $node->expr); } protected function pExpr_AssignOp_BitwiseOr(AssignOp\BitwiseOr $node) { - return $this->pInfixOp('Expr_AssignOp_BitwiseOr', $node->var, ' |= ', $node->expr); + return $this->pInfixOp(AssignOp\BitwiseOr::class, $node->var, ' |= ', $node->expr); } protected function pExpr_AssignOp_BitwiseXor(AssignOp\BitwiseXor $node) { - return $this->pInfixOp('Expr_AssignOp_BitwiseXor', $node->var, ' ^= ', $node->expr); + return $this->pInfixOp(AssignOp\BitwiseXor::class, $node->var, ' ^= ', $node->expr); } protected function pExpr_AssignOp_ShiftLeft(AssignOp\ShiftLeft $node) { - return $this->pInfixOp('Expr_AssignOp_ShiftLeft', $node->var, ' <<= ', $node->expr); + return $this->pInfixOp(AssignOp\ShiftLeft::class, $node->var, ' <<= ', $node->expr); } protected function pExpr_AssignOp_ShiftRight(AssignOp\ShiftRight $node) { - return $this->pInfixOp('Expr_AssignOp_ShiftRight', $node->var, ' >>= ', $node->expr); + return $this->pInfixOp(AssignOp\ShiftRight::class, $node->var, ' >>= ', $node->expr); } protected function pExpr_AssignOp_Pow(AssignOp\Pow $node) { - return $this->pInfixOp('Expr_AssignOp_Pow', $node->var, ' **= ', $node->expr); + return $this->pInfixOp(AssignOp\Pow::class, $node->var, ' **= ', $node->expr); } // Binary expressions protected function pExpr_BinaryOp_Plus(BinaryOp\Plus $node) { - return $this->pInfixOp('Expr_BinaryOp_Plus', $node->left, ' + ', $node->right); + return $this->pInfixOp(BinaryOp\Plus::class, $node->left, ' + ', $node->right); } protected function pExpr_BinaryOp_Minus(BinaryOp\Minus $node) { - return $this->pInfixOp('Expr_BinaryOp_Minus', $node->left, ' - ', $node->right); + return $this->pInfixOp(BinaryOp\Minus::class, $node->left, ' - ', $node->right); } protected function pExpr_BinaryOp_Mul(BinaryOp\Mul $node) { - return $this->pInfixOp('Expr_BinaryOp_Mul', $node->left, ' * ', $node->right); + return $this->pInfixOp(BinaryOp\Mul::class, $node->left, ' * ', $node->right); } protected function pExpr_BinaryOp_Div(BinaryOp\Div $node) { - return $this->pInfixOp('Expr_BinaryOp_Div', $node->left, ' / ', $node->right); + return $this->pInfixOp(BinaryOp\Div::class, $node->left, ' / ', $node->right); } protected function pExpr_BinaryOp_Concat(BinaryOp\Concat $node) { - return $this->pInfixOp('Expr_BinaryOp_Concat', $node->left, ' . ', $node->right); + return $this->pInfixOp(BinaryOp\Concat::class, $node->left, ' . ', $node->right); } protected function pExpr_BinaryOp_Mod(BinaryOp\Mod $node) { - return $this->pInfixOp('Expr_BinaryOp_Mod', $node->left, ' % ', $node->right); + return $this->pInfixOp(BinaryOp\Mod::class, $node->left, ' % ', $node->right); } protected function pExpr_BinaryOp_BooleanAnd(BinaryOp\BooleanAnd $node) { - return $this->pInfixOp('Expr_BinaryOp_BooleanAnd', $node->left, ' && ', $node->right); + return $this->pInfixOp(BinaryOp\BooleanAnd::class, $node->left, ' && ', $node->right); } protected function pExpr_BinaryOp_BooleanOr(BinaryOp\BooleanOr $node) { - return $this->pInfixOp('Expr_BinaryOp_BooleanOr', $node->left, ' || ', $node->right); + return $this->pInfixOp(BinaryOp\BooleanOr::class, $node->left, ' || ', $node->right); } protected function pExpr_BinaryOp_BitwiseAnd(BinaryOp\BitwiseAnd $node) { - return $this->pInfixOp('Expr_BinaryOp_BitwiseAnd', $node->left, ' & ', $node->right); + return $this->pInfixOp(BinaryOp\BitwiseAnd::class, $node->left, ' & ', $node->right); } protected function pExpr_BinaryOp_BitwiseOr(BinaryOp\BitwiseOr $node) { - return $this->pInfixOp('Expr_BinaryOp_BitwiseOr', $node->left, ' | ', $node->right); + return $this->pInfixOp(BinaryOp\BitwiseOr::class, $node->left, ' | ', $node->right); } protected function pExpr_BinaryOp_BitwiseXor(BinaryOp\BitwiseXor $node) { - return $this->pInfixOp('Expr_BinaryOp_BitwiseXor', $node->left, ' ^ ', $node->right); + return $this->pInfixOp(BinaryOp\BitwiseXor::class, $node->left, ' ^ ', $node->right); } protected function pExpr_BinaryOp_ShiftLeft(BinaryOp\ShiftLeft $node) { - return $this->pInfixOp('Expr_BinaryOp_ShiftLeft', $node->left, ' << ', $node->right); + return $this->pInfixOp(BinaryOp\ShiftLeft::class, $node->left, ' << ', $node->right); } protected function pExpr_BinaryOp_ShiftRight(BinaryOp\ShiftRight $node) { - return $this->pInfixOp('Expr_BinaryOp_ShiftRight', $node->left, ' >> ', $node->right); + return $this->pInfixOp(BinaryOp\ShiftRight::class, $node->left, ' >> ', $node->right); } protected function pExpr_BinaryOp_Pow(BinaryOp\Pow $node) { - return $this->pInfixOp('Expr_BinaryOp_Pow', $node->left, ' ** ', $node->right); + return $this->pInfixOp(BinaryOp\Pow::class, $node->left, ' ** ', $node->right); } protected function pExpr_BinaryOp_LogicalAnd(BinaryOp\LogicalAnd $node) { - return $this->pInfixOp('Expr_BinaryOp_LogicalAnd', $node->left, ' and ', $node->right); + return $this->pInfixOp(BinaryOp\LogicalAnd::class, $node->left, ' and ', $node->right); } protected function pExpr_BinaryOp_LogicalOr(BinaryOp\LogicalOr $node) { - return $this->pInfixOp('Expr_BinaryOp_LogicalOr', $node->left, ' or ', $node->right); + return $this->pInfixOp(BinaryOp\LogicalOr::class, $node->left, ' or ', $node->right); } protected function pExpr_BinaryOp_LogicalXor(BinaryOp\LogicalXor $node) { - return $this->pInfixOp('Expr_BinaryOp_LogicalXor', $node->left, ' xor ', $node->right); + return $this->pInfixOp(BinaryOp\LogicalXor::class, $node->left, ' xor ', $node->right); } protected function pExpr_BinaryOp_Equal(BinaryOp\Equal $node) { - return $this->pInfixOp('Expr_BinaryOp_Equal', $node->left, ' == ', $node->right); + return $this->pInfixOp(BinaryOp\Equal::class, $node->left, ' == ', $node->right); } protected function pExpr_BinaryOp_NotEqual(BinaryOp\NotEqual $node) { - return $this->pInfixOp('Expr_BinaryOp_NotEqual', $node->left, ' != ', $node->right); + return $this->pInfixOp(BinaryOp\NotEqual::class, $node->left, ' != ', $node->right); } protected function pExpr_BinaryOp_Identical(BinaryOp\Identical $node) { - return $this->pInfixOp('Expr_BinaryOp_Identical', $node->left, ' === ', $node->right); + return $this->pInfixOp(BinaryOp\Identical::class, $node->left, ' === ', $node->right); } protected function pExpr_BinaryOp_NotIdentical(BinaryOp\NotIdentical $node) { - return $this->pInfixOp('Expr_BinaryOp_NotIdentical', $node->left, ' !== ', $node->right); + return $this->pInfixOp(BinaryOp\NotIdentical::class, $node->left, ' !== ', $node->right); } protected function pExpr_BinaryOp_Spaceship(BinaryOp\Spaceship $node) { - return $this->pInfixOp('Expr_BinaryOp_Spaceship', $node->left, ' <=> ', $node->right); + return $this->pInfixOp(BinaryOp\Spaceship::class, $node->left, ' <=> ', $node->right); } protected function pExpr_BinaryOp_Greater(BinaryOp\Greater $node) { - return $this->pInfixOp('Expr_BinaryOp_Greater', $node->left, ' > ', $node->right); + return $this->pInfixOp(BinaryOp\Greater::class, $node->left, ' > ', $node->right); } protected function pExpr_BinaryOp_GreaterOrEqual(BinaryOp\GreaterOrEqual $node) { - return $this->pInfixOp('Expr_BinaryOp_GreaterOrEqual', $node->left, ' >= ', $node->right); + return $this->pInfixOp(BinaryOp\GreaterOrEqual::class, $node->left, ' >= ', $node->right); } protected function pExpr_BinaryOp_Smaller(BinaryOp\Smaller $node) { - return $this->pInfixOp('Expr_BinaryOp_Smaller', $node->left, ' < ', $node->right); + return $this->pInfixOp(BinaryOp\Smaller::class, $node->left, ' < ', $node->right); } protected function pExpr_BinaryOp_SmallerOrEqual(BinaryOp\SmallerOrEqual $node) { - return $this->pInfixOp('Expr_BinaryOp_SmallerOrEqual', $node->left, ' <= ', $node->right); + return $this->pInfixOp(BinaryOp\SmallerOrEqual::class, $node->left, ' <= ', $node->right); } protected function pExpr_BinaryOp_Coalesce(BinaryOp\Coalesce $node) { - return $this->pInfixOp('Expr_BinaryOp_Coalesce', $node->left, ' ?? ', $node->right); + return $this->pInfixOp(BinaryOp\Coalesce::class, $node->left, ' ?? ', $node->right); } protected function pExpr_Instanceof(Expr\Instanceof_ $node) { - return $this->pInfixOp('Expr_Instanceof', $node->expr, ' instanceof ', $node->class); + return $this->pInfixOp(Expr\Instanceof_::class, $node->expr, ' instanceof ', $node->class); } // Unary expressions protected function pExpr_BooleanNot(Expr\BooleanNot $node) { - return $this->pPrefixOp('Expr_BooleanNot', '!', $node->expr); + return $this->pPrefixOp(Expr\BooleanNot::class, '!', $node->expr); } protected function pExpr_BitwiseNot(Expr\BitwiseNot $node) { - return $this->pPrefixOp('Expr_BitwiseNot', '~', $node->expr); + return $this->pPrefixOp(Expr\BitwiseNot::class, '~', $node->expr); } protected function pExpr_UnaryMinus(Expr\UnaryMinus $node) { @@ -378,7 +389,7 @@ class Standard extends PrettyPrinterAbstract // Enforce -(-$expr) instead of --$expr return '-(' . $this->p($node->expr) . ')'; } - return $this->pPrefixOp('Expr_UnaryMinus', '-', $node->expr); + return $this->pPrefixOp(Expr\UnaryMinus::class, '-', $node->expr); } protected function pExpr_UnaryPlus(Expr\UnaryPlus $node) { @@ -386,65 +397,65 @@ class Standard extends PrettyPrinterAbstract // Enforce +(+$expr) instead of ++$expr return '+(' . $this->p($node->expr) . ')'; } - return $this->pPrefixOp('Expr_UnaryPlus', '+', $node->expr); + return $this->pPrefixOp(Expr\UnaryPlus::class, '+', $node->expr); } protected function pExpr_PreInc(Expr\PreInc $node) { - return $this->pPrefixOp('Expr_PreInc', '++', $node->var); + return $this->pPrefixOp(Expr\PreInc::class, '++', $node->var); } protected function pExpr_PreDec(Expr\PreDec $node) { - return $this->pPrefixOp('Expr_PreDec', '--', $node->var); + return $this->pPrefixOp(Expr\PreDec::class, '--', $node->var); } protected function pExpr_PostInc(Expr\PostInc $node) { - return $this->pPostfixOp('Expr_PostInc', $node->var, '++'); + return $this->pPostfixOp(Expr\PostInc::class, $node->var, '++'); } protected function pExpr_PostDec(Expr\PostDec $node) { - return $this->pPostfixOp('Expr_PostDec', $node->var, '--'); + return $this->pPostfixOp(Expr\PostDec::class, $node->var, '--'); } protected function pExpr_ErrorSuppress(Expr\ErrorSuppress $node) { - return $this->pPrefixOp('Expr_ErrorSuppress', '@', $node->expr); + return $this->pPrefixOp(Expr\ErrorSuppress::class, '@', $node->expr); } protected function pExpr_YieldFrom(Expr\YieldFrom $node) { - return $this->pPrefixOp('Expr_YieldFrom', 'yield from ', $node->expr); + return $this->pPrefixOp(Expr\YieldFrom::class, 'yield from ', $node->expr); } protected function pExpr_Print(Expr\Print_ $node) { - return $this->pPrefixOp('Expr_Print', 'print ', $node->expr); + return $this->pPrefixOp(Expr\Print_::class, 'print ', $node->expr); } // Casts protected function pExpr_Cast_Int(Cast\Int_ $node) { - return $this->pPrefixOp('Expr_Cast_Int', '(int) ', $node->expr); + return $this->pPrefixOp(Cast\Int_::class, '(int) ', $node->expr); } protected function pExpr_Cast_Double(Cast\Double $node) { - return $this->pPrefixOp('Expr_Cast_Double', '(double) ', $node->expr); + return $this->pPrefixOp(Cast\Double::class, '(double) ', $node->expr); } protected function pExpr_Cast_String(Cast\String_ $node) { - return $this->pPrefixOp('Expr_Cast_String', '(string) ', $node->expr); + return $this->pPrefixOp(Cast\String_::class, '(string) ', $node->expr); } protected function pExpr_Cast_Array(Cast\Array_ $node) { - return $this->pPrefixOp('Expr_Cast_Array', '(array) ', $node->expr); + return $this->pPrefixOp(Cast\Array_::class, '(array) ', $node->expr); } protected function pExpr_Cast_Object(Cast\Object_ $node) { - return $this->pPrefixOp('Expr_Cast_Object', '(object) ', $node->expr); + return $this->pPrefixOp(Cast\Object_::class, '(object) ', $node->expr); } protected function pExpr_Cast_Bool(Cast\Bool_ $node) { - return $this->pPrefixOp('Expr_Cast_Bool', '(bool) ', $node->expr); + return $this->pPrefixOp(Cast\Bool_::class, '(bool) ', $node->expr); } protected function pExpr_Cast_Unset(Cast\Unset_ $node) { - return $this->pPrefixOp('Expr_Cast_Unset', '(unset) ', $node->expr); + return $this->pPrefixOp(Cast\Unset_::class, '(unset) ', $node->expr); } // Function calls and similar constructs @@ -482,12 +493,12 @@ class Standard extends PrettyPrinterAbstract } protected function pExpr_Include(Expr\Include_ $node) { - static $map = array( + static $map = [ Expr\Include_::TYPE_INCLUDE => 'include', Expr\Include_::TYPE_INCLUDE_ONCE => 'include_once', Expr\Include_::TYPE_REQUIRE => 'require', Expr\Include_::TYPE_REQUIRE_ONCE => 'require_once', - ); + ]; return $map[$node->type] . ' ' . $this->p($node->expr); } @@ -535,8 +546,7 @@ class Standard extends PrettyPrinterAbstract } protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node) { - return $this->p($node->class) . '::' - . (is_string($node->name) ? $node->name : $this->p($node->name)); + return $this->p($node->class) . '::' . $this->p($node->name); } protected function pExpr_PropertyFetch(Expr\PropertyFetch $node) { @@ -555,13 +565,13 @@ class Standard extends PrettyPrinterAbstract return ($node->static ? 'static ' : '') . 'function ' . ($node->byRef ? '&' : '') . '(' . $this->pCommaSeparated($node->params) . ')' - . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')': '') - . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '') - . ' {' . $this->pStmts($node->stmts) . "\n" . '}'; + . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')' : '') + . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '') + . ' {' . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pExpr_ClosureUse(Expr\ClosureUse $node) { - return ($node->byRef ? '&' : '') . '$' . $node->var; + return ($node->byRef ? '&' : '') . $this->p($node->var); } protected function pExpr_New(Expr\New_ $node) { @@ -579,7 +589,7 @@ class Standard extends PrettyPrinterAbstract protected function pExpr_Ternary(Expr\Ternary $node) { // a bit of cheating: we treat the ternary as a binary op where the ?...: part is the operator. // this is okay because the part between ? and : never needs parentheses. - return $this->pInfixOp('Expr_Ternary', + return $this->pInfixOp(Expr\Ternary::class, $node->cond, ' ?' . (null !== $node->if ? ' ' . $this->p($node->if) . ' ' : '') . ': ', $node->else ); } @@ -606,10 +616,11 @@ class Standard extends PrettyPrinterAbstract protected function pStmt_Namespace(Stmt\Namespace_ $node) { if ($this->canUseSemicolonNamespaces) { - return 'namespace ' . $this->p($node->name) . ';' . "\n" . $this->pStmts($node->stmts, false); + return 'namespace ' . $this->p($node->name) . ';' + . $this->nl . $this->pStmts($node->stmts, false); } else { return 'namespace' . (null !== $node->name ? ' ' . $this->p($node->name) : '') - . ' {' . $this->pStmts($node->stmts) . "\n" . '}'; + . ' {' . $this->pStmts($node->stmts) . $this->nl . '}'; } } @@ -625,7 +636,7 @@ class Standard extends PrettyPrinterAbstract protected function pStmt_UseUse(Stmt\UseUse $node) { return $this->pUseType($node->type) . $this->p($node->name) - . ($node->name->getLast() !== $node->alias ? ' as ' . $node->alias : ''); + . (null !== $node->alias ? ' as ' . $node->alias : ''); } protected function pUseType($type) { @@ -636,7 +647,7 @@ class Standard extends PrettyPrinterAbstract protected function pStmt_Interface(Stmt\Interface_ $node) { return 'interface ' . $node->name . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '') - . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}'; + . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_Class(Stmt\Class_ $node) { @@ -645,14 +656,14 @@ class Standard extends PrettyPrinterAbstract protected function pStmt_Trait(Stmt\Trait_ $node) { return 'trait ' . $node->name - . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}'; + . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_TraitUse(Stmt\TraitUse $node) { return 'use ' . $this->pCommaSeparated($node->traits) . (empty($node->adaptations) ? ';' - : ' {' . $this->pStmts($node->adaptations) . "\n" . '}'); + : ' {' . $this->pStmts($node->adaptations) . $this->nl . '}'); } protected function pStmt_TraitUseAdaptation_Precedence(Stmt\TraitUseAdaptation\Precedence $node) { @@ -681,9 +692,9 @@ class Standard extends PrettyPrinterAbstract return $this->pModifiers($node->flags) . 'function ' . ($node->byRef ? '&' : '') . $node->name . '(' . $this->pCommaSeparated($node->params) . ')' - . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '') + . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '') . (null !== $node->stmts - ? "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}' + ? $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}' : ';'); } @@ -695,8 +706,8 @@ class Standard extends PrettyPrinterAbstract protected function pStmt_Function(Stmt\Function_ $node) { return 'function ' . ($node->byRef ? '&' : '') . $node->name . '(' . $this->pCommaSeparated($node->params) . ')' - . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '') - . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}'; + . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '') + . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_Const(Stmt\Const_ $node) { @@ -705,7 +716,7 @@ class Standard extends PrettyPrinterAbstract protected function pStmt_Declare(Stmt\Declare_ $node) { return 'declare (' . $this->pCommaSeparated($node->declares) . ')' - . (null !== $node->stmts ? ' {' . $this->pStmts($node->stmts) . "\n" . '}' : ';'); + . (null !== $node->stmts ? ' {' . $this->pStmts($node->stmts) . $this->nl . '}' : ';'); } protected function pStmt_DeclareDeclare(Stmt\DeclareDeclare $node) { @@ -716,18 +727,18 @@ class Standard extends PrettyPrinterAbstract protected function pStmt_If(Stmt\If_ $node) { return 'if (' . $this->p($node->cond) . ') {' - . $this->pStmts($node->stmts) . "\n" . '}' - . $this->pImplode($node->elseifs) - . (null !== $node->else ? $this->p($node->else) : ''); + . $this->pStmts($node->stmts) . $this->nl . '}' + . ($node->elseifs ? ' ' . $this->pImplode($node->elseifs, ' ') : '') + . (null !== $node->else ? ' ' . $this->p($node->else) : ''); } protected function pStmt_ElseIf(Stmt\ElseIf_ $node) { - return ' elseif (' . $this->p($node->cond) . ') {' - . $this->pStmts($node->stmts) . "\n" . '}'; + return 'elseif (' . $this->p($node->cond) . ') {' + . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_Else(Stmt\Else_ $node) { - return ' else {' . $this->pStmts($node->stmts) . "\n" . '}'; + return 'else {' . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_For(Stmt\For_ $node) { @@ -735,29 +746,29 @@ class Standard extends PrettyPrinterAbstract . $this->pCommaSeparated($node->init) . ';' . (!empty($node->cond) ? ' ' : '') . $this->pCommaSeparated($node->cond) . ';' . (!empty($node->loop) ? ' ' : '') . $this->pCommaSeparated($node->loop) - . ') {' . $this->pStmts($node->stmts) . "\n" . '}'; + . ') {' . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_Foreach(Stmt\Foreach_ $node) { return 'foreach (' . $this->p($node->expr) . ' as ' . (null !== $node->keyVar ? $this->p($node->keyVar) . ' => ' : '') . ($node->byRef ? '&' : '') . $this->p($node->valueVar) . ') {' - . $this->pStmts($node->stmts) . "\n" . '}'; + . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_While(Stmt\While_ $node) { return 'while (' . $this->p($node->cond) . ') {' - . $this->pStmts($node->stmts) . "\n" . '}'; + . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_Do(Stmt\Do_ $node) { - return 'do {' . $this->pStmts($node->stmts) . "\n" + return 'do {' . $this->pStmts($node->stmts) . $this->nl . '} while (' . $this->p($node->cond) . ');'; } protected function pStmt_Switch(Stmt\Switch_ $node) { return 'switch (' . $this->p($node->cond) . ') {' - . $this->pStmts($node->cases) . "\n" . '}'; + . $this->pStmts($node->cases) . $this->nl . '}'; } protected function pStmt_Case(Stmt\Case_ $node) { @@ -766,18 +777,19 @@ class Standard extends PrettyPrinterAbstract } protected function pStmt_TryCatch(Stmt\TryCatch $node) { - return 'try {' . $this->pStmts($node->stmts) . "\n" . '}' - . $this->pImplode($node->catches) - . ($node->finally !== null ? $this->p($node->finally) : ''); + return 'try {' . $this->pStmts($node->stmts) . $this->nl . '}' + . ($node->catches ? ' ' . $this->pImplode($node->catches, ' ') : '') + . ($node->finally !== null ? ' ' . $this->p($node->finally) : ''); } protected function pStmt_Catch(Stmt\Catch_ $node) { - return ' catch (' . $this->pImplode($node->types, '|') . ' $' . $node->var . ') {' - . $this->pStmts($node->stmts) . "\n" . '}'; + return 'catch (' . $this->pImplode($node->types, '|') . ' ' + . $this->p($node->var) + . ') {' . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_Finally(Stmt\Finally_ $node) { - return ' finally {' . $this->pStmts($node->stmts) . "\n" . '}'; + return 'finally {' . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pStmt_Break(Stmt\Break_ $node) { @@ -806,6 +818,10 @@ class Standard extends PrettyPrinterAbstract // Other + protected function pStmt_Expression(Stmt\Expression $node) { + return $this->p($node->expr) . ';'; + } + protected function pStmt_Echo(Stmt\Echo_ $node) { return 'echo ' . $this->pCommaSeparated($node->exprs) . ';'; } @@ -819,7 +835,7 @@ class Standard extends PrettyPrinterAbstract } protected function pStmt_StaticVar(Stmt\StaticVar $node) { - return '$' . $node->name + return $this->p($node->var) . (null !== $node->default ? ' = ' . $this->p($node->default) : ''); } @@ -829,7 +845,7 @@ class Standard extends PrettyPrinterAbstract protected function pStmt_InlineHTML(Stmt\InlineHTML $node) { $newline = $node->getAttribute('hasLeadingNewline', true) ? "\n" : ''; - return '?>' . $this->pNoIndent($newline . $node->value) . '' . $newline . $node->value . 'p($node); - } - protected function pClassCommon(Stmt\Class_ $node, $afterClassToken) { return $this->pModifiers($node->flags) . 'class' . $afterClassToken . (null !== $node->extends ? ' extends ' . $this->p($node->extends) : '') . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '') - . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}'; + . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}'; } protected function pObjectProperty($node) { @@ -862,15 +874,6 @@ class Standard extends PrettyPrinterAbstract } } - protected function pModifiers($modifiers) { - return ($modifiers & Stmt\Class_::MODIFIER_PUBLIC ? 'public ' : '') - . ($modifiers & Stmt\Class_::MODIFIER_PROTECTED ? 'protected ' : '') - . ($modifiers & Stmt\Class_::MODIFIER_PRIVATE ? 'private ' : '') - . ($modifiers & Stmt\Class_::MODIFIER_STATIC ? 'static ' : '') - . ($modifiers & Stmt\Class_::MODIFIER_ABSTRACT ? 'abstract ' : '') - . ($modifiers & Stmt\Class_::MODIFIER_FINAL ? 'final ' : ''); - } - protected function pEncapsList(array $encapsList, $quote) { $return = ''; foreach ($encapsList as $element) { @@ -884,6 +887,10 @@ class Standard extends PrettyPrinterAbstract return $return; } + protected function pSingleQuotedString(string $string) { + return '\'' . addcslashes($string, '\'\\') . '\''; + } + protected function escapeString($string, $quote) { if (null === $quote) { // For doc strings, don't escape newlines @@ -897,7 +904,7 @@ class Standard extends PrettyPrinterAbstract $oct = decoct(ord($matches[1])); if ($matches[2] !== '') { // If there is a trailing digit, use the full three character form - return '\\' . str_pad($oct, 3, '0', STR_PAD_LEFT); + return '\\' . str_pad($oct, 3, '0', \STR_PAD_LEFT); } return '\\' . $oct; }, $escaped); @@ -924,19 +931,7 @@ class Standard extends PrettyPrinterAbstract } protected function pDereferenceLhs(Node $node) { - if ($node instanceof Expr\Variable - || $node instanceof Name - || $node instanceof Expr\ArrayDimFetch - || $node instanceof Expr\PropertyFetch - || $node instanceof Expr\StaticPropertyFetch - || $node instanceof Expr\FuncCall - || $node instanceof Expr\MethodCall - || $node instanceof Expr\StaticCall - || $node instanceof Expr\Array_ - || $node instanceof Scalar\String_ - || $node instanceof Expr\ConstFetch - || $node instanceof Expr\ClassConstFetch - ) { + if (!$this->dereferenceLhsRequiresParens($node)) { return $this->p($node); } else { return '(' . $this->p($node) . ')'; @@ -944,23 +939,20 @@ class Standard extends PrettyPrinterAbstract } protected function pCallLhs(Node $node) { - if ($node instanceof Name - || $node instanceof Expr\Variable - || $node instanceof Expr\ArrayDimFetch - || $node instanceof Expr\FuncCall - || $node instanceof Expr\MethodCall - || $node instanceof Expr\StaticCall - || $node instanceof Expr\Array_ - ) { + if (!$this->callLhsRequiresParens($node)) { return $this->p($node); } else { return '(' . $this->p($node) . ')'; } } + /** + * @param Node[] $nodes + * @return bool + */ private function hasNodeWithComments(array $nodes) { foreach ($nodes as $node) { - if ($node && $node->getAttribute('comments')) { + if ($node && $node->getComments()) { return true; } } @@ -971,7 +963,7 @@ class Standard extends PrettyPrinterAbstract if (!$this->hasNodeWithComments($nodes)) { return $this->pCommaSeparated($nodes); } else { - return $this->pCommaSeparatedMultiline($nodes, $trailingComma) . "\n"; + return $this->pCommaSeparatedMultiline($nodes, $trailingComma) . $this->nl; } } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php b/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php index 24bae593..5ba48850 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php +++ b/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php @@ -1,84 +1,139 @@ - array( 0, 1), - 'Expr_BitwiseNot' => array( 10, 1), - 'Expr_PreInc' => array( 10, 1), - 'Expr_PreDec' => array( 10, 1), - 'Expr_PostInc' => array( 10, -1), - 'Expr_PostDec' => array( 10, -1), - 'Expr_UnaryPlus' => array( 10, 1), - 'Expr_UnaryMinus' => array( 10, 1), - 'Expr_Cast_Int' => array( 10, 1), - 'Expr_Cast_Double' => array( 10, 1), - 'Expr_Cast_String' => array( 10, 1), - 'Expr_Cast_Array' => array( 10, 1), - 'Expr_Cast_Object' => array( 10, 1), - 'Expr_Cast_Bool' => array( 10, 1), - 'Expr_Cast_Unset' => array( 10, 1), - 'Expr_ErrorSuppress' => array( 10, 1), - 'Expr_Instanceof' => array( 20, 0), - 'Expr_BooleanNot' => array( 30, 1), - 'Expr_BinaryOp_Mul' => array( 40, -1), - 'Expr_BinaryOp_Div' => array( 40, -1), - 'Expr_BinaryOp_Mod' => array( 40, -1), - 'Expr_BinaryOp_Plus' => array( 50, -1), - 'Expr_BinaryOp_Minus' => array( 50, -1), - 'Expr_BinaryOp_Concat' => array( 50, -1), - 'Expr_BinaryOp_ShiftLeft' => array( 60, -1), - 'Expr_BinaryOp_ShiftRight' => array( 60, -1), - 'Expr_BinaryOp_Smaller' => array( 70, 0), - 'Expr_BinaryOp_SmallerOrEqual' => array( 70, 0), - 'Expr_BinaryOp_Greater' => array( 70, 0), - 'Expr_BinaryOp_GreaterOrEqual' => array( 70, 0), - 'Expr_BinaryOp_Equal' => array( 80, 0), - 'Expr_BinaryOp_NotEqual' => array( 80, 0), - 'Expr_BinaryOp_Identical' => array( 80, 0), - 'Expr_BinaryOp_NotIdentical' => array( 80, 0), - 'Expr_BinaryOp_Spaceship' => array( 80, 0), - 'Expr_BinaryOp_BitwiseAnd' => array( 90, -1), - 'Expr_BinaryOp_BitwiseXor' => array(100, -1), - 'Expr_BinaryOp_BitwiseOr' => array(110, -1), - 'Expr_BinaryOp_BooleanAnd' => array(120, -1), - 'Expr_BinaryOp_BooleanOr' => array(130, -1), - 'Expr_BinaryOp_Coalesce' => array(140, 1), - 'Expr_Ternary' => array(150, -1), - // parser uses %left for assignments, but they really behave as %right - 'Expr_Assign' => array(160, 1), - 'Expr_AssignRef' => array(160, 1), - 'Expr_AssignOp_Plus' => array(160, 1), - 'Expr_AssignOp_Minus' => array(160, 1), - 'Expr_AssignOp_Mul' => array(160, 1), - 'Expr_AssignOp_Div' => array(160, 1), - 'Expr_AssignOp_Concat' => array(160, 1), - 'Expr_AssignOp_Mod' => array(160, 1), - 'Expr_AssignOp_BitwiseAnd' => array(160, 1), - 'Expr_AssignOp_BitwiseOr' => array(160, 1), - 'Expr_AssignOp_BitwiseXor' => array(160, 1), - 'Expr_AssignOp_ShiftLeft' => array(160, 1), - 'Expr_AssignOp_ShiftRight' => array(160, 1), - 'Expr_AssignOp_Pow' => array(160, 1), - 'Expr_YieldFrom' => array(165, 1), - 'Expr_Print' => array(168, 1), - 'Expr_BinaryOp_LogicalAnd' => array(170, -1), - 'Expr_BinaryOp_LogicalXor' => array(180, -1), - 'Expr_BinaryOp_LogicalOr' => array(190, -1), - 'Expr_Include' => array(200, -1), - ); + const FIXUP_PREC_LEFT = 0; // LHS operand affected by precedence + const FIXUP_PREC_RIGHT = 1; // RHS operand affected by precedence + const FIXUP_CALL_LHS = 2; // LHS of call + const FIXUP_DEREF_LHS = 3; // LHS of dereferencing operation + const FIXUP_BRACED_NAME = 4; // Name operand that may require bracing + const FIXUP_VAR_BRACED_NAME = 5; // Name operand that may require ${} bracing + const FIXUP_ENCAPSED = 6; // Encapsed string part - protected $noIndentToken; + protected $precedenceMap = [ + // [precedence, associativity] + // where for precedence -1 is %left, 0 is %nonassoc and 1 is %right + BinaryOp\Pow::class => [ 0, 1], + Expr\BitwiseNot::class => [ 10, 1], + Expr\PreInc::class => [ 10, 1], + Expr\PreDec::class => [ 10, 1], + Expr\PostInc::class => [ 10, -1], + Expr\PostDec::class => [ 10, -1], + Expr\UnaryPlus::class => [ 10, 1], + Expr\UnaryMinus::class => [ 10, 1], + Cast\Int_::class => [ 10, 1], + Cast\Double::class => [ 10, 1], + Cast\String_::class => [ 10, 1], + Cast\Array_::class => [ 10, 1], + Cast\Object_::class => [ 10, 1], + Cast\Bool_::class => [ 10, 1], + Cast\Unset_::class => [ 10, 1], + Expr\ErrorSuppress::class => [ 10, 1], + Expr\Instanceof_::class => [ 20, 0], + Expr\BooleanNot::class => [ 30, 1], + BinaryOp\Mul::class => [ 40, -1], + BinaryOp\Div::class => [ 40, -1], + BinaryOp\Mod::class => [ 40, -1], + BinaryOp\Plus::class => [ 50, -1], + BinaryOp\Minus::class => [ 50, -1], + BinaryOp\Concat::class => [ 50, -1], + BinaryOp\ShiftLeft::class => [ 60, -1], + BinaryOp\ShiftRight::class => [ 60, -1], + BinaryOp\Smaller::class => [ 70, 0], + BinaryOp\SmallerOrEqual::class => [ 70, 0], + BinaryOp\Greater::class => [ 70, 0], + BinaryOp\GreaterOrEqual::class => [ 70, 0], + BinaryOp\Equal::class => [ 80, 0], + BinaryOp\NotEqual::class => [ 80, 0], + BinaryOp\Identical::class => [ 80, 0], + BinaryOp\NotIdentical::class => [ 80, 0], + BinaryOp\Spaceship::class => [ 80, 0], + BinaryOp\BitwiseAnd::class => [ 90, -1], + BinaryOp\BitwiseXor::class => [100, -1], + BinaryOp\BitwiseOr::class => [110, -1], + BinaryOp\BooleanAnd::class => [120, -1], + BinaryOp\BooleanOr::class => [130, -1], + BinaryOp\Coalesce::class => [140, 1], + Expr\Ternary::class => [150, -1], + // parser uses %left for assignments, but they really behave as %right + Expr\Assign::class => [160, 1], + Expr\AssignRef::class => [160, 1], + AssignOp\Plus::class => [160, 1], + AssignOp\Minus::class => [160, 1], + AssignOp\Mul::class => [160, 1], + AssignOp\Div::class => [160, 1], + AssignOp\Concat::class => [160, 1], + AssignOp\Mod::class => [160, 1], + AssignOp\BitwiseAnd::class => [160, 1], + AssignOp\BitwiseOr::class => [160, 1], + AssignOp\BitwiseXor::class => [160, 1], + AssignOp\ShiftLeft::class => [160, 1], + AssignOp\ShiftRight::class => [160, 1], + AssignOp\Pow::class => [160, 1], + Expr\YieldFrom::class => [165, 1], + Expr\Print_::class => [168, 1], + BinaryOp\LogicalAnd::class => [170, -1], + BinaryOp\LogicalXor::class => [180, -1], + BinaryOp\LogicalOr::class => [190, -1], + Expr\Include_::class => [200, -1], + ]; + + /** @var int Current indentation level. */ + protected $indentLevel; + /** @var string Newline including current indentation. */ + protected $nl; + /** @var string Token placed at end of doc string to ensure it is followed by a newline. */ protected $docStringEndToken; + /** @var bool Whether semicolon namespaces can be used (i.e. no global namespace is used) */ protected $canUseSemicolonNamespaces; + /** @var array Pretty printer options */ protected $options; + /** @var TokenStream Original tokens for use in format-preserving pretty print */ + protected $origTokens; + /** @var Internal\Differ Differ for node lists */ + protected $nodeListDiffer; + /** @var bool[] Map determining whether a certain character is a label character */ + protected $labelCharMap; + /** + * @var int[][] Map from token classes and subnode names to FIXUP_* constants. This is used + * during format-preserving prints to place additional parens/braces if necessary. + */ + protected $fixupMap; + /** + * @var int[][] Map from "{$node->getType()}->{$subNode}" to ['left' => $l, 'right' => $r], + * where $l and $r specify the token type that needs to be stripped when removing + * this node. + */ + protected $removalMap; + /** + * @var mixed[] Map from "{$node->getType()}->{$subNode}" to [$find, $extraLeft, $extraRight]. + * $find is an optional token after which the insertion occurs. $extraLeft/Right + * are optionally added before/after the main insertions. + */ + protected $insertionMap; + /** + * @var string[] Map From "{$node->getType()}->{$subNode}" to string that should be inserted + * between elements of this list subnode. + */ + protected $listInsertionMap; + /** @var int[] Map from "{$node->getType()}->{$subNode}" to token before which the modifiers + * should be reprinted. */ + protected $modifierChangeMap; + /** * Creates a pretty printer instance using the given options. * @@ -89,13 +144,48 @@ abstract class PrettyPrinterAbstract * @param array $options Dictionary of formatting options */ public function __construct(array $options = []) { - $this->noIndentToken = '_NO_INDENT_' . mt_rand(); $this->docStringEndToken = '_DOC_STRING_END_' . mt_rand(); $defaultOptions = ['shortArraySyntax' => false]; $this->options = $options + $defaultOptions; } + /** + * Reset pretty printing state. + */ + protected function resetState() { + $this->indentLevel = 0; + $this->nl = "\n"; + $this->origTokens = null; + } + + /** + * Set indentation level + * + * @param int $level Level in number of spaces + */ + protected function setIndentLevel(int $level) { + $this->indentLevel = $level; + $this->nl = "\n" . \str_repeat(' ', $level); + } + + /** + * Increase indentation level. + */ + protected function indent() { + $this->indentLevel += 4; + $this->nl .= ' '; + } + + /** + * Decrease indentation level. + */ + protected function outdent() { + assert($this->indentLevel >= 4); + $this->indentLevel -= 4; + $this->nl = "\n" . str_repeat(' ', $this->indentLevel); + } + /** * Pretty prints an array of statements. * @@ -103,7 +193,8 @@ abstract class PrettyPrinterAbstract * * @return string Pretty printed statements */ - public function prettyPrint(array $stmts) { + public function prettyPrint(array $stmts) : string { + $this->resetState(); $this->preprocessNodes($stmts); return ltrim($this->handleMagicTokens($this->pStmts($stmts, false))); @@ -116,7 +207,8 @@ abstract class PrettyPrinterAbstract * * @return string Pretty printed node */ - public function prettyPrintExpr(Expr $node) { + public function prettyPrintExpr(Expr $node) : string { + $this->resetState(); return $this->handleMagicTokens($this->p($node)); } @@ -127,7 +219,7 @@ abstract class PrettyPrinterAbstract * * @return string Pretty printed statements */ - public function prettyPrintFile(array $stmts) { + public function prettyPrintFile(array $stmts) : string { if (!$stmts) { return "name) { $this->canUseSemicolonNamespaces = false; + break; } } } - protected function handleMagicTokens($str) { - // Drop no-indent tokens - $str = str_replace($this->noIndentToken, '', $str); - + /** + * Handles (and removes) no-indent and doc-string-end tokens. + * + * @param string $str + * @return string + */ + protected function handleMagicTokens(string $str) : string { // Replace doc-string-end tokens with nothing or a newline $str = str_replace($this->docStringEndToken . ";\n", ";\n", $str); $str = str_replace($this->docStringEndToken, "\n", $str); @@ -178,53 +274,74 @@ abstract class PrettyPrinterAbstract * * @return string Pretty printed statements */ - protected function pStmts(array $nodes, $indent = true) { + protected function pStmts(array $nodes, bool $indent = true) : string { + if ($indent) { + $this->indent(); + } + $result = ''; foreach ($nodes as $node) { - $comments = $node->getAttribute('comments', array()); + $comments = $node->getComments(); if ($comments) { - $result .= "\n" . $this->pComments($comments); + $result .= $this->nl . $this->pComments($comments); if ($node instanceof Stmt\Nop) { continue; } } - $result .= "\n" . $this->p($node) . ($node instanceof Expr ? ';' : ''); + $result .= $this->nl . $this->p($node); } if ($indent) { - return preg_replace('~\n(?!$|' . $this->noIndentToken . ')~', "\n ", $result); - } else { - return $result; + $this->outdent(); } + + return $result; } /** - * Pretty prints a node. + * Pretty-print an infix operation while taking precedence into account. * - * @param Node $node Node to be pretty printed + * @param string $class Node class of operator + * @param Node $leftNode Left-hand side node + * @param string $operatorString String representation of the operator + * @param Node $rightNode Right-hand side node * - * @return string Pretty printed node + * @return string Pretty printed infix operation */ - protected function p(Node $node) { - return $this->{'p' . $node->getType()}($node); - } - - protected function pInfixOp($type, Node $leftNode, $operatorString, Node $rightNode) { - list($precedence, $associativity) = $this->precedenceMap[$type]; + protected function pInfixOp(string $class, Node $leftNode, string $operatorString, Node $rightNode) : string { + list($precedence, $associativity) = $this->precedenceMap[$class]; return $this->pPrec($leftNode, $precedence, $associativity, -1) . $operatorString . $this->pPrec($rightNode, $precedence, $associativity, 1); } - protected function pPrefixOp($type, $operatorString, Node $node) { - list($precedence, $associativity) = $this->precedenceMap[$type]; + /** + * Pretty-print a prefix operation while taking precedence into account. + * + * @param string $class Node class of operator + * @param string $operatorString String representation of the operator + * @param Node $node Node + * + * @return string Pretty printed prefix operation + */ + protected function pPrefixOp(string $class, string $operatorString, Node $node) : string { + list($precedence, $associativity) = $this->precedenceMap[$class]; return $operatorString . $this->pPrec($node, $precedence, $associativity, 1); } - protected function pPostfixOp($type, Node $node, $operatorString) { - list($precedence, $associativity) = $this->precedenceMap[$type]; + /** + * Pretty-print a postfix operation while taking precedence into account. + * + * @param string $class Node class of operator + * @param string $operatorString String representation of the operator + * @param Node $node Node + * + * @return string Pretty printed postfix operation + */ + protected function pPostfixOp(string $class, Node $node, string $operatorString) : string { + list($precedence, $associativity) = $this->precedenceMap[$class]; return $this->pPrec($node, $precedence, $associativity, -1) . $operatorString; } @@ -240,12 +357,12 @@ abstract class PrettyPrinterAbstract * * @return string The pretty printed node */ - protected function pPrec(Node $node, $parentPrecedence, $parentAssociativity, $childPosition) { - $type = $node->getType(); - if (isset($this->precedenceMap[$type])) { - $childPrecedence = $this->precedenceMap[$type][0]; + protected function pPrec(Node $node, int $parentPrecedence, int $parentAssociativity, int $childPosition) : string { + $class = \get_class($node); + if (isset($this->precedenceMap[$class])) { + $childPrecedence = $this->precedenceMap[$class][0]; if ($childPrecedence > $parentPrecedence - || ($parentPrecedence == $childPrecedence && $parentAssociativity != $childPosition) + || ($parentPrecedence === $childPrecedence && $parentAssociativity !== $childPosition) ) { return '(' . $this->p($node) . ')'; } @@ -262,8 +379,8 @@ abstract class PrettyPrinterAbstract * * @return string Imploded pretty printed nodes */ - protected function pImplode(array $nodes, $glue = '') { - $pNodes = array(); + protected function pImplode(array $nodes, string $glue = '') : string { + $pNodes = []; foreach ($nodes as $node) { if (null === $node) { $pNodes[] = ''; @@ -282,7 +399,7 @@ abstract class PrettyPrinterAbstract * * @return string Comma separated pretty printed nodes */ - protected function pCommaSeparated(array $nodes) { + protected function pCommaSeparated(array $nodes) : string { return $this->pImplode($nodes, ', '); } @@ -296,37 +413,29 @@ abstract class PrettyPrinterAbstract * * @return string Comma separated pretty printed nodes in multiline style */ - protected function pCommaSeparatedMultiline(array $nodes, $trailingComma) { + protected function pCommaSeparatedMultiline(array $nodes, bool $trailingComma) : string { + $this->indent(); + $result = ''; $lastIdx = count($nodes) - 1; foreach ($nodes as $idx => $node) { if ($node !== null) { - $comments = $node->getAttribute('comments', array()); + $comments = $node->getComments(); if ($comments) { - $result .= "\n" . $this->pComments($comments); + $result .= $this->nl . $this->pComments($comments); } - $result .= "\n" . $this->p($node); + $result .= $this->nl . $this->p($node); } else { - $result .= "\n"; + $result .= $this->nl; } if ($trailingComma || $idx !== $lastIdx) { $result .= ','; } } - return preg_replace('~\n(?!$|' . $this->noIndentToken . ')~', "\n ", $result); - } - - /** - * Signals the pretty printer that a string shall not be indented. - * - * @param string $string Not to be indented string - * - * @return string String marked with $this->noIndentToken's. - */ - protected function pNoIndent($string) { - return str_replace("\n", "\n" . $this->noIndentToken, $string); + $this->outdent(); + return $result; } /** @@ -336,13 +445,899 @@ abstract class PrettyPrinterAbstract * * @return string Reformatted text of comments */ - protected function pComments(array $comments) { + protected function pComments(array $comments) : string { $formattedComments = []; foreach ($comments as $comment) { - $formattedComments[] = $comment->getReformattedText(); + $formattedComments[] = str_replace("\n", $this->nl, $comment->getReformattedText()); } - return implode("\n", $formattedComments); + return implode($this->nl, $formattedComments); + } + + /** + * Perform a format-preserving pretty print of an AST. + * + * The format preservation is best effort. For some changes to the AST the formatting will not + * be preserved (at least not locally). + * + * In order to use this method a number of prerequisites must be satisfied: + * * The startTokenPos and endTokenPos attributes in the lexer must be enabled. + * * The CloningVisitor must be run on the AST prior to modification. + * * The original tokens must be provided, using the getTokens() method on the lexer. + * + * @param Node[] $stmts Modified AST with links to original AST + * @param Node[] $origStmts Original AST with token offset information + * @param array $origTokens Tokens of the original code + * + * @return string + */ + public function printFormatPreserving(array $stmts, array $origStmts, array $origTokens) : string { + $this->initializeNodeListDiffer(); + $this->initializeLabelCharMap(); + $this->initializeFixupMap(); + $this->initializeRemovalMap(); + $this->initializeInsertionMap(); + $this->initializeListInsertionMap(); + $this->initializeModifierChangeMap(); + + $this->resetState(); + $this->origTokens = new TokenStream($origTokens); + + $this->preprocessNodes($stmts); + + $pos = 0; + $result = $this->pArray($stmts, $origStmts, $pos, 0, 'stmts', null, "\n"); + if (null !== $result) { + $result .= $this->origTokens->getTokenCode($pos, count($origTokens), 0); + } else { + // Fallback + // TODO Add pStmts($stmts, false); + } + + return ltrim($this->handleMagicTokens($result)); + } + + protected function pFallback(Node $node) { + return $this->{'p' . $node->getType()}($node); + } + + /** + * Pretty prints a node. + * + * This method also handles formatting preservation for nodes. + * + * @param Node $node Node to be pretty printed + * @param bool $parentFormatPreserved Whether parent node has preserved formatting + * + * @return string Pretty printed node + */ + protected function p(Node $node, $parentFormatPreserved = false) : string { + // No orig tokens means this is a normal pretty print without preservation of formatting + if (!$this->origTokens) { + return $this->{'p' . $node->getType()}($node); + } + + /** @var Node $origNode */ + $origNode = $node->getAttribute('origNode'); + if (null === $origNode) { + return $this->pFallback($node); + } + + $class = \get_class($node); + \assert($class === \get_class($origNode)); + + $startPos = $origNode->getStartTokenPos(); + $endPos = $origNode->getEndTokenPos(); + \assert($startPos >= 0 && $endPos >= 0); + + $fallbackNode = $node; + if ($node instanceof Expr\New_ && $node->class instanceof Stmt\Class_) { + // Normalize node structure of anonymous classes + $node = PrintableNewAnonClassNode::fromNewNode($node); + $origNode = PrintableNewAnonClassNode::fromNewNode($origNode); + } + + // InlineHTML node does not contain closing and opening PHP tags. If the parent formatting + // is not preserved, then we need to use the fallback code to make sure the tags are + // printed. + if ($node instanceof Stmt\InlineHTML && !$parentFormatPreserved) { + return $this->pFallback($fallbackNode); + } + + $indentAdjustment = $this->indentLevel - $this->origTokens->getIndentationBefore($startPos); + + $type = $node->getType(); + $fixupInfo = $this->fixupMap[$class] ?? null; + + $result = ''; + $pos = $startPos; + foreach ($node->getSubNodeNames() as $subNodeName) { + $subNode = $node->$subNodeName; + $origSubNode = $origNode->$subNodeName; + + if ((!$subNode instanceof Node && $subNode !== null) + || (!$origSubNode instanceof Node && $origSubNode !== null) + ) { + if ($subNode === $origSubNode) { + // Unchanged, can reuse old code + continue; + } + + if (is_array($subNode) && is_array($origSubNode)) { + // Array subnode changed, we might be able to reconstruct it + $listResult = $this->pArray( + $subNode, $origSubNode, $pos, $indentAdjustment, $subNodeName, + $fixupInfo[$subNodeName] ?? null, + $this->listInsertionMap[$type . '->' . $subNodeName] ?? null + ); + if (null === $listResult) { + return $this->pFallback($fallbackNode); + } + + $result .= $listResult; + continue; + } + + if (is_int($subNode) && is_int($origSubNode)) { + // Check if this is a modifier change + $key = $type . '->' . $subNodeName; + if (!isset($this->modifierChangeMap[$key])) { + return $this->pFallback($fallbackNode); + } + + $findToken = $this->modifierChangeMap[$key]; + $result .= $this->pModifiers($subNode); + $pos = $this->origTokens->findRight($pos, $findToken); + continue; + } + + // If a non-node, non-array subnode changed, we don't be able to do a partial + // reconstructions, as we don't have enough offset information. Pretty print the + // whole node instead. + return $this->pFallback($fallbackNode); + } + + $extraLeft = ''; + $extraRight = ''; + if ($origSubNode !== null) { + $subStartPos = $origSubNode->getStartTokenPos(); + $subEndPos = $origSubNode->getEndTokenPos(); + \assert($subStartPos >= 0 && $subEndPos >= 0); + } else { + if ($subNode === null) { + // Both null, nothing to do + continue; + } + + // A node has been inserted, check if we have insertion information for it + $key = $type . '->' . $subNodeName; + if (!isset($this->insertionMap[$key])) { + return $this->pFallback($fallbackNode); + } + + list($findToken, $extraLeft, $extraRight) = $this->insertionMap[$key]; + if (null !== $findToken) { + $subStartPos = $this->origTokens->findRight($pos, $findToken) + 1; + } else { + $subStartPos = $pos; + } + if (null === $extraLeft && null !== $extraRight) { + // If inserting on the right only, skipping whitespace looks better + $subStartPos = $this->origTokens->skipRightWhitespace($subStartPos); + } + $subEndPos = $subStartPos - 1; + } + + if (null === $subNode) { + // A node has been removed, check if we have removal information for it + $key = $type . '->' . $subNodeName; + if (!isset($this->removalMap[$key])) { + return $this->pFallback($fallbackNode); + } + + // Adjust positions to account for additional tokens that must be skipped + $removalInfo = $this->removalMap[$key]; + if (isset($removalInfo['left'])) { + $subStartPos = $this->origTokens->skipLeft($subStartPos - 1, $removalInfo['left']) + 1; + } + if (isset($removalInfo['right'])) { + $subEndPos = $this->origTokens->skipRight($subEndPos + 1, $removalInfo['right']) - 1; + } + } + + $result .= $this->origTokens->getTokenCode($pos, $subStartPos, $indentAdjustment); + + if (null !== $subNode) { + $result .= $extraLeft; + + $origIndentLevel = $this->indentLevel; + $this->setIndentLevel($this->origTokens->getIndentationBefore($subStartPos) + $indentAdjustment); + + // If it's the same node that was previously in this position, it certainly doesn't + // need fixup. It's important to check this here, because our fixup checks are more + // conservative than strictly necessary. + if (isset($fixupInfo[$subNodeName]) + && $subNode->getAttribute('origNode') !== $origSubNode + ) { + $fixup = $fixupInfo[$subNodeName]; + $res = $this->pFixup($fixup, $subNode, $class, $subStartPos, $subEndPos); + } else { + $res = $this->p($subNode, true); + } + + $this->safeAppend($result, $res); + $this->setIndentLevel($origIndentLevel); + + $result .= $extraRight; + } + + $pos = $subEndPos + 1; + } + + $result .= $this->origTokens->getTokenCode($pos, $endPos + 1, $indentAdjustment); + return $result; + } + + /** + * Perform a format-preserving pretty print of an array. + * + * @param array $nodes New nodes + * @param array $origNodes Original nodes + * @param int $pos Current token position (updated by reference) + * @param int $indentAdjustment Adjustment for indentation + * @param string $subNodeName Name of array subnode. + * @param null|int $fixup Fixup information for array item nodes + * @param null|string $insertStr Separator string to use for insertions + * + * @return null|string Result of pretty print or null if cannot preserve formatting + */ + protected function pArray( + array $nodes, array $origNodes, int &$pos, int $indentAdjustment, + string $subNodeName, $fixup, $insertStr + ) { + $diff = $this->nodeListDiffer->diffWithReplacements($origNodes, $nodes); + + $beforeFirstKeepOrReplace = true; + $delayedAdd = []; + $lastElemIndentLevel = $this->indentLevel; + + $insertNewline = false; + if ($insertStr === "\n") { + $insertStr = ''; + $insertNewline = true; + } + + if ($subNodeName === 'stmts' && \count($origNodes) === 1 && \count($nodes) !== 1) { + $startPos = $origNodes[0]->getStartTokenPos(); + $endPos = $origNodes[0]->getEndTokenPos(); + \assert($startPos >= 0 && $endPos >= 0); + if (!$this->origTokens->haveBraces($startPos, $endPos)) { + // This was a single statement without braces, but either additional statements + // have been added, or the single statement has been removed. This requires the + // addition of braces. For now fall back. + // TODO: Try to preserve formatting + return null; + } + } + + $result = ''; + foreach ($diff as $i => $diffElem) { + $diffType = $diffElem->type; + /** @var Node|null $arrItem */ + $arrItem = $diffElem->new; + /** @var Node|null $origArrItem */ + $origArrItem = $diffElem->old; + + if ($diffType === DiffElem::TYPE_KEEP || $diffType === DiffElem::TYPE_REPLACE) { + $beforeFirstKeepOrReplace = false; + + if ($origArrItem === null || $arrItem === null) { + // We can only handle the case where both are null + if ($origArrItem === $arrItem) { + continue; + } + return null; + } + + if (!$arrItem instanceof Node || !$origArrItem instanceof Node) { + // We can only deal with nodes. This can occur for Names, which use string arrays. + return null; + } + + $itemStartPos = $origArrItem->getStartTokenPos(); + $itemEndPos = $origArrItem->getEndTokenPos(); + \assert($itemStartPos >= 0 && $itemEndPos >= 0); + + if ($itemEndPos < $itemStartPos) { + // End can be before start for Nop nodes, because offsets refer to non-whitespace + // locations, which for an "empty" node might result in an inverted order. + assert($origArrItem instanceof Stmt\Nop); + continue; + } + + $origIndentLevel = $this->indentLevel; + $lastElemIndentLevel = $this->origTokens->getIndentationBefore($itemStartPos) + $indentAdjustment; + $this->setIndentLevel($lastElemIndentLevel); + + $comments = $arrItem->getComments(); + $origComments = $origArrItem->getComments(); + $commentStartPos = $origComments ? $origComments[0]->getTokenPos() : $itemStartPos; + \assert($commentStartPos >= 0); + + $commentsChanged = $comments !== $origComments; + if ($commentsChanged) { + // Remove old comments + $itemStartPos = $commentStartPos; + } + + if (!empty($delayedAdd)) { + $result .= $this->origTokens->getTokenCode( + $pos, $commentStartPos, $indentAdjustment); + + /** @var Node $delayedAddNode */ + foreach ($delayedAdd as $delayedAddNode) { + if ($insertNewline) { + $delayedAddComments = $delayedAddNode->getComments(); + if ($delayedAddComments) { + $result .= $this->pComments($delayedAddComments) . $this->nl; + } + } + + $this->safeAppend($result, $this->p($delayedAddNode, true)); + + if ($insertNewline) { + $result .= $insertStr . $this->nl; + } else { + $result .= $insertStr; + } + } + + $result .= $this->origTokens->getTokenCode( + $commentStartPos, $itemStartPos, $indentAdjustment); + + $delayedAdd = []; + } else { + $result .= $this->origTokens->getTokenCode( + $pos, $itemStartPos, $indentAdjustment); + } + + if ($commentsChanged && $comments) { + // Add new comments + $result .= $this->pComments($comments) . $this->nl; + } + } elseif ($diffType === DiffElem::TYPE_ADD) { + if (null === $insertStr) { + // We don't have insertion information for this list type + return null; + } + + if ($insertStr === ', ' && $this->isMultiline($origNodes)) { + $insertStr = ','; + $insertNewline = true; + } + + if ($beforeFirstKeepOrReplace) { + // Will be inserted at the next "replace" or "keep" element + $delayedAdd[] = $arrItem; + continue; + } + + $itemStartPos = $pos; + $itemEndPos = $pos - 1; + + $origIndentLevel = $this->indentLevel; + $this->setIndentLevel($lastElemIndentLevel); + + if ($insertNewline) { + $comments = $arrItem->getComments(); + if ($comments) { + $result .= $this->nl . $this->pComments($comments); + } + $result .= $insertStr . $this->nl; + } else { + $result .= $insertStr; + } + } elseif ($diffType === DiffElem::TYPE_REMOVE) { + if ($i === 0) { + // TODO Handle removal at the start + return null; + } + + if (!$origArrItem instanceof Node) { + // We only support removal for nodes + return null; + } + + $itemEndPos = $origArrItem->getEndTokenPos(); + \assert($itemEndPos >= 0); + + $pos = $itemEndPos + 1; + continue; + } else { + throw new \Exception("Shouldn't happen"); + } + + if (null !== $fixup && $arrItem->getAttribute('origNode') !== $origArrItem) { + $res = $this->pFixup($fixup, $arrItem, null, $itemStartPos, $itemEndPos); + } else { + $res = $this->p($arrItem, true); + } + $this->safeAppend($result, $res); + + $this->setIndentLevel($origIndentLevel); + $pos = $itemEndPos + 1; + } + + if (!empty($delayedAdd)) { + // TODO Handle insertion into empty list + return null; + } + + return $result; + } + + /** + * Print node with fixups. + * + * Fixups here refer to the addition of extra parentheses, braces or other characters, that + * are required to preserve program semantics in a certain context (e.g. to maintain precedence + * or because only certain expressions are allowed in certain places). + * + * @param int $fixup Fixup type + * @param Node $subNode Subnode to print + * @param string|null $parentClass Class of parent node + * @param int $subStartPos Original start pos of subnode + * @param int $subEndPos Original end pos of subnode + * + * @return string Result of fixed-up print of subnode + */ + protected function pFixup(int $fixup, Node $subNode, $parentClass, int $subStartPos, int $subEndPos) : string { + switch ($fixup) { + case self::FIXUP_PREC_LEFT: + case self::FIXUP_PREC_RIGHT: + if (!$this->origTokens->haveParens($subStartPos, $subEndPos)) { + list($precedence, $associativity) = $this->precedenceMap[$parentClass]; + return $this->pPrec($subNode, $precedence, $associativity, + $fixup === self::FIXUP_PREC_LEFT ? -1 : 1); + } + break; + case self::FIXUP_CALL_LHS: + if ($this->callLhsRequiresParens($subNode) + && !$this->origTokens->haveParens($subStartPos, $subEndPos) + ) { + return '(' . $this->p($subNode) . ')'; + } + break; + case self::FIXUP_DEREF_LHS: + if ($this->dereferenceLhsRequiresParens($subNode) + && !$this->origTokens->haveParens($subStartPos, $subEndPos) + ) { + return '(' . $this->p($subNode) . ')'; + } + break; + case self::FIXUP_BRACED_NAME: + case self::FIXUP_VAR_BRACED_NAME: + if ($subNode instanceof Expr + && !$this->origTokens->haveBraces($subStartPos, $subEndPos) + ) { + return ($fixup === self::FIXUP_VAR_BRACED_NAME ? '$' : '') + . '{' . $this->p($subNode) . '}'; + } + break; + case self::FIXUP_ENCAPSED: + if (!$subNode instanceof Scalar\EncapsedStringPart + && !$this->origTokens->haveBraces($subStartPos, $subEndPos) + ) { + return '{' . $this->p($subNode) . '}'; + } + break; + default: + throw new \Exception('Cannot happen'); + } + + // Nothing special to do + return $this->p($subNode); + } + + /** + * Appends to a string, ensuring whitespace between label characters. + * + * Example: "echo" and "$x" result in "echo$x", but "echo" and "x" result in "echo x". + * Without safeAppend the result would be "echox", which does not preserve semantics. + * + * @param string $str + * @param string $append + */ + protected function safeAppend(string &$str, string $append) { + // $append must not be empty in this function + if ($str === "") { + $str = $append; + return; + } + + if (!$this->labelCharMap[$append[0]] + || !$this->labelCharMap[$str[\strlen($str) - 1]]) { + $str .= $append; + } else { + $str .= " " . $append; + } + } + + /** + * Determines whether the LHS of a call must be wrapped in parenthesis. + * + * @param Node $node LHS of a call + * + * @return bool Whether parentheses are required + */ + protected function callLhsRequiresParens(Node $node) : bool { + return !($node instanceof Node\Name + || $node instanceof Expr\Variable + || $node instanceof Expr\ArrayDimFetch + || $node instanceof Expr\FuncCall + || $node instanceof Expr\MethodCall + || $node instanceof Expr\StaticCall + || $node instanceof Expr\Array_); + } + + /** + * Determines whether the LHS of a dereferencing operation must be wrapped in parenthesis. + * + * @param Node $node LHS of dereferencing operation + * + * @return bool Whether parentheses are required + */ + protected function dereferenceLhsRequiresParens(Node $node) : bool { + return !($node instanceof Expr\Variable + || $node instanceof Node\Name + || $node instanceof Expr\ArrayDimFetch + || $node instanceof Expr\PropertyFetch + || $node instanceof Expr\StaticPropertyFetch + || $node instanceof Expr\FuncCall + || $node instanceof Expr\MethodCall + || $node instanceof Expr\StaticCall + || $node instanceof Expr\Array_ + || $node instanceof Scalar\String_ + || $node instanceof Expr\ConstFetch + || $node instanceof Expr\ClassConstFetch); + } + + /** + * Print modifiers, including trailing whitespace. + * + * @param int $modifiers Modifier mask to print + * + * @return string Printed modifiers + */ + protected function pModifiers(int $modifiers) { + return ($modifiers & Stmt\Class_::MODIFIER_PUBLIC ? 'public ' : '') + . ($modifiers & Stmt\Class_::MODIFIER_PROTECTED ? 'protected ' : '') + . ($modifiers & Stmt\Class_::MODIFIER_PRIVATE ? 'private ' : '') + . ($modifiers & Stmt\Class_::MODIFIER_STATIC ? 'static ' : '') + . ($modifiers & Stmt\Class_::MODIFIER_ABSTRACT ? 'abstract ' : '') + . ($modifiers & Stmt\Class_::MODIFIER_FINAL ? 'final ' : ''); + } + + /** + * Determine whether a list of nodes uses multiline formatting. + * + * @param (Node|null)[] $nodes Node list + * + * @return bool Whether multiline formatting is used + */ + protected function isMultiline(array $nodes) : bool { + if (\count($nodes) < 2) { + return false; + } + + $pos = -1; + foreach ($nodes as $node) { + if (null === $node) { + continue; + } + + $endPos = $node->getEndTokenPos() + 1; + if ($pos >= 0) { + $text = $this->origTokens->getTokenCode($pos, $endPos, 0); + if (false === strpos($text, "\n")) { + // We require that a newline is present between *every* item. If the formatting + // is inconsistent, with only some items having newlines, we don't consider it + // as multiline + return false; + } + } + $pos = $endPos; + } + + return true; + } + + /** + * Lazily initializes label char map. + * + * The label char map determines whether a certain character may occur in a label. + */ + protected function initializeLabelCharMap() { + if ($this->labelCharMap) return; + + $this->labelCharMap = []; + for ($i = 0; $i < 256; $i++) { + // Since PHP 7.1 The lower range is 0x80. However, we also want to support code for + // older versions. + $this->labelCharMap[chr($i)] = $i >= 0x7f || ctype_alnum($i); + } + } + + /** + * Lazily initializes node list differ. + * + * The node list differ is used to determine differences between two array subnodes. + */ + protected function initializeNodeListDiffer() { + if ($this->nodeListDiffer) return; + + $this->nodeListDiffer = new Internal\Differ(function ($a, $b) { + if ($a instanceof Node && $b instanceof Node) { + return $a === $b->getAttribute('origNode'); + } + // Can happen for array destructuring + return $a === null && $b === null; + }); + } + + /** + * Lazily initializes fixup map. + * + * The fixup map is used to determine whether a certain subnode of a certain node may require + * some kind of "fixup" operation, e.g. the addition of parenthesis or braces. + */ + protected function initializeFixupMap() { + if ($this->fixupMap) return; + + $this->fixupMap = [ + Expr\PreInc::class => ['var' => self::FIXUP_PREC_RIGHT], + Expr\PreDec::class => ['var' => self::FIXUP_PREC_RIGHT], + Expr\PostInc::class => ['var' => self::FIXUP_PREC_LEFT], + Expr\PostDec::class => ['var' => self::FIXUP_PREC_LEFT], + Expr\Instanceof_::class => [ + 'expr' => self::FIXUP_PREC_LEFT, + 'class' => self::FIXUP_PREC_RIGHT, + ], + Expr\Ternary::class => [ + 'cond' => self::FIXUP_PREC_LEFT, + 'else' => self::FIXUP_PREC_RIGHT, + ], + + Expr\FuncCall::class => ['name' => self::FIXUP_CALL_LHS], + Expr\StaticCall::class => ['class' => self::FIXUP_DEREF_LHS], + Expr\ArrayDimFetch::class => ['var' => self::FIXUP_DEREF_LHS], + Expr\MethodCall::class => [ + 'var' => self::FIXUP_DEREF_LHS, + 'name' => self::FIXUP_BRACED_NAME, + ], + Expr\StaticPropertyFetch::class => [ + 'class' => self::FIXUP_DEREF_LHS, + 'name' => self::FIXUP_VAR_BRACED_NAME, + ], + Expr\PropertyFetch::class => [ + 'var' => self::FIXUP_DEREF_LHS, + 'name' => self::FIXUP_BRACED_NAME, + ], + Scalar\Encapsed::class => [ + 'parts' => self::FIXUP_ENCAPSED, + ], + ]; + + $binaryOps = [ + BinaryOp\Pow::class, BinaryOp\Mul::class, BinaryOp\Div::class, BinaryOp\Mod::class, + BinaryOp\Plus::class, BinaryOp\Minus::class, BinaryOp\Concat::class, + BinaryOp\ShiftLeft::class, BinaryOp\ShiftRight::class, BinaryOp\Smaller::class, + BinaryOp\SmallerOrEqual::class, BinaryOp\Greater::class, BinaryOp\GreaterOrEqual::class, + BinaryOp\Equal::class, BinaryOp\NotEqual::class, BinaryOp\Identical::class, + BinaryOp\NotIdentical::class, BinaryOp\Spaceship::class, BinaryOp\BitwiseAnd::class, + BinaryOp\BitwiseXor::class, BinaryOp\BitwiseOr::class, BinaryOp\BooleanAnd::class, + BinaryOp\BooleanOr::class, BinaryOp\Coalesce::class, BinaryOp\LogicalAnd::class, + BinaryOp\LogicalXor::class, BinaryOp\LogicalOr::class, + ]; + foreach ($binaryOps as $binaryOp) { + $this->fixupMap[$binaryOp] = [ + 'left' => self::FIXUP_PREC_LEFT, + 'right' => self::FIXUP_PREC_RIGHT + ]; + } + + $assignOps = [ + Expr\Assign::class, Expr\AssignRef::class, AssignOp\Plus::class, AssignOp\Minus::class, + AssignOp\Mul::class, AssignOp\Div::class, AssignOp\Concat::class, AssignOp\Mod::class, + AssignOp\BitwiseAnd::class, AssignOp\BitwiseOr::class, AssignOp\BitwiseXor::class, + AssignOp\ShiftLeft::class, AssignOp\ShiftRight::class, AssignOp\Pow::class, + ]; + foreach ($assignOps as $assignOp) { + $this->fixupMap[$assignOp] = [ + 'var' => self::FIXUP_PREC_LEFT, + 'expr' => self::FIXUP_PREC_RIGHT, + ]; + } + + $prefixOps = [ + Expr\BitwiseNot::class, Expr\BooleanNot::class, Expr\UnaryPlus::class, Expr\UnaryMinus::class, + Cast\Int_::class, Cast\Double::class, Cast\String_::class, Cast\Array_::class, + Cast\Object_::class, Cast\Bool_::class, Cast\Unset_::class, Expr\ErrorSuppress::class, + Expr\YieldFrom::class, Expr\Print_::class, Expr\Include_::class, + ]; + foreach ($prefixOps as $prefixOp) { + $this->fixupMap[$prefixOp] = ['expr' => self::FIXUP_PREC_RIGHT]; + } + } + + /** + * Lazily initializes the removal map. + * + * The removal map is used to determine which additional tokens should be returned when a + * certain node is replaced by null. + */ + protected function initializeRemovalMap() { + if ($this->removalMap) return; + + $stripBoth = ['left' => \T_WHITESPACE, 'right' => \T_WHITESPACE]; + $stripLeft = ['left' => \T_WHITESPACE]; + $stripRight = ['right' => \T_WHITESPACE]; + $stripDoubleArrow = ['right' => \T_DOUBLE_ARROW]; + $stripColon = ['left' => ':']; + $stripEquals = ['left' => '=']; + $this->removalMap = [ + 'Expr_ArrayDimFetch->dim' => $stripBoth, + 'Expr_ArrayItem->key' => $stripDoubleArrow, + 'Expr_Closure->returnType' => $stripColon, + 'Expr_Exit->expr' => $stripBoth, + 'Expr_Ternary->if' => $stripBoth, + 'Expr_Yield->key' => $stripDoubleArrow, + 'Expr_Yield->value' => $stripBoth, + 'Param->type' => $stripRight, + 'Param->default' => $stripEquals, + 'Stmt_Break->num' => $stripBoth, + 'Stmt_ClassMethod->returnType' => $stripColon, + 'Stmt_Class->extends' => ['left' => \T_EXTENDS], + 'Expr_PrintableNewAnonClass->extends' => ['left' => \T_EXTENDS], + 'Stmt_Continue->num' => $stripBoth, + 'Stmt_Foreach->keyVar' => $stripDoubleArrow, + 'Stmt_Function->returnType' => $stripColon, + 'Stmt_If->else' => $stripLeft, + 'Stmt_Namespace->name' => $stripLeft, + 'Stmt_PropertyProperty->default' => $stripEquals, + 'Stmt_Return->expr' => $stripBoth, + 'Stmt_StaticVar->default' => $stripEquals, + 'Stmt_TraitUseAdaptation_Alias->newName' => $stripLeft, + 'Stmt_TryCatch->finally' => $stripLeft, + // 'Stmt_Case->cond': Replace with "default" + // 'Stmt_Class->name': Unclear what to do + // 'Stmt_Declare->stmts': Not a plain node + // 'Stmt_TraitUseAdaptation_Alias->newModifier': Not a plain node + ]; + } + + protected function initializeInsertionMap() { + if ($this->insertionMap) return; + + // TODO: "yield" where both key and value are inserted doesn't work + $this->insertionMap = [ + 'Expr_ArrayDimFetch->dim' => ['[', null, null], + 'Expr_ArrayItem->key' => [null, null, ' => '], + 'Expr_Closure->returnType' => [')', ' : ', null], + 'Expr_Ternary->if' => ['?', ' ', ' '], + 'Expr_Yield->key' => [\T_YIELD, null, ' => '], + 'Expr_Yield->value' => [\T_YIELD, ' ', null], + 'Param->type' => [null, null, ' '], + 'Param->default' => [null, ' = ', null], + 'Stmt_Break->num' => [\T_BREAK, ' ', null], + 'Stmt_ClassMethod->returnType' => [')', ' : ', null], + 'Stmt_Class->extends' => [null, ' extends ', null], + 'Expr_PrintableNewAnonClass->extends' => [null, ' extends ', null], + 'Stmt_Continue->num' => [\T_CONTINUE, ' ', null], + 'Stmt_Foreach->keyVar' => [\T_AS, null, ' => '], + 'Stmt_Function->returnType' => [')', ' : ', null], + 'Stmt_If->else' => [null, ' ', null], + 'Stmt_Namespace->name' => [\T_NAMESPACE, ' ', null], + 'Stmt_PropertyProperty->default' => [null, ' = ', null], + 'Stmt_Return->expr' => [\T_RETURN, ' ', null], + 'Stmt_StaticVar->default' => [null, ' = ', null], + //'Stmt_TraitUseAdaptation_Alias->newName' => [T_AS, ' ', null], // TODO + 'Stmt_TryCatch->finally' => [null, ' ', null], + + // 'Expr_Exit->expr': Complicated due to optional () + // 'Stmt_Case->cond': Conversion from default to case + // 'Stmt_Class->name': Unclear + // 'Stmt_Declare->stmts': Not a proper node + // 'Stmt_TraitUseAdaptation_Alias->newModifier': Not a proper node + ]; + } + + protected function initializeListInsertionMap() { + if ($this->listInsertionMap) return; + + $this->listInsertionMap = [ + // special + //'Expr_ShellExec->parts' => '', // TODO These need to be treated more carefully + //'Scalar_Encapsed->parts' => '', + 'Stmt_Catch->types' => '|', + 'Stmt_If->elseifs' => ' ', + 'Stmt_TryCatch->catches' => ' ', + + // comma-separated lists + 'Expr_Array->items' => ', ', + 'Expr_Closure->params' => ', ', + 'Expr_Closure->uses' => ', ', + 'Expr_FuncCall->args' => ', ', + 'Expr_Isset->vars' => ', ', + 'Expr_List->items' => ', ', + 'Expr_MethodCall->args' => ', ', + 'Expr_New->args' => ', ', + 'Expr_PrintableNewAnonClass->args' => ', ', + 'Expr_StaticCall->args' => ', ', + 'Stmt_ClassConst->consts' => ', ', + 'Stmt_ClassMethod->params' => ', ', + 'Stmt_Class->implements' => ', ', + 'Expr_PrintableNewAnonClass->implements' => ', ', + 'Stmt_Const->consts' => ', ', + 'Stmt_Declare->declares' => ', ', + 'Stmt_Echo->exprs' => ', ', + 'Stmt_For->init' => ', ', + 'Stmt_For->cond' => ', ', + 'Stmt_For->loop' => ', ', + 'Stmt_Function->params' => ', ', + 'Stmt_Global->vars' => ', ', + 'Stmt_GroupUse->uses' => ', ', + 'Stmt_Interface->extends' => ', ', + 'Stmt_Property->props' => ', ', + 'Stmt_StaticVar->vars' => ', ', + 'Stmt_TraitUse->traits' => ', ', + 'Stmt_TraitUseAdaptation_Precedence->insteadof' => ', ', + 'Stmt_Unset->vars' => ', ', + 'Stmt_Use->uses' => ', ', + + // statement lists + 'Expr_Closure->stmts' => "\n", + 'Stmt_Case->stmts' => "\n", + 'Stmt_Catch->stmts' => "\n", + 'Stmt_Class->stmts' => "\n", + 'Expr_PrintableNewAnonClass->stmts' => "\n", + 'Stmt_Interface->stmts' => "\n", + 'Stmt_Trait->stmts' => "\n", + 'Stmt_ClassMethod->stmts' => "\n", + 'Stmt_Declare->stmts' => "\n", + 'Stmt_Do->stmts' => "\n", + 'Stmt_ElseIf->stmts' => "\n", + 'Stmt_Else->stmts' => "\n", + 'Stmt_Finally->stmts' => "\n", + 'Stmt_Foreach->stmts' => "\n", + 'Stmt_For->stmts' => "\n", + 'Stmt_Function->stmts' => "\n", + 'Stmt_If->stmts' => "\n", + 'Stmt_Namespace->stmts' => "\n", + 'Stmt_Switch->cases' => "\n", + 'Stmt_TraitUse->adaptations' => "\n", + 'Stmt_TryCatch->stmts' => "\n", + 'Stmt_While->stmts' => "\n", + ]; + } + + protected function initializeModifierChangeMap() { + if ($this->modifierChangeMap) return; + + $this->modifierChangeMap = [ + 'Stmt_ClassConst->flags' => \T_CONST, + 'Stmt_ClassMethod->flags' => \T_FUNCTION, + 'Stmt_Class->flags' => \T_CLASS, + 'Stmt_Property->flags' => \T_VARIABLE, + //'Stmt_TraitUseAdaptation_Alias->newModifier' => 0, // TODO + ]; + + // List of integer subnodes that are not modifiers: + // Expr_Include->type + // Stmt_GroupUse->type + // Stmt_Use->type + // Stmt_UseUse->type } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Serializer.php b/vendor/nikic/php-parser/lib/PhpParser/Serializer.php deleted file mode 100644 index 1dd79066..00000000 --- a/vendor/nikic/php-parser/lib/PhpParser/Serializer.php +++ /dev/null @@ -1,18 +0,0 @@ -writer = new XMLWriter; - $this->writer->openMemory(); - $this->writer->setIndent(true); - } - - public function serialize(array $nodes) { - $this->writer->flush(); - $this->writer->startDocument('1.0', 'UTF-8'); - - $this->writer->startElement('AST'); - $this->writer->writeAttribute('xmlns:node', 'http://nikic.github.com/PHPParser/XML/node'); - $this->writer->writeAttribute('xmlns:subNode', 'http://nikic.github.com/PHPParser/XML/subNode'); - $this->writer->writeAttribute('xmlns:attribute', 'http://nikic.github.com/PHPParser/XML/attribute'); - $this->writer->writeAttribute('xmlns:scalar', 'http://nikic.github.com/PHPParser/XML/scalar'); - - $this->_serialize($nodes); - - $this->writer->endElement(); - - return $this->writer->outputMemory(); - } - - protected function _serialize($node) { - if ($node instanceof Node) { - $this->writer->startElement('node:' . $node->getType()); - - foreach ($node->getAttributes() as $name => $value) { - $this->writer->startElement('attribute:' . $name); - $this->_serialize($value); - $this->writer->endElement(); - } - - foreach ($node as $name => $subNode) { - $this->writer->startElement('subNode:' . $name); - $this->_serialize($subNode); - $this->writer->endElement(); - } - - $this->writer->endElement(); - } elseif ($node instanceof Comment) { - $this->writer->startElement('comment'); - $this->writer->writeAttribute('isDocComment', $node instanceof Comment\Doc ? 'true' : 'false'); - $this->writer->writeAttribute('line', (string) $node->getLine()); - $this->writer->text($node->getText()); - $this->writer->endElement(); - } elseif (is_array($node)) { - $this->writer->startElement('scalar:array'); - foreach ($node as $subNode) { - $this->_serialize($subNode); - } - $this->writer->endElement(); - } elseif (is_string($node)) { - $this->writer->writeElement('scalar:string', $node); - } elseif (is_int($node)) { - $this->writer->writeElement('scalar:int', (string) $node); - } elseif (is_float($node)) { - // TODO Higher precision conversion? - $this->writer->writeElement('scalar:float', (string) $node); - } elseif (true === $node) { - $this->writer->writeElement('scalar:true'); - } elseif (false === $node) { - $this->writer->writeElement('scalar:false'); - } elseif (null === $node) { - $this->writer->writeElement('scalar:null'); - } else { - throw new \InvalidArgumentException('Unexpected node type'); - } - } -} diff --git a/vendor/nikic/php-parser/lib/PhpParser/Unserializer.php b/vendor/nikic/php-parser/lib/PhpParser/Unserializer.php deleted file mode 100644 index 9c221a14..00000000 --- a/vendor/nikic/php-parser/lib/PhpParser/Unserializer.php +++ /dev/null @@ -1,18 +0,0 @@ -reader = new XMLReader; - } - - public function unserialize($string) { - $this->reader->XML($string); - - $this->reader->read(); - if ('AST' !== $this->reader->name) { - throw new DomainException('AST root element not found'); - } - - return $this->read($this->reader->depth); - } - - protected function read($depthLimit, $throw = true, &$nodeFound = null) { - $nodeFound = true; - while ($this->reader->read() && $depthLimit < $this->reader->depth) { - if (XMLReader::ELEMENT !== $this->reader->nodeType) { - continue; - } - - if ('node' === $this->reader->prefix) { - return $this->readNode(); - } elseif ('scalar' === $this->reader->prefix) { - return $this->readScalar(); - } elseif ('comment' === $this->reader->name) { - return $this->readComment(); - } else { - throw new DomainException(sprintf('Unexpected node of type "%s"', $this->reader->name)); - } - } - - $nodeFound = false; - if ($throw) { - throw new DomainException('Expected node or scalar'); - } - } - - protected function readNode() { - $className = $this->getClassNameFromType($this->reader->localName); - - // create the node without calling it's constructor - $node = unserialize( - sprintf( - "O:%d:\"%s\":1:{s:13:\"\0*\0attributes\";a:0:{}}", - strlen($className), $className - ) - ); - - $depthLimit = $this->reader->depth; - while ($this->reader->read() && $depthLimit < $this->reader->depth) { - if (XMLReader::ELEMENT !== $this->reader->nodeType) { - continue; - } - - $type = $this->reader->prefix; - if ('subNode' !== $type && 'attribute' !== $type) { - throw new DomainException( - sprintf('Expected sub node or attribute, got node of type "%s"', $this->reader->name) - ); - } - - $name = $this->reader->localName; - $value = $this->read($this->reader->depth); - - if ('subNode' === $type) { - $node->$name = $value; - } else { - $node->setAttribute($name, $value); - } - } - - return $node; - } - - protected function readScalar() { - switch ($name = $this->reader->localName) { - case 'array': - $depth = $this->reader->depth; - $array = array(); - while (true) { - $node = $this->read($depth, false, $nodeFound); - if (!$nodeFound) { - break; - } - $array[] = $node; - } - return $array; - case 'string': - return $this->reader->readString(); - case 'int': - return $this->parseInt($this->reader->readString()); - case 'float': - $text = $this->reader->readString(); - if (false === $float = filter_var($text, FILTER_VALIDATE_FLOAT)) { - throw new DomainException(sprintf('"%s" is not a valid float', $text)); - } - return $float; - case 'true': - case 'false': - case 'null': - if (!$this->reader->isEmptyElement) { - throw new DomainException(sprintf('"%s" scalar must be empty', $name)); - } - return constant($name); - default: - throw new DomainException(sprintf('Unknown scalar type "%s"', $name)); - } - } - - private function parseInt($text) { - if (false === $int = filter_var($text, FILTER_VALIDATE_INT)) { - throw new DomainException(sprintf('"%s" is not a valid integer', $text)); - } - return $int; - } - - protected function readComment() { - $className = $this->reader->getAttribute('isDocComment') === 'true' - ? 'PhpParser\Comment\Doc' - : 'PhpParser\Comment' - ; - return new $className( - $this->reader->readString(), - $this->parseInt($this->reader->getAttribute('line')) - ); - } - - protected function getClassNameFromType($type) { - $className = 'PhpParser\\Node\\' . strtr($type, '_', '\\'); - if (!class_exists($className)) { - $className .= '_'; - } - if (!class_exists($className)) { - throw new DomainException(sprintf('Unknown node type "%s"', $type)); - } - return $className; - } -} diff --git a/vendor/nikic/php-parser/lib/bootstrap.php b/vendor/nikic/php-parser/lib/bootstrap.php deleted file mode 100644 index b0f51782..00000000 --- a/vendor/nikic/php-parser/lib/bootstrap.php +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/vendor/nikic/php-parser/test/PhpParser/AutoloaderTest.php b/vendor/nikic/php-parser/test/PhpParser/AutoloaderTest.php deleted file mode 100644 index 8eeded83..00000000 --- a/vendor/nikic/php-parser/test/PhpParser/AutoloaderTest.php +++ /dev/null @@ -1,15 +0,0 @@ -assertTrue(class_exists('PhpParser\NodeVisitorAbstract')); - $this->assertFalse(class_exists('PHPParser_NodeVisitor_NameResolver')); - - $this->assertFalse(class_exists('PhpParser\FooBar')); - $this->assertFalse(class_exists('PHPParser_FooBar')); - } -} diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/ClassTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/ClassTest.php index 0f741821..fe324d76 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Builder/ClassTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Builder/ClassTest.php @@ -1,4 +1,4 @@ -assertEquals( - new Stmt\Class_('SomeLogger', array( + new Stmt\Class_('SomeLogger', [ 'extends' => new Name('BaseLogger'), - 'implements' => array( + 'implements' => [ new Name('Namespaced\Logger'), new Name('SomeInterface'), new Name\FullyQualified('Fully\Qualified'), new Name\Relative('NamespaceRelative'), - ), - )), + ], + ]), $node ); } @@ -42,9 +43,9 @@ class ClassTest extends \PHPUnit_Framework_TestCase ; $this->assertEquals( - new Stmt\Class_('Test', array( + new Stmt\Class_('Test', [ 'flags' => Stmt\Class_::MODIFIER_ABSTRACT - )), + ]), $node ); } @@ -56,9 +57,9 @@ class ClassTest extends \PHPUnit_Framework_TestCase ; $this->assertEquals( - new Stmt\Class_('Test', array( + new Stmt\Class_('Test', [ 'flags' => Stmt\Class_::MODIFIER_FINAL - )), + ]), $node ); } @@ -67,24 +68,24 @@ class ClassTest extends \PHPUnit_Framework_TestCase $method = new Stmt\ClassMethod('testMethod'); $property = new Stmt\Property( Stmt\Class_::MODIFIER_PUBLIC, - array(new Stmt\PropertyProperty('testProperty')) + [new Stmt\PropertyProperty('testProperty')] ); - $const = new Stmt\ClassConst(array( + $const = new Stmt\ClassConst([ new Node\Const_('TEST_CONST', new Node\Scalar\String_('ABC')) - )); - $use = new Stmt\TraitUse(array(new Name('SomeTrait'))); + ]); + $use = new Stmt\TraitUse([new Name('SomeTrait')]); $node = $this->createClassBuilder('Test') ->addStmt($method) ->addStmt($property) - ->addStmts(array($const, $use)) + ->addStmts([$const, $use]) ->getNode() ; $this->assertEquals( - new Stmt\Class_('Test', array( - 'stmts' => array($use, $const, $property, $method) - )), + new Stmt\Class_('Test', [ + 'stmts' => [$use, $const, $property, $method] + ]), $node ); } @@ -100,11 +101,11 @@ DOC; ->getNode(); $this->assertEquals( - new Stmt\Class_('Test', array(), array( - 'comments' => array( + new Stmt\Class_('Test', [], [ + 'comments' => [ new Comment\Doc($docComment) - ) - )), + ] + ]), $class ); @@ -113,11 +114,11 @@ DOC; ->getNode(); $this->assertEquals( - new Stmt\Class_('Test', array(), array( - 'comments' => array( + new Stmt\Class_('Test', [], [ + 'comments' => [ new Comment\Doc($docComment) - ) - )), + ] + ]), $class ); } @@ -128,7 +129,7 @@ DOC; */ public function testInvalidStmtError() { $this->createClassBuilder('Test') - ->addStmt(new Stmt\Echo_(array())) + ->addStmt(new Stmt\Echo_([])) ; } @@ -152,10 +153,10 @@ DOC; /** * @expectedException \LogicException - * @expectedExceptionMessage Name must be a string or an instance of PhpParser\Node\Name + * @expectedExceptionMessage Name must be a string or an instance of Node\Name */ public function testInvalidName() { $this->createClassBuilder('Test') - ->extend(array('Foo')); + ->extend(['Foo']); } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php index f6a9381d..a2c62192 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php @@ -1,14 +1,16 @@ -assertEquals( - new Stmt\Function_('test', array( + new Stmt\Function_('test', [ 'byRef' => true - )), + ]), $node ); } public function testParams() { - $param1 = new Node\Param('test1'); - $param2 = new Node\Param('test2'); - $param3 = new Node\Param('test3'); + $param1 = new Node\Param(new Variable('test1')); + $param2 = new Node\Param(new Variable('test2')); + $param3 = new Node\Param(new Variable('test3')); $node = $this->createFunctionBuilder('test') ->addParam($param1) - ->addParams(array($param2, $param3)) + ->addParams([$param2, $param3]) ->getNode() ; $this->assertEquals( - new Stmt\Function_('test', array( - 'params' => array($param1, $param2, $param3) - )), + new Stmt\Function_('test', [ + 'params' => [$param1, $param2, $param3] + ]), $node ); } @@ -54,14 +56,18 @@ class FunctionTest extends \PHPUnit_Framework_TestCase $node = $this->createFunctionBuilder('test') ->addStmt($stmt1) - ->addStmts(array($stmt2, $stmt3)) + ->addStmts([$stmt2, $stmt3]) ->getNode() ; $this->assertEquals( - new Stmt\Function_('test', array( - 'stmts' => array($stmt1, $stmt2, $stmt3) - )), + new Stmt\Function_('test', [ + 'stmts' => [ + new Stmt\Expression($stmt1), + new Stmt\Expression($stmt2), + new Stmt\Expression($stmt3), + ] + ]), $node ); } @@ -71,9 +77,9 @@ class FunctionTest extends \PHPUnit_Framework_TestCase ->setDocComment('/** Test */') ->getNode(); - $this->assertEquals(new Stmt\Function_('test', array(), array( - 'comments' => array(new Comment\Doc('/** Test */')) - )), $node); + $this->assertEquals(new Stmt\Function_('test', [], [ + 'comments' => [new Comment\Doc('/** Test */')] + ]), $node); } public function testReturnType() { @@ -81,9 +87,9 @@ class FunctionTest extends \PHPUnit_Framework_TestCase ->setReturnType('void') ->getNode(); - $this->assertEquals(new Stmt\Function_('test', array( + $this->assertEquals(new Stmt\Function_('test', [ 'returnType' => 'void' - ), array()), $node); + ], []), $node); } /** @@ -103,4 +109,13 @@ class FunctionTest extends \PHPUnit_Framework_TestCase ->addParam(new Node\Name('foo')) ; } + + /** + * @expectedException \LogicException + * @expectedExceptionMessage Expected statement or expression node + */ + public function testAddNonStmt() { + $this->createFunctionBuilder('test') + ->addStmt(new Node\Name('Test')); + } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php index 72c58668..2c926b60 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php @@ -1,4 +1,4 @@ -prettyPrint(array($node)); + return $pp->prettyPrint([$node]); } public function testEmpty() { $contract = $this->builder->getNode(); - $this->assertInstanceOf('PhpParser\Node\Stmt\Interface_', $contract); - $this->assertSame('Contract', $contract->name); + $this->assertInstanceOf(Stmt\Interface_::class, $contract); + $this->assertEquals(new Node\Identifier('Contract'), $contract->name); } public function testExtending() { $contract = $this->builder->extend('Space\Root1', 'Root2')->getNode(); $this->assertEquals( - new Stmt\Interface_('Contract', array( - 'extends' => array( + new Stmt\Interface_('Contract', [ + 'extends' => [ new Node\Name('Space\Root1'), new Node\Name('Root2') - ), - )), $contract + ], + ]), $contract ); } public function testAddMethod() { $method = new Stmt\ClassMethod('doSomething'); $contract = $this->builder->addStmt($method)->getNode(); - $this->assertSame(array($method), $contract->stmts); + $this->assertSame([$method], $contract->stmts); } public function testAddConst() { - $const = new Stmt\ClassConst(array( + $const = new Stmt\ClassConst([ new Node\Const_('SPEED_OF_LIGHT', new DNumber(299792458.0)) - )); + ]); $contract = $this->builder->addStmt($const)->getNode(); $this->assertSame(299792458.0, $contract->stmts[0]->consts[0]->value->value); } public function testOrder() { - $const = new Stmt\ClassConst(array( + $const = new Stmt\ClassConst([ new Node\Const_('SPEED_OF_LIGHT', new DNumber(299792458)) - )); + ]); $method = new Stmt\ClassMethod('doSomething'); $contract = $this->builder ->addStmt($method) @@ -64,8 +65,8 @@ class InterfaceTest extends \PHPUnit_Framework_TestCase ->getNode() ; - $this->assertInstanceOf('PhpParser\Node\Stmt\ClassConst', $contract->stmts[0]); - $this->assertInstanceOf('PhpParser\Node\Stmt\ClassMethod', $contract->stmts[1]); + $this->assertInstanceOf(Stmt\ClassConst::class, $contract->stmts[0]); + $this->assertInstanceOf(Stmt\ClassMethod::class, $contract->stmts[1]); } public function testDocComment() { @@ -73,9 +74,9 @@ class InterfaceTest extends \PHPUnit_Framework_TestCase ->setDocComment('/** Test */') ->getNode(); - $this->assertEquals(new Stmt\Interface_('Contract', array(), array( - 'comments' => array(new Comment\Doc('/** Test */')) - )), $node); + $this->assertEquals(new Stmt\Interface_('Contract', [], [ + 'comments' => [new Comment\Doc('/** Test */')] + ]), $node); } /** @@ -87,9 +88,9 @@ class InterfaceTest extends \PHPUnit_Framework_TestCase } public function testFullFunctional() { - $const = new Stmt\ClassConst(array( + $const = new Stmt\ClassConst([ new Node\Const_('SPEED_OF_LIGHT', new DNumber(299792458)) - )); + ]); $method = new Stmt\ClassMethod('doSomething'); $contract = $this->builder ->addStmt($method) @@ -102,4 +103,3 @@ class InterfaceTest extends \PHPUnit_Framework_TestCase $this->assertTrue(interface_exists('Contract', false)); } } - diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/MethodTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/MethodTest.php index 21c5617a..0decbed0 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Builder/MethodTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Builder/MethodTest.php @@ -1,14 +1,16 @@ -assertEquals( - new Stmt\ClassMethod('test', array( + new Stmt\ClassMethod('test', [ 'flags' => Stmt\Class_::MODIFIER_PUBLIC | Stmt\Class_::MODIFIER_ABSTRACT | Stmt\Class_::MODIFIER_STATIC, 'stmts' => null, - )), + ]), $node ); @@ -39,10 +41,10 @@ class MethodTest extends \PHPUnit_Framework_TestCase ; $this->assertEquals( - new Stmt\ClassMethod('test', array( + new Stmt\ClassMethod('test', [ 'flags' => Stmt\Class_::MODIFIER_PROTECTED | Stmt\Class_::MODIFIER_FINAL - )), + ]), $node ); @@ -52,9 +54,9 @@ class MethodTest extends \PHPUnit_Framework_TestCase ; $this->assertEquals( - new Stmt\ClassMethod('test', array( + new Stmt\ClassMethod('test', [ 'type' => Stmt\Class_::MODIFIER_PRIVATE - )), + ]), $node ); } @@ -66,28 +68,28 @@ class MethodTest extends \PHPUnit_Framework_TestCase ; $this->assertEquals( - new Stmt\ClassMethod('test', array( + new Stmt\ClassMethod('test', [ 'byRef' => true - )), + ]), $node ); } public function testParams() { - $param1 = new Node\Param('test1'); - $param2 = new Node\Param('test2'); - $param3 = new Node\Param('test3'); + $param1 = new Node\Param(new Variable('test1')); + $param2 = new Node\Param(new Variable('test2')); + $param3 = new Node\Param(new Variable('test3')); $node = $this->createMethodBuilder('test') ->addParam($param1) - ->addParams(array($param2, $param3)) + ->addParams([$param2, $param3]) ->getNode() ; $this->assertEquals( - new Stmt\ClassMethod('test', array( - 'params' => array($param1, $param2, $param3) - )), + new Stmt\ClassMethod('test', [ + 'params' => [$param1, $param2, $param3] + ]), $node ); } @@ -99,14 +101,18 @@ class MethodTest extends \PHPUnit_Framework_TestCase $node = $this->createMethodBuilder('test') ->addStmt($stmt1) - ->addStmts(array($stmt2, $stmt3)) + ->addStmts([$stmt2, $stmt3]) ->getNode() ; $this->assertEquals( - new Stmt\ClassMethod('test', array( - 'stmts' => array($stmt1, $stmt2, $stmt3) - )), + new Stmt\ClassMethod('test', [ + 'stmts' => [ + new Stmt\Expression($stmt1), + new Stmt\Expression($stmt2), + new Stmt\Expression($stmt3), + ] + ]), $node ); } @@ -115,18 +121,18 @@ class MethodTest extends \PHPUnit_Framework_TestCase ->setDocComment('/** Test */') ->getNode(); - $this->assertEquals(new Stmt\ClassMethod('test', array(), array( - 'comments' => array(new Comment\Doc('/** Test */')) - )), $node); + $this->assertEquals(new Stmt\ClassMethod('test', [], [ + 'comments' => [new Comment\Doc('/** Test */')] + ]), $node); } public function testReturnType() { $node = $this->createMethodBuilder('test') ->setReturnType('bool') ->getNode(); - $this->assertEquals(new Stmt\ClassMethod('test', array( + $this->assertEquals(new Stmt\ClassMethod('test', [ 'returnType' => 'bool' - ), array()), $node); + ], []), $node); } /** diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/NamespaceTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/NamespaceTest.php index 88131fc3..b8dce39c 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Builder/NamespaceTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Builder/NamespaceTest.php @@ -1,12 +1,13 @@ - array($docComment)) + [$stmt1, $stmt2, $stmt3], + ['comments' => [$docComment]] ); $node = $this->createNamespaceBuilder('Name\Space') ->addStmt($stmt1) - ->addStmts(array($stmt2, $stmt3)) + ->addStmts([$stmt2, $stmt3]) ->setDocComment($docComment) ->getNode() ; $this->assertEquals($expected, $node); - $node = $this->createNamespaceBuilder(new Node\Name(array('Name', 'Space'))) + $node = $this->createNamespaceBuilder(new Node\Name(['Name', 'Space'])) ->setDocComment($docComment) - ->addStmts(array($stmt1, $stmt2)) + ->addStmts([$stmt1, $stmt2]) ->addStmt($stmt3) ->getNode() ; diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php index e67ae99f..d3318921 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php @@ -1,12 +1,13 @@ - 'bar', 'bar' => 'foo'), - new Expr\Array_(array( + ]) + ], + [ + ['foo' => 'bar', 'bar' => 'foo'], + new Expr\Array_([ new Expr\ArrayItem( new Scalar\String_('bar'), new Scalar\String_('foo') @@ -69,13 +70,13 @@ class ParamTest extends \PHPUnit_Framework_TestCase new Scalar\String_('foo'), new Scalar\String_('bar') ), - )) - ), - array( + ]) + ], + [ new Scalar\MagicConst\Dir, new Scalar\MagicConst\Dir - ) - ); + ] + ]; } /** @@ -95,38 +96,37 @@ class ParamTest extends \PHPUnit_Framework_TestCase $type = $type->type; } - if ($expectedType instanceof Node\Name) { - $this->assertInstanceOf(get_class($expectedType), $type); - $this->assertEquals($expectedType, $type); - } else { - $this->assertSame($expectedType, $type); - } + $this->assertInstanceOf(get_class($expectedType), $type); + $this->assertEquals($expectedType, $type); } public function provideTestTypeHints() { - return array( - array('array', 'array'), - array('callable', 'callable'), - array('bool', 'bool'), - array('int', 'int'), - array('float', 'float'), - array('string', 'string'), - array('iterable', 'iterable'), - array('object', 'object'), - array('Array', 'array'), - array('CALLABLE', 'callable'), - array('Some\Class', new Node\Name('Some\Class')), - array('\Foo', new Node\Name\FullyQualified('Foo')), - array('self', new Node\Name('self')), - array('?array', new Node\NullableType('array')), - array('?Some\Class', new Node\NullableType(new Node\Name('Some\Class'))), - array(new Node\Name('Some\Class'), new Node\Name('Some\Class')), - array(new Node\NullableType('int'), new Node\NullableType('int')), - array( + return [ + ['array', new Node\Identifier('array')], + ['callable', new Node\Identifier('callable')], + ['bool', new Node\Identifier('bool')], + ['int', new Node\Identifier('int')], + ['float', new Node\Identifier('float')], + ['string', new Node\Identifier('string')], + ['iterable', new Node\Identifier('iterable')], + ['object', new Node\Identifier('object')], + ['Array', new Node\Identifier('array')], + ['CALLABLE', new Node\Identifier('callable')], + ['Some\Class', new Node\Name('Some\Class')], + ['\Foo', new Node\Name\FullyQualified('Foo')], + ['self', new Node\Name('self')], + ['?array', new Node\NullableType(new Node\Identifier('array'))], + ['?Some\Class', new Node\NullableType(new Node\Name('Some\Class'))], + [new Node\Name('Some\Class'), new Node\Name('Some\Class')], + [ + new Node\NullableType(new Node\Identifier('int')), + new Node\NullableType(new Node\Identifier('int')) + ], + [ new Node\NullableType(new Node\Name('Some\Class')), new Node\NullableType(new Node\Name('Some\Class')) - ), - ); + ], + ]; } /** @@ -139,7 +139,7 @@ class ParamTest extends \PHPUnit_Framework_TestCase /** * @expectedException \LogicException - * @expectedExceptionMessage Type must be a string, or an instance of Name or NullableType + * @expectedExceptionMessage Type must be a string, or an instance of Name, Identifier or NullableType */ public function testInvalidTypeError() { $this->createParamBuilder('test')->setTypeHint(new \stdClass); @@ -152,7 +152,7 @@ class ParamTest extends \PHPUnit_Framework_TestCase ; $this->assertEquals( - new Node\Param('test', null, null, true), + new Node\Param(new Expr\Variable('test'), null, null, true), $node ); } @@ -164,7 +164,7 @@ class ParamTest extends \PHPUnit_Framework_TestCase ; $this->assertEquals( - new Node\Param('test', null, null, false, true), + new Node\Param(new Expr\Variable('test'), null, null, false, true), $node ); } diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/PropertyTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/PropertyTest.php index de8f4ce6..d7a5a70e 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Builder/PropertyTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Builder/PropertyTest.php @@ -1,4 +1,4 @@ -assertEquals( new Stmt\Property( Stmt\Class_::MODIFIER_PROTECTED, - array( + [ new Stmt\PropertyProperty('test') - ) + ] ), $node ); @@ -55,9 +56,9 @@ class PropertyTest extends \PHPUnit_Framework_TestCase $this->assertEquals( new Stmt\Property( Stmt\Class_::MODIFIER_PUBLIC, - array( + [ new Stmt\PropertyProperty('test') - ) + ] ), $node ); @@ -70,12 +71,12 @@ class PropertyTest extends \PHPUnit_Framework_TestCase $this->assertEquals(new Stmt\Property( Stmt\Class_::MODIFIER_PUBLIC, - array( + [ new Stmt\PropertyProperty('test') - ), - array( - 'comments' => array(new Comment\Doc('/** Test */')) - ) + ], + [ + 'comments' => [new Comment\Doc('/** Test */')] + ] ), $node); } @@ -92,42 +93,42 @@ class PropertyTest extends \PHPUnit_Framework_TestCase } public function provideTestDefaultValues() { - return array( - array( + return [ + [ null, new Expr\ConstFetch(new Name('null')) - ), - array( + ], + [ true, new Expr\ConstFetch(new Name('true')) - ), - array( + ], + [ false, new Expr\ConstFetch(new Name('false')) - ), - array( + ], + [ 31415, new Scalar\LNumber(31415) - ), - array( + ], + [ 3.1415, new Scalar\DNumber(3.1415) - ), - array( + ], + [ 'Hallo World', new Scalar\String_('Hallo World') - ), - array( - array(1, 2, 3), - new Expr\Array_(array( + ], + [ + [1, 2, 3], + new Expr\Array_([ new Expr\ArrayItem(new Scalar\LNumber(1)), new Expr\ArrayItem(new Scalar\LNumber(2)), new Expr\ArrayItem(new Scalar\LNumber(3)), - )) - ), - array( - array('foo' => 'bar', 'bar' => 'foo'), - new Expr\Array_(array( + ]) + ], + [ + ['foo' => 'bar', 'bar' => 'foo'], + new Expr\Array_([ new Expr\ArrayItem( new Scalar\String_('bar'), new Scalar\String_('foo') @@ -136,12 +137,12 @@ class PropertyTest extends \PHPUnit_Framework_TestCase new Scalar\String_('foo'), new Scalar\String_('bar') ), - )) - ), - array( + ]) + ], + [ new Scalar\MagicConst\Dir, new Scalar\MagicConst\Dir - ) - ); + ] + ]; } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/TraitTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/TraitTest.php index 874bc4d2..666769dc 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Builder/TraitTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Builder/TraitTest.php @@ -1,12 +1,13 @@ -createTraitBuilder('TestTrait') ->setDocComment('/** Nice trait */') @@ -42,7 +43,7 @@ class TraitTest extends \PHPUnit_Framework_TestCase */ public function testInvalidStmtError() { $this->createTraitBuilder('Test') - ->addStmt(new Stmt\Echo_(array())) + ->addStmt(new Stmt\Echo_([])) ; } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/UseTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/UseTest.php index adaeb3a5..85c1d77d 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Builder/UseTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Builder/UseTest.php @@ -1,10 +1,11 @@ -createUseBuilder('Foo\Bar')->getNode(); - $this->assertEquals(new Stmt\Use_(array( - new Stmt\UseUse(new Name('Foo\Bar'), 'Bar') - )), $node); + $this->assertEquals(new Stmt\Use_([ + new Stmt\UseUse(new Name('Foo\Bar'), null) + ]), $node); $node = $this->createUseBuilder(new Name('Foo\Bar'))->as('XYZ')->getNode(); - $this->assertEquals(new Stmt\Use_(array( + $this->assertEquals(new Stmt\Use_([ new Stmt\UseUse(new Name('Foo\Bar'), 'XYZ') - )), $node); + ]), $node); $node = $this->createUseBuilder('foo\bar', Stmt\Use_::TYPE_FUNCTION)->as('foo')->getNode(); - $this->assertEquals(new Stmt\Use_(array( + $this->assertEquals(new Stmt\Use_([ new Stmt\UseUse(new Name('foo\bar'), 'foo') - ), Stmt\Use_::TYPE_FUNCTION), $node); - } - - public function testNonExistingMethod() { - $this->setExpectedException('LogicException', 'Method "foo" does not exist'); - $builder = $this->createUseBuilder('Test'); - $builder->foo(); + ], Stmt\Use_::TYPE_FUNCTION), $node); } } diff --git a/vendor/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php b/vendor/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php index 1c3ef18d..465f600f 100644 --- a/vendor/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php @@ -1,10 +1,19 @@ -assertEquals( + new String_("foo"), + $factory->val("foo") ); } - public function testNonExistingMethod() { - $this->setExpectedException('LogicException', 'Method "foo" does not exist'); + public function testConcat() { $factory = new BuilderFactory(); - $factory->foo(); + $varA = new Expr\Variable('a'); + $varB = new Expr\Variable('b'); + $varC = new Expr\Variable('c'); + + $this->assertEquals( + new Concat($varA, $varB), + $factory->concat($varA, $varB) + ); + $this->assertEquals( + new Concat(new Concat($varA, $varB), $varC), + $factory->concat($varA, $varB, $varC) + ); + $this->assertEquals( + new Concat(new Concat(new String_("a"), $varB), new String_("c")), + $factory->concat("a", $varB, "c") + ); + } + + /** + * @expectedException \LogicException + * @expectedExceptionMessage Expected at least two expressions + */ + public function testConcatOneError() { + (new BuilderFactory())->concat("a"); + } + + /** + * @expectedException \LogicException + * @expectedExceptionMessage Expected string or Expr + */ + public function testConcatInvalidExpr() { + (new BuilderFactory())->concat("a", 42); + } + + public function testArgs() { + $factory = new BuilderFactory(); + $unpack = new Arg(new Expr\Variable('c'), false, true); + $this->assertEquals( + [ + new Arg(new Expr\Variable('a')), + new Arg(new String_('b')), + $unpack + ], + $factory->args([new Expr\Variable('a'), 'b', $unpack]) + ); + } + + public function testCalls() { + $factory = new BuilderFactory(); + + // Simple function call + $this->assertEquals( + new Expr\FuncCall( + new Name('var_dump'), + [new Arg(new String_('str'))] + ), + $factory->funcCall('var_dump', ['str']) + ); + // Dynamic function call + $this->assertEquals( + new Expr\FuncCall(new Expr\Variable('fn')), + $factory->funcCall(new Expr\Variable('fn')) + ); + + // Simple method call + $this->assertEquals( + new Expr\MethodCall( + new Expr\Variable('obj'), + new Identifier('method'), + [new Arg(new LNumber(42))] + ), + $factory->methodCall(new Expr\Variable('obj'), 'method', [42]) + ); + // Explicitly pass Identifier node + $this->assertEquals( + new Expr\MethodCall( + new Expr\Variable('obj'), + new Identifier('method') + ), + $factory->methodCall(new Expr\Variable('obj'), new Identifier('method')) + ); + // Dynamic method call + $this->assertEquals( + new Expr\MethodCall( + new Expr\Variable('obj'), + new Expr\Variable('method') + ), + $factory->methodCall(new Expr\Variable('obj'), new Expr\Variable('method')) + ); + + // Simple static method call + $this->assertEquals( + new Expr\StaticCall( + new Name\FullyQualified('Foo'), + new Identifier('bar'), + [new Arg(new Expr\Variable('baz'))] + ), + $factory->staticCall('\Foo', 'bar', [new Expr\Variable('baz')]) + ); + // Dynamic static method call + $this->assertEquals( + new Expr\StaticCall( + new Expr\Variable('foo'), + new Expr\Variable('bar') + ), + $factory->staticCall(new Expr\Variable('foo'), new Expr\Variable('bar')) + ); + + // Simple new call + $this->assertEquals( + new Expr\New_(new Name\FullyQualified('stdClass')), + $factory->new('\stdClass') + ); + // Dynamic new call + $this->assertEquals( + new Expr\New_( + new Expr\Variable('foo'), + [new Arg(new String_('bar'))] + ), + $factory->new(new Expr\Variable('foo'), ['bar']) + ); + } + + public function testConstFetches() { + $factory = new BuilderFactory(); + $this->assertEquals( + new Expr\ConstFetch(new Name('FOO')), + $factory->constFetch('FOO') + ); + $this->assertEquals( + new Expr\ClassConstFetch(new Name('Foo'), new Identifier('BAR')), + $factory->classConstFetch('Foo', 'BAR') + ); + $this->assertEquals( + new Expr\ClassConstFetch(new Expr\Variable('foo'), new Identifier('BAR')), + $factory->classConstFetch(new Expr\Variable('foo'), 'BAR') + ); + } + + /** + * @expectedException \LogicException + * @expectedExceptionMessage Expected string or instance of Node\Identifier + */ + public function testInvalidIdentifier() { + (new BuilderFactory())->classConstFetch('Foo', new Expr\Variable('foo')); + } + + /** + * @expectedException \LogicException + * @expectedExceptionMessage Expected string or instance of Node\Identifier or Node\Expr + */ + public function testInvalidIdentifierOrExpr() { + (new BuilderFactory())->staticCall('Foo', new Name('bar')); + } + + /** + * @expectedException \LogicException + * @expectedExceptionMessage Name must be a string or an instance of Node\Name or Node\Expr + */ + public function testInvalidNameOrExpr() { + (new BuilderFactory())->funcCall(new Node\Stmt\Return_()); } public function testIntegration() { @@ -65,7 +243,7 @@ class BuilderFactoryTest extends \PHPUnit_Framework_TestCase ->addStmt($factory->property('someProperty')->makeProtected()) ->addStmt($factory->property('anotherProperty') ->makePrivate() - ->setDefault(array(1, 2, 3)))) + ->setDefault([1, 2, 3]))) ->getNode() ; @@ -96,7 +274,7 @@ abstract class SomeClass extends SomeOtherClass implements A\Few, \Interfaces } EOC; - $stmts = array($node); + $stmts = [$node]; $prettyPrinter = new PrettyPrinter\Standard(); $generated = $prettyPrinter->prettyPrintFile($stmts); diff --git a/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php b/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php index 1a4a9ad1..3bdab812 100644 --- a/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php @@ -1,7 +1,10 @@ - array( - 'startLine', 'endLine', 'startFilePos', 'endFilePos', 'comments' - ))); - $parser5 = new Parser\Php5($lexer); - $parser7 = new Parser\Php7($lexer); - - $dumpPositions = isset($modes['positions']); - $output5 = $this->getParseOutput($parser5, $code, $dumpPositions); - $output7 = $this->getParseOutput($parser7, $code, $dumpPositions); + list($parser5, $parser7) = $this->createParsers($modes); + list($stmts5, $output5) = $this->getParseOutput($parser5, $code, $modes); + list($stmts7, $output7) = $this->getParseOutput($parser7, $code, $modes); if (isset($modes['php5'])) { $this->assertSame($expected, $output5, $name); $this->assertNotSame($expected, $output7, $name); - } else if (isset($modes['php7'])) { + } elseif (isset($modes['php7'])) { $this->assertNotSame($expected, $output5, $name); $this->assertSame($expected, $output7, $name); } else { $this->assertSame($expected, $output5, $name); $this->assertSame($expected, $output7, $name); } + + $this->checkAttributes($stmts5); + $this->checkAttributes($stmts7); } - private function getParseOutput(Parser $parser, $code, $dumpPositions) { + public function createParsers(array $modes) { + $lexer = new Lexer\Emulative(['usedAttributes' => [ + 'startLine', 'endLine', + 'startFilePos', 'endFilePos', + 'startTokenPos', 'endTokenPos', + 'comments' + ]]); + + return [ + new Parser\Php5($lexer), + new Parser\Php7($lexer), + ]; + } + + private function getParseOutput(Parser $parser, $code, array $modes) { + $dumpPositions = isset($modes['positions']); + $errors = new ErrorHandler\Collecting; $stmts = $parser->parse($code, $errors); @@ -53,7 +68,7 @@ class CodeParsingTest extends CodeTestAbstract $output .= $dumper->dump($stmts, $code); } - return canonicalize($output); + return [$stmts, canonicalize($output)]; } public function provideTestParse() { @@ -67,4 +82,39 @@ class CodeParsingTest extends CodeTestAbstract return $e->getMessage(); } } + + private function checkAttributes($stmts) { + if ($stmts === null) { + return; + } + + $traverser = new NodeTraverser(); + $traverser->addVisitor(new class extends NodeVisitorAbstract { + public function enterNode(Node $node) { + $startLine = $node->getStartLine(); + $endLine = $node->getEndLine(); + $startFilePos = $node->getStartFilePos(); + $endFilePos = $node->getEndFilePos(); + $startTokenPos = $node->getStartTokenPos(); + $endTokenPos = $node->getEndTokenPos(); + if ($startLine < 0 || $endLine < 0 || + $startFilePos < 0 || $endFilePos < 0 || + $startTokenPos < 0 || $endTokenPos < 0 + ) { + throw new \Exception('Missing location information on ' . $node->getType()); + } + + if ($endLine < $startLine || + $endFilePos < $startFilePos || + $endTokenPos < $startTokenPos + ) { + // Nops and error can have inverted order, if they are empty + if (!$node instanceof Stmt\Nop && !$node instanceof Expr\Error) { + throw new \Exception('End < start on ' . $node->getType()); + } + } + } + }); + $traverser->traverse($stmts); + } } diff --git a/vendor/nikic/php-parser/test/PhpParser/CodeTestAbstract.php b/vendor/nikic/php-parser/test/PhpParser/CodeTestAbstract.php index 369ee41b..5eaf9d1b 100644 --- a/vendor/nikic/php-parser/test/PhpParser/CodeTestAbstract.php +++ b/vendor/nikic/php-parser/test/PhpParser/CodeTestAbstract.php @@ -1,61 +1,30 @@ -getPathname(); - $fileContents = file_get_contents($fileName); - $fileContents = canonicalize($fileContents); - - // evaluate @@{expr}@@ expressions - $fileContents = preg_replace_callback( - '/@@\{(.*?)\}@@/', - function($matches) { - return eval('return ' . $matches[1] . ';'); - }, - $fileContents - ); - - // parse sections - $parts = preg_split("/\n-----(?:\n|$)/", $fileContents); + protected function getTests($directory, $fileExtension, $chunksPerTest = 2) { + $parser = new CodeTestParser; + $allTests = []; + foreach (filesInDir($directory, $fileExtension) as $fileName => $fileContents) { + list($name, $tests) = $parser->parseTest($fileContents, $chunksPerTest); // first part is the name - $name = array_shift($parts) . ' (' . $fileName . ')'; + $name .= ' (' . $fileName . ')'; $shortName = ltrim(str_replace($directory, '', $fileName), '/\\'); // multiple sections possible with always two forming a pair - $chunks = array_chunk($parts, 2); - foreach ($chunks as $i => $chunk) { - $dataSetName = $shortName . (count($chunks) > 1 ? '#' . $i : ''); - list($expected, $mode) = $this->extractMode($chunk[1]); - $tests[$dataSetName] = array($name, $chunk[0], $expected, $mode); + foreach ($tests as $i => list($mode, $parts)) { + $dataSetName = $shortName . (count($parts) > 1 ? '#' . $i : ''); + $allTests[$dataSetName] = array_merge([$name], $parts, [$mode]); } } - return $tests; - } - - private function extractMode($expected) { - $firstNewLine = strpos($expected, "\n"); - if (false === $firstNewLine) { - $firstNewLine = strlen($expected); - } - - $firstLine = substr($expected, 0, $firstNewLine); - if (0 !== strpos($firstLine, '!!')) { - return [$expected, null]; - } - - $expected = (string) substr($expected, $firstNewLine + 1); - return [$expected, substr($firstLine, 2)]; + return $allTests; } } diff --git a/vendor/nikic/php-parser/test/PhpParser/CodeTestParser.php b/vendor/nikic/php-parser/test/PhpParser/CodeTestParser.php new file mode 100644 index 00000000..f63dc926 --- /dev/null +++ b/vendor/nikic/php-parser/test/PhpParser/CodeTestParser.php @@ -0,0 +1,68 @@ + $chunk) { + $lastPart = array_pop($chunk); + list($lastPart, $mode) = $this->extractMode($lastPart); + $tests[] = [$mode, array_merge($chunk, [$lastPart])]; + } + + return [$name, $tests]; + } + + public function reconstructTest($name, array $tests) { + $result = $name; + foreach ($tests as list($mode, $parts)) { + $lastPart = array_pop($parts); + foreach ($parts as $part) { + $result .= "\n-----\n$part"; + } + + $result .= "\n-----\n"; + if (null !== $mode) { + $result .= "!!$mode\n"; + } + $result .= $lastPart; + } + return $result; + } + + private function extractMode($expected) { + $firstNewLine = strpos($expected, "\n"); + if (false === $firstNewLine) { + $firstNewLine = strlen($expected); + } + + $firstLine = substr($expected, 0, $firstNewLine); + if (0 !== strpos($firstLine, '!!')) { + return [$expected, null]; + } + + $expected = (string) substr($expected, $firstNewLine + 1); + return [$expected, substr($firstLine, 2)]; + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/CommentTest.php b/vendor/nikic/php-parser/test/PhpParser/CommentTest.php index 081dd57b..7b6c2aab 100644 --- a/vendor/nikic/php-parser/test/PhpParser/CommentTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/CommentTest.php @@ -1,16 +1,19 @@ -assertSame('/* Some comment */', $comment->getText()); $this->assertSame('/* Some comment */', (string) $comment); $this->assertSame(1, $comment->getLine()); $this->assertSame(10, $comment->getFilePos()); + $this->assertSame(2, $comment->getTokenPos()); } /** @@ -22,10 +25,10 @@ class CommentTest extends \PHPUnit_Framework_TestCase } public function provideTestReformatting() { - return array( - array('// Some text' . "\n", '// Some text'), - array('/* Some text */', '/* Some text */'), - array( + return [ + ['// Some text' . "\n", '// Some text'], + ['/* Some text */', '/* Some text */'], + [ '/** * Some text. * Some more text. @@ -34,8 +37,8 @@ class CommentTest extends \PHPUnit_Framework_TestCase * Some text. * Some more text. */' - ), - array( + ], + [ '/* Some text. Some more text. @@ -44,30 +47,30 @@ class CommentTest extends \PHPUnit_Framework_TestCase Some text. Some more text. */' - ), - array( + ], + [ '/* Some text. More text. Even more text. */', '/* Some text. More text. Even more text. */' - ), - array( + ], + [ '/* Some text. More text. Indented text. */', '/* Some text. More text. Indented text. */', - ), + ], // invalid comment -> no reformatting - array( + [ 'hallo world', 'hallo world', - ), - ); + ], + ]; } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/test/PhpParser/ConstExprEvaluatorTest.php b/vendor/nikic/php-parser/test/PhpParser/ConstExprEvaluatorTest.php new file mode 100644 index 00000000..d0a83fff --- /dev/null +++ b/vendor/nikic/php-parser/test/PhpParser/ConstExprEvaluatorTest.php @@ -0,0 +1,133 @@ +parse('expr; + $evaluator = new ConstExprEvaluator(); + $this->assertSame($expected, $evaluator->evaluateDirectly($expr)); + } + + public function provideTestEvaluate() { + return [ + ['1', 1], + ['1.0', 1.0], + ['"foo"', "foo"], + ['[0, 1]', [0, 1]], + ['["foo" => "bar"]', ["foo" => "bar"]], + ['NULL', null], + ['False', false], + ['true', true], + ['+1', 1], + ['-1', -1], + ['~0', -1], + ['!true', false], + ['[0][0]', 0], + ['"a"[0]', "a"], + ['true ? 1 : (1/0)', 1], + ['false ? (1/0) : 1', 1], + ['42 ?: (1/0)', 42], + ['false ?: 42', 42], + ['false ?? 42', false], + ['null ?? 42', 42], + ['[0][0] ?? 42', 0], + ['[][0] ?? 42', 42], + ['0b11 & 0b10', 0b10], + ['0b11 | 0b10', 0b11], + ['0b11 ^ 0b10', 0b01], + ['1 << 2', 4], + ['4 >> 2', 1], + ['"a" . "b"', "ab"], + ['4 + 2', 6], + ['4 - 2', 2], + ['4 * 2', 8], + ['4 / 2', 2], + ['4 % 2', 0], + ['4 ** 2', 16], + ['1 == 1.0', true], + ['1 != 1.0', false], + ['1 < 2.0', true], + ['1 <= 2.0', true], + ['1 > 2.0', false], + ['1 >= 2.0', false], + ['1 <=> 2.0', -1], + ['1 === 1.0', false], + ['1 !== 1.0', true], + ['true && true', true], + ['true and true', true], + ['false && (1/0)', false], + ['false and (1/0)', false], + ['false || false', false], + ['false or false', false], + ['true || (1/0)', true], + ['true or (1/0)', true], + ['true xor false', true], + ]; + } + + /** + * @expectedException \PhpParser\ConstExprEvaluationException + * @expectedExceptionMessage Expression of type Expr_Variable cannot be evaluated + */ + public function testEvaluateFails() { + $evaluator = new ConstExprEvaluator(); + $evaluator->evaluateDirectly(new Expr\Variable('a')); + } + + public function testEvaluateFallback() { + $evaluator = new ConstExprEvaluator(function(Expr $expr) { + if ($expr instanceof Scalar\MagicConst\Line) { + return 42; + } + throw new ConstExprEvaluationException(); + }); + $expr = new Expr\BinaryOp\Plus( + new Scalar\LNumber(8), + new Scalar\MagicConst\Line() + ); + $this->assertSame(50, $evaluator->evaluateDirectly($expr)); + } + + /** + * @dataProvider provideTestEvaluateSilently + */ + public function testEvaluateSilently($expr, $exception, $msg) { + $evaluator = new ConstExprEvaluator(); + + try { + $evaluator->evaluateSilently($expr); + } catch (ConstExprEvaluationException $e) { + $this->assertSame( + 'An error occurred during constant expression evaluation', + $e->getMessage() + ); + + $prev = $e->getPrevious(); + $this->assertInstanceOf($exception, $prev); + $this->assertSame($msg, $prev->getMessage()); + } + } + + public function provideTestEvaluateSilently() { + return [ + [ + new Expr\BinaryOp\Mod(new Scalar\LNumber(42), new Scalar\LNumber(0)), + \Error::class, + 'Modulo by zero' + ], + [ + new Expr\BinaryOp\Div(new Scalar\LNumber(42), new Scalar\LNumber(0)), + \ErrorException::class, + 'Division by zero' + ], + ]; + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/CollectingTest.php b/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/CollectingTest.php index 37429817..842f131d 100644 --- a/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/CollectingTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/CollectingTest.php @@ -1,10 +1,12 @@ -assertFalse($errorHandler->hasErrors()); @@ -19,4 +21,4 @@ class CollectingTest extends \PHPUnit_Framework_TestCase { $this->assertFalse($errorHandler->hasErrors()); $this->assertEmpty($errorHandler->getErrors()); } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php b/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php index d7df7c26..31d349ae 100644 --- a/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php @@ -1,10 +1,12 @@ -handleError(new Error('Test')); } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/test/PhpParser/ErrorTest.php b/vendor/nikic/php-parser/test/PhpParser/ErrorTest.php index 59e880c3..4b9d73a1 100644 --- a/vendor/nikic/php-parser/test/PhpParser/ErrorTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/ErrorTest.php @@ -1,14 +1,16 @@ - 10, 'endLine' => 11, - ); + ]; $error = new Error('Some error', $attributes); $this->assertSame('Some error', $error->getRawMessage()); @@ -42,42 +44,42 @@ class ErrorTest extends \PHPUnit_Framework_TestCase /** @dataProvider provideTestColumnInfo */ public function testColumnInfo($code, $startPos, $endPos, $startColumn, $endColumn) { - $error = new Error('Some error', array( + $error = new Error('Some error', [ 'startFilePos' => $startPos, 'endFilePos' => $endPos, - )); + ]); - $this->assertSame(true, $error->hasColumnInfo()); + $this->assertTrue($error->hasColumnInfo()); $this->assertSame($startColumn, $error->getStartColumn($code)); $this->assertSame($endColumn, $error->getEndColumn($code)); } public function provideTestColumnInfo() { - return array( + return [ // Error at "bar" - array("assertSame(false, $error->hasColumnInfo()); + $this->assertFalse($error->hasColumnInfo()); try { $error->getStartColumn(''); $this->fail('Expected RuntimeException'); @@ -97,10 +99,10 @@ class ErrorTest extends \PHPUnit_Framework_TestCase * @expectedExceptionMessage Invalid position information */ public function testInvalidPosInfo() { - $error = new Error('Some error', array( + $error = new Error('Some error', [ 'startFilePos' => 10, 'endFilePos' => 11, - )); + ]); $error->getStartColumn('code'); } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Internal/DifferTest.php b/vendor/nikic/php-parser/test/PhpParser/Internal/DifferTest.php new file mode 100644 index 00000000..0cf878b6 --- /dev/null +++ b/vendor/nikic/php-parser/test/PhpParser/Internal/DifferTest.php @@ -0,0 +1,67 @@ +type) { + case DiffElem::TYPE_KEEP: + $diffStr .= $diffElem->old; + break; + case DiffElem::TYPE_REMOVE: + $diffStr .= '-' . $diffElem->old; + break; + case DiffElem::TYPE_ADD: + $diffStr .= '+' . $diffElem->new; + break; + case DiffElem::TYPE_REPLACE: + $diffStr .= '/' . $diffElem->old . $diffElem->new; + break; + default: + assert(false); + break; + } + } + return $diffStr; + } + + /** @dataProvider provideTestDiff */ + public function testDiff($oldStr, $newStr, $expectedDiffStr) { + $differ = new Differ(function($a, $b) { return $a === $b; }); + $diff = $differ->diff(str_split($oldStr), str_split($newStr)); + $this->assertSame($expectedDiffStr, $this->formatDiffString($diff)); + } + + public function provideTestDiff() { + return [ + ['abc', 'abc', 'abc'], + ['abc', 'abcdef', 'abc+d+e+f'], + ['abcdef', 'abc', 'abc-d-e-f'], + ['abcdef', 'abcxyzdef', 'abc+x+y+zdef'], + ['axyzb', 'ab', 'a-x-y-zb'], + ['abcdef', 'abxyef', 'ab-c-d+x+yef'], + ['abcdef', 'cdefab', '-a-bcdef+a+b'], + ]; + } + + /** @dataProvider provideTestDiffWithReplacements */ + public function testDiffWithReplacements($oldStr, $newStr, $expectedDiffStr) { + $differ = new Differ(function($a, $b) { return $a === $b; }); + $diff = $differ->diffWithReplacements(str_split($oldStr), str_split($newStr)); + $this->assertSame($expectedDiffStr, $this->formatDiffString($diff)); + } + + public function provideTestDiffWithReplacements() { + return [ + ['abcde', 'axyze', 'a/bx/cy/dze'], + ['abcde', 'xbcdy', '/axbcd/ey'], + ['abcde', 'axye', 'a-b-c-d+x+ye'], + ['abcde', 'axyzue', 'a-b-c-d+x+y+z+ue'], + ]; + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/JsonDecoderTest.php b/vendor/nikic/php-parser/test/PhpParser/JsonDecoderTest.php new file mode 100644 index 00000000..7ef60787 --- /dev/null +++ b/vendor/nikic/php-parser/test/PhpParser/JsonDecoderTest.php @@ -0,0 +1,45 @@ +parse($code); + $json = json_encode($stmts); + + $jsonDecoder = new JsonDecoder(); + $decodedStmts = $jsonDecoder->decode($json); + $this->assertEquals($stmts, $decodedStmts); + } + + /** @dataProvider provideTestDecodingError */ + public function testDecodingError($json, $expectedMessage) { + $jsonDecoder = new JsonDecoder(); + $this->expectException(\RuntimeException::class); + $this->expectExceptionMessage($expectedMessage); + $jsonDecoder->decode($json); + } + + public function provideTestDecodingError() { + return [ + ['???', 'JSON decoding error: Syntax error'], + ['{"nodeType":123}', 'Node type must be a string'], + ['{"nodeType":"Name","attributes":123}', 'Attributes must be an array'], + ['{"nodeType":"Comment"}', 'Comment must have text'], + ['{"nodeType":"xxx"}', 'Unknown node type "xxx"'], + ]; + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php b/vendor/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php index f1fe6183..3a33ba82 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php @@ -1,4 +1,4 @@ -', array( - array(Tokens::T_SPACESHIP, '<=>'), - )), - array('0b1010110', array( - array(Tokens::T_LNUMBER, '0b1010110'), - )), - array('0b1011010101001010110101010010101011010101010101101011001110111100', array( - array(Tokens::T_DNUMBER, '0b1011010101001010110101010010101011010101010101101011001110111100'), - )), - array('\\', array( - array(Tokens::T_NS_SEPARATOR, '\\'), - )), - array("<<<'NOWDOC'\nNOWDOC;\n", array( - array(Tokens::T_START_HEREDOC, "<<<'NOWDOC'\n"), - array(Tokens::T_END_HEREDOC, 'NOWDOC'), - array(ord(';'), ';'), - )), - array("<<<'NOWDOC'\nFoobar\nNOWDOC;\n", array( - array(Tokens::T_START_HEREDOC, "<<<'NOWDOC'\n"), - array(Tokens::T_ENCAPSED_AND_WHITESPACE, "Foobar\n"), - array(Tokens::T_END_HEREDOC, 'NOWDOC'), - array(ord(';'), ';'), - )), - ); + return [ + ['yield from', [ + [Tokens::T_YIELD_FROM, 'yield from'], + ]], + ["yield\r\nfrom", [ + [Tokens::T_YIELD_FROM, "yield\r\nfrom"], + ]], + ['...', [ + [Tokens::T_ELLIPSIS, '...'], + ]], + ['**', [ + [Tokens::T_POW, '**'], + ]], + ['**=', [ + [Tokens::T_POW_EQUAL, '**='], + ]], + ['??', [ + [Tokens::T_COALESCE, '??'], + ]], + ['<=>', [ + [Tokens::T_SPACESHIP, '<=>'], + ]], + ['0b1010110', [ + [Tokens::T_LNUMBER, '0b1010110'], + ]], + ['0b1011010101001010110101010010101011010101010101101011001110111100', [ + [Tokens::T_DNUMBER, '0b1011010101001010110101010010101011010101010101101011001110111100'], + ]], + ['\\', [ + [Tokens::T_NS_SEPARATOR, '\\'], + ]], + ["<<<'NOWDOC'\nNOWDOC;\n", [ + [Tokens::T_START_HEREDOC, "<<<'NOWDOC'\n"], + [Tokens::T_END_HEREDOC, 'NOWDOC'], + [ord(';'), ';'], + ]], + ["<<<'NOWDOC'\nFoobar\nNOWDOC;\n", [ + [Tokens::T_START_HEREDOC, "<<<'NOWDOC'\n"], + [Tokens::T_ENCAPSED_AND_WHITESPACE, "Foobar\n"], + [Tokens::T_END_HEREDOC, 'NOWDOC'], + [ord(';'), ';'], + ]], + ]; } } diff --git a/vendor/nikic/php-parser/test/PhpParser/LexerTest.php b/vendor/nikic/php-parser/test/PhpParser/LexerTest.php index bf7a5d32..c34cc71e 100644 --- a/vendor/nikic/php-parser/test/PhpParser/LexerTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/LexerTest.php @@ -1,13 +1,14 @@ -startLexing($code, $errorHandler); $errors = $errorHandler->getErrors(); - $this->assertSame(count($messages), count($errors)); + $this->assertCount(count($messages), $errors); for ($i = 0; $i < count($messages); $i++) { $this->assertSame($messages[$i], $errors[$i]->getMessageWithColumnInfo($code)); } } public function provideTestError() { - return array( - array("plaintext', - array(), - array( - array( + [], + [ + [ Tokens::T_STRING, 'tokens', - array('startLine' => 1), array('endLine' => 1) - ), - array( + ['startLine' => 1], ['endLine' => 1] + ], + [ ord(';'), '?>', - array('startLine' => 1), array('endLine' => 1) - ), - array( + ['startLine' => 1], ['endLine' => 1] + ], + [ Tokens::T_INLINE_HTML, 'plaintext', - array('startLine' => 1, 'hasLeadingNewline' => false), - array('endLine' => 1) - ), - ) - ), + ['startLine' => 1, 'hasLeadingNewline' => false], + ['endLine' => 1] + ], + ] + ], // tests line numbers - array( + [ ' 2), array('endLine' => 2) - ), - array( + ['startLine' => 2], ['endLine' => 2] + ], + [ Tokens::T_STRING, 'token', - array('startLine' => 2), array('endLine' => 2) - ), - array( + ['startLine' => 2], ['endLine' => 2] + ], + [ ord('$'), '$', - array( + [ 'startLine' => 3, - 'comments' => array( - new Comment\Doc('/** doc' . "\n" . 'comment */', 2, 14), - ) - ), - array('endLine' => 3) - ), - ) - ), + 'comments' => [ + new Comment\Doc('/** doc' . "\n" . 'comment */', 2, 14, 5), + ] + ], + ['endLine' => 3] + ], + ] + ], // tests comment extraction - array( + [ ' 2, - 'comments' => array( - new Comment('/* comment */', 1, 6), - new Comment('// comment' . "\n", 1, 20), - new Comment\Doc('/** docComment 1 */', 2, 31), - new Comment\Doc('/** docComment 2 */', 2, 50), - ), - ), - array('endLine' => 2) - ), - ) - ), + 'comments' => [ + new Comment('/* comment */', 1, 6, 1), + new Comment('// comment' . "\n", 1, 20, 3), + new Comment\Doc('/** docComment 1 */', 2, 31, 4), + new Comment\Doc('/** docComment 2 */', 2, 50, 5), + ], + ], + ['endLine' => 2] + ], + ] + ], // tests differing start and end line - array( + [ ' 1), array('endLine' => 2) - ), - ) - ), + ['startLine' => 1], ['endLine' => 2] + ], + ] + ], // tests exact file offsets - array( + [ ' array('startFilePos', 'endFilePos')), - array( - array( + ['usedAttributes' => ['startFilePos', 'endFilePos']], + [ + [ Tokens::T_CONSTANT_ENCAPSED_STRING, '"a"', - array('startFilePos' => 6), array('endFilePos' => 8) - ), - array( + ['startFilePos' => 6], ['endFilePos' => 8] + ], + [ ord(';'), ';', - array('startFilePos' => 9), array('endFilePos' => 9) - ), - array( + ['startFilePos' => 9], ['endFilePos' => 9] + ], + [ Tokens::T_CONSTANT_ENCAPSED_STRING, '"b"', - array('startFilePos' => 18), array('endFilePos' => 20) - ), - array( + ['startFilePos' => 18], ['endFilePos' => 20] + ], + [ ord(';'), ';', - array('startFilePos' => 21), array('endFilePos' => 21) - ), - ) - ), + ['startFilePos' => 21], ['endFilePos' => 21] + ], + ] + ], // tests token offsets - array( + [ ' array('startTokenPos', 'endTokenPos')), - array( - array( + ['usedAttributes' => ['startTokenPos', 'endTokenPos']], + [ + [ Tokens::T_CONSTANT_ENCAPSED_STRING, '"a"', - array('startTokenPos' => 1), array('endTokenPos' => 1) - ), - array( + ['startTokenPos' => 1], ['endTokenPos' => 1] + ], + [ ord(';'), ';', - array('startTokenPos' => 2), array('endTokenPos' => 2) - ), - array( + ['startTokenPos' => 2], ['endTokenPos' => 2] + ], + [ Tokens::T_CONSTANT_ENCAPSED_STRING, '"b"', - array('startTokenPos' => 5), array('endTokenPos' => 5) - ), - array( + ['startTokenPos' => 5], ['endTokenPos' => 5] + ], + [ ord(';'), ';', - array('startTokenPos' => 6), array('endTokenPos' => 6) - ), - ) - ), + ['startTokenPos' => 6], ['endTokenPos' => 6] + ], + ] + ], // tests all attributes being disabled - array( + [ ' array()), - array( - array( + ['usedAttributes' => []], + [ + [ Tokens::T_VARIABLE, '$bar', - array(), array() - ), - array( + [], [] + ], + [ ord(';'), ';', - array(), array() - ) - ) - ), + [], [] + ] + ] + ], // tests no tokens - array( + [ '', - array(), - array() - ), - ); + [], + [] + ], + ]; } /** @@ -225,13 +226,13 @@ class LexerTest extends \PHPUnit_Framework_TestCase } public function provideTestHaltCompiler() { - return array( - array('Remaining Text', 'Remaining Text'), + return [ + ['Remaining Text', 'Remaining Text'], //array('getLexer(); $lexer->startLexing($code); diff --git a/vendor/nikic/php-parser/test/PhpParser/NameContextTest.php b/vendor/nikic/php-parser/test/PhpParser/NameContextTest.php new file mode 100644 index 00000000..41c3460d --- /dev/null +++ b/vendor/nikic/php-parser/test/PhpParser/NameContextTest.php @@ -0,0 +1,66 @@ +startNamespace(new Name('NS')); + $nameContext->addAlias(new Name('Foo'), 'Foo', Use_::TYPE_NORMAL); + $nameContext->addAlias(new Name('Foo\Bar'), 'Alias', Use_::TYPE_NORMAL); + $nameContext->addAlias(new Name('Foo\fn'), 'fn', Use_::TYPE_FUNCTION); + $nameContext->addAlias(new Name('Foo\CN'), 'CN', Use_::TYPE_CONSTANT); + + $possibleNames = $nameContext->getPossibleNames($name, $type); + $possibleNames = array_map(function (Name $name) { + return $name->toCodeString(); + }, $possibleNames); + + $this->assertSame($expectedPossibleNames, $possibleNames); + + // Here the last name is always the shortest one + $expectedShortName = $expectedPossibleNames[count($expectedPossibleNames) - 1]; + $this->assertSame( + $expectedShortName, + $nameContext->getShortName($name, $type)->toCodeString() + ); + } + + public function provideTestGetPossibleNames() { + return [ + [Use_::TYPE_NORMAL, 'Test', ['\Test']], + [Use_::TYPE_NORMAL, 'Test\Namespaced', ['\Test\Namespaced']], + [Use_::TYPE_NORMAL, 'NS\Test', ['\NS\Test', 'Test']], + [Use_::TYPE_NORMAL, 'ns\Test', ['\ns\Test', 'Test']], + [Use_::TYPE_NORMAL, 'NS\Foo\Bar', ['\NS\Foo\Bar']], + [Use_::TYPE_NORMAL, 'ns\foo\Bar', ['\ns\foo\Bar']], + [Use_::TYPE_NORMAL, 'Foo', ['\Foo', 'Foo']], + [Use_::TYPE_NORMAL, 'Foo\Bar', ['\Foo\Bar', 'Foo\Bar', 'Alias']], + [Use_::TYPE_NORMAL, 'Foo\Bar\Baz', ['\Foo\Bar\Baz', 'Foo\Bar\Baz', 'Alias\Baz']], + [Use_::TYPE_NORMAL, 'Foo\fn\Bar', ['\Foo\fn\Bar', 'Foo\fn\Bar']], + [Use_::TYPE_FUNCTION, 'Foo\fn\bar', ['\Foo\fn\bar', 'Foo\fn\bar']], + [Use_::TYPE_FUNCTION, 'Foo\fn', ['\Foo\fn', 'Foo\fn', 'fn']], + [Use_::TYPE_FUNCTION, 'Foo\FN', ['\Foo\FN', 'Foo\FN', 'fn']], + [Use_::TYPE_CONSTANT, 'Foo\CN\BAR', ['\Foo\CN\BAR', 'Foo\CN\BAR']], + [Use_::TYPE_CONSTANT, 'Foo\CN', ['\Foo\CN', 'Foo\CN', 'CN']], + [Use_::TYPE_CONSTANT, 'foo\CN', ['\foo\CN', 'Foo\CN', 'CN']], + [Use_::TYPE_CONSTANT, 'foo\cn', ['\foo\cn', 'Foo\cn']], + // self/parent/static must not be fully qualified + [Use_::TYPE_NORMAL, 'self', ['self']], + [Use_::TYPE_NORMAL, 'parent', ['parent']], + [Use_::TYPE_NORMAL, 'static', ['static']], + // true/false/null do not need to be fully qualified, even in namespaces + [Use_::TYPE_CONSTANT, 'true', ['\true', 'true']], + [Use_::TYPE_CONSTANT, 'false', ['\false', 'false']], + [Use_::TYPE_CONSTANT, 'null', ['\null', 'null']], + ]; + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/Node/IdentifierTest.php b/vendor/nikic/php-parser/test/PhpParser/Node/IdentifierTest.php new file mode 100644 index 00000000..fa2e72a8 --- /dev/null +++ b/vendor/nikic/php-parser/test/PhpParser/Node/IdentifierTest.php @@ -0,0 +1,31 @@ +assertSame('Foo', (string) $identifier); + $this->assertSame('Foo', $identifier->toString()); + $this->assertSame('foo', $identifier->toLowerString()); + } + + /** @dataProvider provideTestIsSpecialClassName */ + public function testIsSpecialClassName($identifier, $expected) { + $identifier = new Identifier($identifier); + $this->assertSame($expected, $identifier->isSpecialClassName()); + } + + public function provideTestIsSpecialClassName() { + return [ + ['self', true], + ['PARENT', true], + ['Static', true], + ['other', false], + ]; + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/Node/NameTest.php b/vendor/nikic/php-parser/test/PhpParser/Node/NameTest.php index 76a89c3e..8fe9ed63 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Node/NameTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Node/NameTest.php @@ -1,18 +1,20 @@ -assertSame(array('foo', 'bar'), $name->parts); + $name = new Name(['foo', 'bar']); + $this->assertSame(['foo', 'bar'], $name->parts); $name = new Name('foo\bar'); - $this->assertSame(array('foo', 'bar'), $name->parts); + $this->assertSame(['foo', 'bar'], $name->parts); $name = new Name($name); - $this->assertSame(array('foo', 'bar'), $name->parts); + $this->assertSame(['foo', 'bar'], $name->parts); } public function testGet() { @@ -26,10 +28,11 @@ class NameTest extends \PHPUnit_Framework_TestCase } public function testToString() { - $name = new Name('foo\bar'); + $name = new Name('Foo\Bar'); - $this->assertSame('foo\bar', (string) $name); - $this->assertSame('foo\bar', $name->toString()); + $this->assertSame('Foo\Bar', (string) $name); + $this->assertSame('Foo\Bar', $name->toString()); + $this->assertSame('foo\bar', $name->toLowerString()); } public function testSlice() { @@ -98,37 +101,73 @@ class NameTest extends \PHPUnit_Framework_TestCase $this->assertNull(Name::concat(null, null)); } - public function testIs() { + public function testNameTypes() { $name = new Name('foo'); - $this->assertTrue ($name->isUnqualified()); + $this->assertTrue($name->isUnqualified()); $this->assertFalse($name->isQualified()); $this->assertFalse($name->isFullyQualified()); $this->assertFalse($name->isRelative()); + $this->assertSame('foo', $name->toCodeString()); $name = new Name('foo\bar'); $this->assertFalse($name->isUnqualified()); - $this->assertTrue ($name->isQualified()); + $this->assertTrue($name->isQualified()); $this->assertFalse($name->isFullyQualified()); $this->assertFalse($name->isRelative()); + $this->assertSame('foo\bar', $name->toCodeString()); $name = new Name\FullyQualified('foo'); $this->assertFalse($name->isUnqualified()); $this->assertFalse($name->isQualified()); - $this->assertTrue ($name->isFullyQualified()); + $this->assertTrue($name->isFullyQualified()); $this->assertFalse($name->isRelative()); + $this->assertSame('\foo', $name->toCodeString()); $name = new Name\Relative('foo'); $this->assertFalse($name->isUnqualified()); $this->assertFalse($name->isQualified()); $this->assertFalse($name->isFullyQualified()); - $this->assertTrue ($name->isRelative()); + $this->assertTrue($name->isRelative()); + $this->assertSame('namespace\foo', $name->toCodeString()); } /** - * @expectedException \InvalidArgumentException + * @expectedException \InvalidArgumentException * @expectedExceptionMessage Expected string, array of parts or Name instance */ public function testInvalidArg() { Name::concat('foo', new \stdClass); } -} \ No newline at end of file + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage Name cannot be empty + */ + public function testInvalidEmptyString() { + new Name(''); + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage Name cannot be empty + */ + public function testInvalidEmptyArray() { + new Name([]); + } + + /** @dataProvider provideTestIsSpecialClassName */ + public function testIsSpecialClassName($name, $expected) { + $name = new Name($name); + $this->assertSame($expected, $name->isSpecialClassName()); + } + + public function provideTestIsSpecialClassName() { + return [ + ['self', true], + ['PARENT', true], + ['Static', true], + ['self\not', false], + ['not\self', false], + ]; + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/Node/Scalar/MagicConstTest.php b/vendor/nikic/php-parser/test/PhpParser/Node/Scalar/MagicConstTest.php index 3141f563..42b94874 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Node/Scalar/MagicConstTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Node/Scalar/MagicConstTest.php @@ -1,8 +1,11 @@ -provideTestParseEscapeSequences() as $i => $test) { // skip second and third tests, they aren't for double quotes - if ($i != 1 && $i != 2) { - $tests[] = array($test[0], '"' . $test[1] . '"'); + if ($i !== 1 && $i !== 2) { + $tests[] = [$test[0], '"' . $test[1] . '"']; } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassConstTest.php b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassConstTest.php index 610972c6..a5b6ce46 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassConstTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassConstTest.php @@ -1,15 +1,17 @@ -assertTrue($node->isPublic()); $this->assertFalse($node->isProtected()); $this->assertFalse($node->isPrivate()); - $this->assertFalse($node->isStatic()); } public function provideModifiers() { - return array( - array('public'), - array('protected'), - array('private'), - ); + return [ + ['public'], + ['protected'], + ['private'], + ]; } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassMethodTest.php b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassMethodTest.php index fa8aed80..4000495e 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassMethodTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassMethodTest.php @@ -1,22 +1,27 @@ - constant('PhpParser\Node\Stmt\Class_::MODIFIER_' . strtoupper($modifier)) - )); + ]); $this->assertTrue($node->{'is' . $modifier}()); } public function testNoModifiers() { - $node = new ClassMethod('foo', array('type' => 0)); + $node = new ClassMethod('foo', ['type' => 0]); $this->assertTrue($node->isPublic()); $this->assertFalse($node->isProtected()); @@ -24,17 +29,18 @@ class ClassMethodTest extends \PHPUnit_Framework_TestCase $this->assertFalse($node->isAbstract()); $this->assertFalse($node->isFinal()); $this->assertFalse($node->isStatic()); + $this->assertFalse($node->isMagic()); } public function provideModifiers() { - return array( - array('public'), - array('protected'), - array('private'), - array('abstract'), - array('final'), - array('static'), - ); + return [ + ['public'], + ['protected'], + ['private'], + ['abstract'], + ['final'], + ['static'], + ]; } /** @@ -42,22 +48,77 @@ class ClassMethodTest extends \PHPUnit_Framework_TestCase * * @dataProvider implicitPublicModifiers * - * @param integer $modifier Node type modifier + * @param string $modifier Node type modifier */ - public function testImplicitPublic($modifier) + public function testImplicitPublic(string $modifier) { - $node = new ClassMethod('foo', array( + $node = new ClassMethod('foo', [ 'type' => constant('PhpParser\Node\Stmt\Class_::MODIFIER_' . strtoupper($modifier)) - )); + ]); $this->assertTrue($node->isPublic(), 'Node should be implicitly public'); } public function implicitPublicModifiers() { - return array( - array('abstract'), - array('final'), - array('static'), - ); + return [ + ['abstract'], + ['final'], + ['static'], + ]; + } + + /** + * @dataProvider provideMagics + * + * @param string $name Node name + */ + public function testMagic(string $name) { + $node = new ClassMethod($name); + $this->assertTrue($node->isMagic(), 'Method should be magic'); + } + + public function provideMagics() { + return [ + ['__construct'], + ['__DESTRUCT'], + ['__caLL'], + ['__callstatic'], + ['__get'], + ['__set'], + ['__isset'], + ['__unset'], + ['__sleep'], + ['__wakeup'], + ['__tostring'], + ['__set_state'], + ['__clone'], + ['__invoke'], + ['__debuginfo'], + ]; + } + + public function testFunctionLike() { + $param = new Param(new Variable('a')); + $type = new Name('Foo'); + $return = new Return_(new Variable('a')); + $method = new ClassMethod('test', [ + 'byRef' => false, + 'params' => [$param], + 'returnType' => $type, + 'stmts' => [$return], + ]); + + $this->assertFalse($method->returnsByRef()); + $this->assertSame([$param], $method->getParams()); + $this->assertSame($type, $method->getReturnType()); + $this->assertSame([$return], $method->getStmts()); + + $method = new ClassMethod('test', [ + 'byRef' => true, + 'stmts' => null, + ]); + + $this->assertTrue($method->returnsByRef()); + $this->assertNull($method->getStmts()); } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassTest.php b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassTest.php index 75d49e3a..5d2b5dc0 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/ClassTest.php @@ -1,11 +1,13 @@ - Class_::MODIFIER_ABSTRACT)); + $class = new Class_('Foo', ['type' => Class_::MODIFIER_ABSTRACT]); $this->assertTrue($class->isAbstract()); $class = new Class_('Foo'); @@ -13,7 +15,7 @@ class ClassTest extends \PHPUnit_Framework_TestCase } public function testIsFinal() { - $class = new Class_('Foo', array('type' => Class_::MODIFIER_FINAL)); + $class = new Class_('Foo', ['type' => Class_::MODIFIER_FINAL]); $this->assertTrue($class->isFinal()); $class = new Class_('Foo'); @@ -21,21 +23,21 @@ class ClassTest extends \PHPUnit_Framework_TestCase } public function testGetMethods() { - $methods = array( + $methods = [ new ClassMethod('foo'), new ClassMethod('bar'), new ClassMethod('fooBar'), - ); - $class = new Class_('Foo', array( - 'stmts' => array( - new TraitUse(array()), + ]; + $class = new Class_('Foo', [ + 'stmts' => [ + new TraitUse([]), $methods[0], - new ClassConst(array()), + new ClassConst([]), $methods[1], - new Property(0, array()), + new Property(0, []), $methods[2], - ) - )); + ] + ]); $this->assertSame($methods, $class->getMethods()); } @@ -43,24 +45,17 @@ class ClassTest extends \PHPUnit_Framework_TestCase public function testGetMethod() { $methodConstruct = new ClassMethod('__CONSTRUCT'); $methodTest = new ClassMethod('test'); - $class = new Class_('Foo', array( - 'stmts' => array( - new ClassConst(array()), + $class = new Class_('Foo', [ + 'stmts' => [ + new ClassConst([]), $methodConstruct, - new Property(0, array()), + new Property(0, []), $methodTest, - ) - )); + ] + ]); $this->assertSame($methodConstruct, $class->getMethod('__construct')); $this->assertSame($methodTest, $class->getMethod('test')); $this->assertNull($class->getMethod('nonExisting')); } - - public function testDeprecatedTypeNode() { - $class = new Class_('Foo', array('type' => Class_::MODIFIER_ABSTRACT)); - $this->assertTrue($class->isAbstract()); - $this->assertSame(Class_::MODIFIER_ABSTRACT, $class->flags); - $this->assertSame(Class_::MODIFIER_ABSTRACT, $class->type); - } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/InterfaceTest.php b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/InterfaceTest.php index c4990582..e3e90e47 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/InterfaceTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/InterfaceTest.php @@ -1,25 +1,26 @@ - array( - new Node\Stmt\ClassConst(array(new Node\Const_('C1', new Node\Scalar\String_('C1')))), + ]; + $interface = new Class_('Foo', [ + 'stmts' => [ + new Node\Stmt\ClassConst([new Node\Const_('C1', new Node\Scalar\String_('C1'))]), $methods[0], - new Node\Stmt\ClassConst(array(new Node\Const_('C2', new Node\Scalar\String_('C2')))), + new Node\Stmt\ClassConst([new Node\Const_('C2', new Node\Scalar\String_('C2'))]), $methods[1], - new Node\Stmt\ClassConst(array(new Node\Const_('C3', new Node\Scalar\String_('C3')))), - ) - )); + new Node\Stmt\ClassConst([new Node\Const_('C3', new Node\Scalar\String_('C3'))]), + ] + ]); $this->assertSame($methods, $interface->getMethods()); } diff --git a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/PropertyTest.php b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/PropertyTest.php index bcfc0c6b..39387f96 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/PropertyTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Node/Stmt/PropertyTest.php @@ -1,8 +1,10 @@ -assertTrue($node->{'is' . $modifier}()); } public function testNoModifiers() { - $node = new Property(0, array()); + $node = new Property(0, []); $this->assertTrue($node->isPublic()); $this->assertFalse($node->isProtected()); @@ -26,7 +28,7 @@ class PropertyTest extends \PHPUnit_Framework_TestCase } public function testStaticImplicitlyPublic() { - $node = new Property(Class_::MODIFIER_STATIC, array()); + $node = new Property(Class_::MODIFIER_STATIC, []); $this->assertTrue($node->isPublic()); $this->assertFalse($node->isProtected()); $this->assertFalse($node->isPrivate()); @@ -34,11 +36,11 @@ class PropertyTest extends \PHPUnit_Framework_TestCase } public function provideModifiers() { - return array( - array('public'), - array('protected'), - array('private'), - array('static'), - ); + return [ + ['public'], + ['protected'], + ['private'], + ['static'], + ]; } } diff --git a/vendor/nikic/php-parser/test/PhpParser/NodeAbstractTest.php b/vendor/nikic/php-parser/test/PhpParser/NodeAbstractTest.php index 7fd0a39c..c8c785db 100644 --- a/vendor/nikic/php-parser/test/PhpParser/NodeAbstractTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/NodeAbstractTest.php @@ -1,8 +1,11 @@ -subNode2 = $subNode2; } - public function getSubNodeNames() { - return array('subNode1', 'subNode2'); + public function getSubNodeNames() : array { + return ['subNode1', 'subNode2']; } // This method is only overwritten because the node is located in an unusual namespace - public function getType() { + public function getType() : string { return 'Dummy'; } } -class NodeAbstractTest extends \PHPUnit_Framework_TestCase +class NodeAbstractTest extends TestCase { public function provideNodes() { - $attributes = array( + $attributes = [ 'startLine' => 10, - 'comments' => array( + 'endLine' => 11, + 'startTokenPos' => 12, + 'endTokenPos' => 13, + 'startFilePos' => 14, + 'endFilePos' => 15, + 'comments' => [ new Comment('// Comment' . "\n"), new Comment\Doc('/** doc comment */'), - ), - ); + ], + ]; $node = new DummyNode('value1', 'value2', $attributes); $node->notSubNode = 'value3'; - return array( - array($attributes, $node), - ); + return [ + [$attributes, $node], + ]; } /** @@ -46,15 +54,22 @@ class NodeAbstractTest extends \PHPUnit_Framework_TestCase */ public function testConstruct(array $attributes, Node $node) { $this->assertSame('Dummy', $node->getType()); - $this->assertSame(array('subNode1', 'subNode2'), $node->getSubNodeNames()); + $this->assertSame(['subNode1', 'subNode2'], $node->getSubNodeNames()); $this->assertSame(10, $node->getLine()); + $this->assertSame(10, $node->getStartLine()); + $this->assertSame(11, $node->getEndLine()); + $this->assertSame(12, $node->getStartTokenPos()); + $this->assertSame(13, $node->getEndTokenPos()); + $this->assertSame(14, $node->getStartFilePos()); + $this->assertSame(15, $node->getEndFilePos()); $this->assertSame('/** doc comment */', $node->getDocComment()->getText()); $this->assertSame('value1', $node->subNode1); $this->assertSame('value2', $node->subNode2); - $this->assertTrue(isset($node->subNode1)); - $this->assertTrue(isset($node->subNode2)); - $this->assertFalse(isset($node->subNode3)); + $this->assertObjectHasAttribute('subNode1', $node); + $this->assertObjectHasAttribute('subNode2', $node); + $this->assertObjectNotHasAttribute('subNode3', $node); $this->assertSame($attributes, $node->getAttributes()); + $this->assertSame($attributes['comments'], $node->getComments()); return $node; } @@ -64,9 +79,14 @@ class NodeAbstractTest extends \PHPUnit_Framework_TestCase */ public function testGetDocComment(array $attributes, Node $node) { $this->assertSame('/** doc comment */', $node->getDocComment()->getText()); - array_pop($node->getAttribute('comments')); // remove doc comment + $comments = $node->getComments(); + + array_pop($comments); // remove doc comment + $node->setAttribute('comments', $comments); $this->assertNull($node->getDocComment()); - array_pop($node->getAttribute('comments')); // remove comment + + array_pop($comments); // remove comment + $node->setAttribute('comments', $comments); $this->assertNull($node->getDocComment()); } @@ -96,10 +116,6 @@ class NodeAbstractTest extends \PHPUnit_Framework_TestCase * @dataProvider provideNodes */ public function testChange(array $attributes, Node $node) { - // change of line - $node->setLine(15); - $this->assertSame(15, $node->getLine()); - // direct modification $node->subNode = 'newValue'; $this->assertSame('newValue', $node->subNode); @@ -111,7 +127,7 @@ class NodeAbstractTest extends \PHPUnit_Framework_TestCase // removal unset($node->subNode); - $this->assertFalse(isset($node->subNode)); + $this->assertObjectNotHasAttribute('subNode', $node); } /** @@ -125,10 +141,10 @@ class NodeAbstractTest extends \PHPUnit_Framework_TestCase if ($i === 0) { $this->assertSame('subNode1', $key); $this->assertSame('value1', $value); - } else if ($i === 1) { + } elseif ($i === 1) { $this->assertSame('subNode2', $key); $this->assertSame('value2', $value); - } else if ($i === 2) { + } elseif ($i === 2) { $this->assertSame('notSubNode', $key); $this->assertSame('value3', $value); } else { @@ -141,7 +157,7 @@ class NodeAbstractTest extends \PHPUnit_Framework_TestCase public function testAttributes() { /** @var $node Node */ - $node = $this->getMockForAbstractClass('PhpParser\NodeAbstract'); + $node = $this->getMockForAbstractClass(NodeAbstract::class); $this->assertEmpty($node->getAttributes()); @@ -159,10 +175,24 @@ class NodeAbstractTest extends \PHPUnit_Framework_TestCase $this->assertNull($node->getAttribute('null', 'default')); $this->assertSame( - array( + [ 'key' => 'value', 'null' => null, - ), + ], + $node->getAttributes() + ); + + $node->setAttributes( + [ + 'a' => 'b', + 'c' => null, + ] + ); + $this->assertSame( + [ + 'a' => 'b', + 'c' => null, + ], $node->getAttributes() ); } @@ -181,14 +211,28 @@ PHP; { "nodeType": "Stmt_Function", "byRef": false, - "name": "functionName", + "name": { + "nodeType": "Identifier", + "name": "functionName", + "attributes": { + "startLine": 4, + "endLine": 4 + } + }, "params": [ { "nodeType": "Param", "type": null, "byRef": true, "variadic": false, - "name": "a", + "var": { + "nodeType": "Expr_Variable", + "name": "a", + "attributes": { + "startLine": 4, + "endLine": 4 + } + }, "default": { "nodeType": "Scalar_LNumber", "value": 0, @@ -208,7 +252,14 @@ PHP; "type": null, "byRef": false, "variadic": false, - "name": "b", + "var": { + "nodeType": "Expr_Variable", + "name": "b", + "attributes": { + "startLine": 4, + "endLine": 4 + } + }, "default": { "nodeType": "Scalar_DNumber", "value": 1, @@ -251,13 +302,15 @@ PHP; "nodeType": "Comment", "text": "\/\/ comment\n", "line": 2, - "filePos": 6 + "filePos": 6, + "tokenPos": 1 }, { "nodeType": "Comment_Doc", "text": "\/** doc comment *\/", "line": 3, - "filePos": 17 + "filePos": 17, + "tokenPos": 2 } ], "endLine": 6 diff --git a/vendor/nikic/php-parser/test/PhpParser/NodeDumperTest.php b/vendor/nikic/php-parser/test/PhpParser/NodeDumperTest.php index 9bb65a74..64d53117 100644 --- a/vendor/nikic/php-parser/test/PhpParser/NodeDumperTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/NodeDumperTest.php @@ -1,8 +1,10 @@ - 'FooBar'), + ], + [ + ['Foo', 'Bar', 'Key' => 'FooBar'], 'array( 0: Foo 1: Bar Key: FooBar )' - ), - array( - new Node\Name(array('Hallo', 'World')), + ], + [ + new Node\Name(['Hallo', 'World']), 'Name( parts: array( 0: Hallo 1: World ) )' - ), - array( - new Node\Expr\Array_(array( + ], + [ + new Node\Expr\Array_([ new Node\Expr\ArrayItem(new Node\Scalar\String_('Foo')) - )), + ]), 'Expr_Array( items: array( 0: Expr_ArrayItem( @@ -56,8 +58,8 @@ class NodeDumperTest extends \PHPUnit_Framework_TestCase ) ) )' - ), - ); + ], + ]; } public function testDumpWithPositions() { @@ -70,12 +72,14 @@ class NodeDumperTest extends \PHPUnit_Framework_TestCase $code = "var, $assign->expr->left, $assign->expr->right]; + return [$stmts, $vars]; + } + + public function testFind() { + $finder = new NodeFinder; + list($stmts, $vars) = $this->getStmtsAndVars(); + $varFilter = function(Node $node) { + return $node instanceof Expr\Variable; + }; + $this->assertSame($vars, $finder->find($stmts, $varFilter)); + $this->assertSame($vars, $finder->find($stmts[0], $varFilter)); + + $noneFilter = function () { return false; }; + $this->assertSame([], $finder->find($stmts, $noneFilter)); + } + + public function testFindInstanceOf() { + $finder = new NodeFinder; + list($stmts, $vars) = $this->getStmtsAndVars(); + $this->assertSame($vars, $finder->findInstanceOf($stmts, Expr\Variable::class)); + $this->assertSame($vars, $finder->findInstanceOf($stmts[0], Expr\Variable::class)); + $this->assertSame([], $finder->findInstanceOf($stmts, Expr\BinaryOp\Mul::class)); + } + + public function testFindFirst() { + $finder = new NodeFinder; + list($stmts, $vars) = $this->getStmtsAndVars(); + $varFilter = function(Node $node) { + return $node instanceof Expr\Variable; + }; + $this->assertSame($vars[0], $finder->findFirst($stmts, $varFilter)); + $this->assertSame($vars[0], $finder->findFirst($stmts[0], $varFilter)); + + $noneFilter = function () { return false; }; + $this->assertNull($finder->findFirst($stmts, $noneFilter)); + } + + public function testFindFirstInstanceOf() { + $finder = new NodeFinder; + list($stmts, $vars) = $this->getStmtsAndVars(); + $this->assertSame($vars[0], $finder->findFirstInstanceOf($stmts, Expr\Variable::class)); + $this->assertSame($vars[0], $finder->findFirstInstanceOf($stmts[0], Expr\Variable::class)); + $this->assertNull($finder->findFirstInstanceOf($stmts, Expr\BinaryOp\Mul::class)); + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/NodeTraverserTest.php b/vendor/nikic/php-parser/test/PhpParser/NodeTraverserTest.php index 9d27edcb..61c8e25b 100644 --- a/vendor/nikic/php-parser/test/PhpParser/NodeTraverserTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/NodeTraverserTest.php @@ -1,19 +1,21 @@ -getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor = $this->getMockBuilder(NodeVisitor::class)->getMock(); $visitor->expects($this->at(0))->method('beforeTraverse')->with($stmts); $visitor->expects($this->at(1))->method('enterNode')->with($echoNode); @@ -36,13 +38,13 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase $printNode = new Expr\Print_($str1Node); // first visitor changes the node, second verifies the change - $visitor1 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); - $visitor2 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor1 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor2 = $this->getMockBuilder(NodeVisitor::class)->getMock(); // replace empty statements with string1 node - $visitor1->expects($this->at(0))->method('beforeTraverse')->with(array()) - ->will($this->returnValue(array($str1Node))); - $visitor2->expects($this->at(0))->method('beforeTraverse')->with(array($str1Node)); + $visitor1->expects($this->at(0))->method('beforeTraverse')->with([]) + ->will($this->returnValue([$str1Node])); + $visitor2->expects($this->at(0))->method('beforeTraverse')->with([$str1Node]); // replace string1 node with print node $visitor1->expects($this->at(1))->method('enterNode')->with($str1Node) @@ -65,32 +67,32 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase $visitor2->expects($this->at(4))->method('leaveNode')->with($str1Node); // replace string1 node with empty statements again - $visitor1->expects($this->at(5))->method('afterTraverse')->with(array($str1Node)) - ->will($this->returnValue(array())); - $visitor2->expects($this->at(5))->method('afterTraverse')->with(array()); + $visitor1->expects($this->at(5))->method('afterTraverse')->with([$str1Node]) + ->will($this->returnValue([])); + $visitor2->expects($this->at(5))->method('afterTraverse')->with([]); $traverser = new NodeTraverser; $traverser->addVisitor($visitor1); $traverser->addVisitor($visitor2); // as all operations are reversed we end where we start - $this->assertEquals(array(), $traverser->traverse(array())); + $this->assertEquals([], $traverser->traverse([])); } public function testRemove() { $str1Node = new String_('Foo'); $str2Node = new String_('Bar'); - $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor = $this->getMockBuilder(NodeVisitor::class)->getMock(); // remove the string1 node, leave the string2 node $visitor->expects($this->at(2))->method('leaveNode')->with($str1Node) - ->will($this->returnValue(false)); + ->will($this->returnValue(NodeTraverser::REMOVE_NODE)); $traverser = new NodeTraverser; $traverser->addVisitor($visitor); - $this->assertEquals(array($str2Node), $traverser->traverse(array($str1Node, $str2Node))); + $this->assertEquals([$str2Node], $traverser->traverse([$str1Node, $str2Node])); } public function testMerge() { @@ -100,31 +102,30 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase $strR1 = new String_('Replacement 1'); $strR2 = new String_('Replacement 2'); - $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor = $this->getMockBuilder(NodeVisitor::class)->getMock(); // replace strMiddle with strR1 and strR2 by merge $visitor->expects($this->at(4))->method('leaveNode')->with($strMiddle) - ->will($this->returnValue(array($strR1, $strR2))); + ->will($this->returnValue([$strR1, $strR2])); $traverser = new NodeTraverser; $traverser->addVisitor($visitor); $this->assertEquals( - array($strStart, $strR1, $strR2, $strEnd), - $traverser->traverse(array($strStart, $strMiddle, $strEnd)) + [$strStart, $strR1, $strR2, $strEnd], + $traverser->traverse([$strStart, $strMiddle, $strEnd]) ); } - public function testDeepArray() { + /** + * @expectedException \LogicException + * @expectedExceptionMessage Invalid node structure: Contains nested arrays + */ + public function testInvalidDeepArray() { $strNode = new String_('Foo'); - $stmts = array(array(array($strNode))); - - $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); - $visitor->expects($this->at(1))->method('enterNode')->with($strNode); + $stmts = [[[$strNode]]]; $traverser = new NodeTraverser; - $traverser->addVisitor($visitor); - $this->assertEquals($stmts, $traverser->traverse($stmts)); } @@ -134,10 +135,10 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase $varNode = new Expr\Variable('foo'); $mulNode = new Expr\BinaryOp\Mul($varNode, $varNode); $negNode = new Expr\UnaryMinus($mulNode); - $stmts = array($printNode, $negNode); + $stmts = [$printNode, $negNode]; - $visitor1 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); - $visitor2 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor1 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor2 = $this->getMockBuilder(NodeVisitor::class)->getMock(); $visitor1->expects($this->at(1))->method('enterNode')->with($printNode) ->will($this->returnValue(NodeTraverser::DONT_TRAVERSE_CHILDREN)); @@ -175,7 +176,7 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase $stmts = [$mulNode, $printNode]; // From enterNode() with array parent - $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor = $this->getMockBuilder(NodeVisitor::class)->getMock(); $visitor->expects($this->at(1))->method('enterNode')->with($mulNode) ->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL)); $visitor->expects($this->at(2))->method('afterTraverse'); @@ -184,7 +185,7 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase $this->assertEquals($stmts, $traverser->traverse($stmts)); // From enterNode with Node parent - $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor = $this->getMockBuilder(NodeVisitor::class)->getMock(); $visitor->expects($this->at(2))->method('enterNode')->with($varNode1) ->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL)); $visitor->expects($this->at(3))->method('afterTraverse'); @@ -193,7 +194,7 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase $this->assertEquals($stmts, $traverser->traverse($stmts)); // From leaveNode with Node parent - $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor = $this->getMockBuilder(NodeVisitor::class)->getMock(); $visitor->expects($this->at(3))->method('leaveNode')->with($varNode1) ->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL)); $visitor->expects($this->at(4))->method('afterTraverse'); @@ -202,7 +203,7 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase $this->assertEquals($stmts, $traverser->traverse($stmts)); // From leaveNode with array parent - $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor = $this->getMockBuilder(NodeVisitor::class)->getMock(); $visitor->expects($this->at(6))->method('leaveNode')->with($mulNode) ->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL)); $visitor->expects($this->at(7))->method('afterTraverse'); @@ -211,7 +212,7 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase $this->assertEquals($stmts, $traverser->traverse($stmts)); // Check that pending array modifications are still carried out - $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor = $this->getMockBuilder(NodeVisitor::class)->getMock(); $visitor->expects($this->at(6))->method('leaveNode')->with($mulNode) ->will($this->returnValue(NodeTraverser::REMOVE_NODE)); $visitor->expects($this->at(7))->method('enterNode')->with($printNode) @@ -224,26 +225,26 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase } public function testRemovingVisitor() { - $visitor1 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); - $visitor2 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); - $visitor3 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); + $visitor1 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor2 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor3 = $this->getMockBuilder(NodeVisitor::class)->getMock(); $traverser = new NodeTraverser; $traverser->addVisitor($visitor1); $traverser->addVisitor($visitor2); $traverser->addVisitor($visitor3); - $preExpected = array($visitor1, $visitor2, $visitor3); + $preExpected = [$visitor1, $visitor2, $visitor3]; $this->assertAttributeSame($preExpected, 'visitors', $traverser, 'The appropriate visitors have not been added'); $traverser->removeVisitor($visitor2); - $postExpected = array(0 => $visitor1, 2 => $visitor3); + $postExpected = [0 => $visitor1, 2 => $visitor3]; $this->assertAttributeSame($postExpected, 'visitors', $traverser, 'The appropriate visitors are not present after removal'); } public function testNoCloneNodes() { - $stmts = array(new Node\Stmt\Echo_(array(new String_('Foo'), new String_('Bar')))); + $stmts = [new Node\Stmt\Echo_([new String_('Foo'), new String_('Bar')])]; $traverser = new NodeTraverser; @@ -251,17 +252,61 @@ class NodeTraverserTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException \LogicException - * @expectedExceptionMessage leaveNode() may only return an array if the parent structure is an array + * @dataProvider provideTestInvalidReturn */ - public function testReplaceByArrayOnlyAllowedIfParentIsArray() { - $stmts = array(new Node\Expr\UnaryMinus(new Node\Scalar\LNumber(42))); + public function testInvalidReturn($visitor, $message) { + $this->expectException(\LogicException::class); + $this->expectExceptionMessage($message); - $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock(); - $visitor->method('leaveNode')->willReturn(array(new Node\Scalar\DNumber(42.0))); + $stmts = [new Node\Stmt\Expression(new Node\Scalar\LNumber(42))]; $traverser = new NodeTraverser(); $traverser->addVisitor($visitor); $traverser->traverse($stmts); } + + public function provideTestInvalidReturn() { + $visitor1 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor1->expects($this->at(1))->method('enterNode') + ->willReturn('foobar'); + + $visitor2 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor2->expects($this->at(2))->method('enterNode') + ->willReturn('foobar'); + + $visitor3 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor3->expects($this->at(3))->method('leaveNode') + ->willReturn('foobar'); + + $visitor4 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor4->expects($this->at(4))->method('leaveNode') + ->willReturn('foobar'); + + $visitor5 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor5->expects($this->at(3))->method('leaveNode') + ->willReturn([new Node\Scalar\DNumber(42.0)]); + + $visitor6 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor6->expects($this->at(4))->method('leaveNode') + ->willReturn(false); + + $visitor7 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor7->expects($this->at(1))->method('enterNode') + ->willReturn(new Node\Scalar\LNumber(42)); + + $visitor8 = $this->getMockBuilder(NodeVisitor::class)->getMock(); + $visitor8->expects($this->at(2))->method('enterNode') + ->willReturn(new Node\Stmt\Return_()); + + return [ + [$visitor1, 'enterNode() returned invalid value of type string'], + [$visitor2, 'enterNode() returned invalid value of type string'], + [$visitor3, 'leaveNode() returned invalid value of type string'], + [$visitor4, 'leaveNode() returned invalid value of type string'], + [$visitor5, 'leaveNode() may only return an array if the parent structure is an array'], + [$visitor6, 'bool(false) return from leaveNode() no longer supported. Return NodeTraverser::REMOVE_NODE instead'], + [$visitor7, 'Trying to replace statement (Stmt_Expression) with expression (Scalar_LNumber). Are you missing a Stmt_Expression wrapper?'], + [$visitor8, 'Trying to replace expression (Scalar_LNumber) with statement (Stmt_Return)'], + ]; + } } diff --git a/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/FindingVisitorTest.php b/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/FindingVisitorTest.php new file mode 100644 index 00000000..2e87600b --- /dev/null +++ b/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/FindingVisitorTest.php @@ -0,0 +1,54 @@ +addVisitor($visitor); + + $assign = new Expr\Assign(new Expr\Variable('a'), new Expr\BinaryOp\Concat( + new Expr\Variable('b'), new Expr\Variable('c') + )); + $stmts = [new Node\Stmt\Expression($assign)]; + + $traverser->traverse($stmts); + $this->assertSame([ + $assign->var, + $assign->expr->left, + $assign->expr->right, + ], $visitor->getFoundNodes()); + } + + public function testFindAll() { + $traverser = new NodeTraverser(); + $visitor = new FindingVisitor(function(Node $node) { + return true; // All nodes + }); + $traverser->addVisitor($visitor); + + $assign = new Expr\Assign(new Expr\Variable('a'), new Expr\BinaryOp\Concat( + new Expr\Variable('b'), new Expr\Variable('c') + )); + $stmts = [new Node\Stmt\Expression($assign)]; + + $traverser->traverse($stmts); + $this->assertSame([ + $stmts[0], + $assign, + $assign->var, + $assign->expr, + $assign->expr->left, + $assign->expr->right, + ], $visitor->getFoundNodes()); + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/FirstFindingVisitorTest.php b/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/FirstFindingVisitorTest.php new file mode 100644 index 00000000..78bc1c7a --- /dev/null +++ b/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/FirstFindingVisitorTest.php @@ -0,0 +1,39 @@ +addVisitor($visitor); + + $assign = new Expr\Assign(new Expr\Variable('a'), new Expr\Variable('b')); + $stmts = [new Node\Stmt\Expression($assign)]; + + $traverser->traverse($stmts); + $this->assertSame($assign->var, $visitor->getFoundNode()); + } + + public function testFindNone() { + $traverser = new NodeTraverser(); + $visitor = new FirstFindingVisitor(function(Node $node) { + return $node instanceof Node\Expr\BinaryOp; + }); + $traverser->addVisitor($visitor); + + $assign = new Expr\Assign(new Expr\Variable('a'), new Expr\Variable('b')); + $stmts = [new Node\Stmt\Expression($assign)]; + + $traverser->traverse($stmts); + $this->assertNull($visitor->getFoundNode()); + } +} diff --git a/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/NameResolverTest.php b/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/NameResolverTest.php index 03133745..1ffd15aa 100644 --- a/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/NameResolverTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/NodeVisitor/NameResolverTest.php @@ -1,4 +1,4 @@ -addVisitor(new NameResolver); @@ -288,16 +289,16 @@ EOC; } public function testAddDeclarationNamespacedName() { - $nsStmts = array( + $nsStmts = [ new Stmt\Class_('A'), new Stmt\Interface_('B'), new Stmt\Function_('C'), - new Stmt\Const_(array( + new Stmt\Const_([ new Node\Const_('D', new Node\Scalar\LNumber(42)) - )), + ]), new Stmt\Trait_('E'), new Expr\New_(new Stmt\Class_(null)), - ); + ]; $traverser = new PhpParser\NodeTraverser; $traverser->addVisitor(new NameResolver); @@ -320,21 +321,21 @@ EOC; } public function testAddRuntimeResolvedNamespacedName() { - $stmts = array( - new Stmt\Namespace_(new Name('NS'), array( + $stmts = [ + new Stmt\Namespace_(new Name('NS'), [ new Expr\FuncCall(new Name('foo')), new Expr\ConstFetch(new Name('FOO')), - )), - new Stmt\Namespace_(null, array( + ]), + new Stmt\Namespace_(null, [ new Expr\FuncCall(new Name('foo')), new Expr\ConstFetch(new Name('FOO')), - )), - ); + ]), + ]; $traverser = new PhpParser\NodeTraverser; $traverser->addVisitor(new NameResolver); $stmts = $traverser->traverse($stmts); - + $this->assertSame('NS\\foo', (string) $stmts[0]->stmts[0]->name->getAttribute('namespacedName')); $this->assertSame('NS\\FOO', (string) $stmts[0]->stmts[1]->name->getAttribute('namespacedName')); @@ -346,53 +347,54 @@ EOC; * @dataProvider provideTestError */ public function testError(Node $stmt, $errorMsg) { - $this->setExpectedException('PhpParser\Error', $errorMsg); + $this->expectException(\PhpParser\Error::class); + $this->expectExceptionMessage($errorMsg); $traverser = new PhpParser\NodeTraverser; $traverser->addVisitor(new NameResolver); - $traverser->traverse(array($stmt)); + $traverser->traverse([$stmt]); } public function provideTestError() { - return array( - array( - new Stmt\Use_(array( - new Stmt\UseUse(new Name('A\B'), 'B', 0, array('startLine' => 1)), - new Stmt\UseUse(new Name('C\D'), 'B', 0, array('startLine' => 2)), - ), Stmt\Use_::TYPE_NORMAL), + return [ + [ + new Stmt\Use_([ + new Stmt\UseUse(new Name('A\B'), 'B', 0, ['startLine' => 1]), + new Stmt\UseUse(new Name('C\D'), 'B', 0, ['startLine' => 2]), + ], Stmt\Use_::TYPE_NORMAL), 'Cannot use C\D as B because the name is already in use on line 2' - ), - array( - new Stmt\Use_(array( - new Stmt\UseUse(new Name('a\b'), 'b', 0, array('startLine' => 1)), - new Stmt\UseUse(new Name('c\d'), 'B', 0, array('startLine' => 2)), - ), Stmt\Use_::TYPE_FUNCTION), + ], + [ + new Stmt\Use_([ + new Stmt\UseUse(new Name('a\b'), 'b', 0, ['startLine' => 1]), + new Stmt\UseUse(new Name('c\d'), 'B', 0, ['startLine' => 2]), + ], Stmt\Use_::TYPE_FUNCTION), 'Cannot use function c\d as B because the name is already in use on line 2' - ), - array( - new Stmt\Use_(array( - new Stmt\UseUse(new Name('A\B'), 'B', 0, array('startLine' => 1)), - new Stmt\UseUse(new Name('C\D'), 'B', 0, array('startLine' => 2)), - ), Stmt\Use_::TYPE_CONSTANT), + ], + [ + new Stmt\Use_([ + new Stmt\UseUse(new Name('A\B'), 'B', 0, ['startLine' => 1]), + new Stmt\UseUse(new Name('C\D'), 'B', 0, ['startLine' => 2]), + ], Stmt\Use_::TYPE_CONSTANT), 'Cannot use const C\D as B because the name is already in use on line 2' - ), - array( - new Expr\New_(new Name\FullyQualified('self', array('startLine' => 3))), + ], + [ + new Expr\New_(new Name\FullyQualified('self', ['startLine' => 3])), "'\\self' is an invalid class name on line 3" - ), - array( - new Expr\New_(new Name\Relative('self', array('startLine' => 3))), + ], + [ + new Expr\New_(new Name\Relative('self', ['startLine' => 3])), "'\\self' is an invalid class name on line 3" - ), - array( - new Expr\New_(new Name\FullyQualified('PARENT', array('startLine' => 3))), + ], + [ + new Expr\New_(new Name\FullyQualified('PARENT', ['startLine' => 3])), "'\\PARENT' is an invalid class name on line 3" - ), - array( - new Expr\New_(new Name\Relative('STATIC', array('startLine' => 3))), + ], + [ + new Expr\New_(new Name\Relative('STATIC', ['startLine' => 3])), "'\\STATIC' is an invalid class name on line 3" - ), - ); + ], + ]; } public function testClassNameIsCaseInsensitive() @@ -413,7 +415,8 @@ EOC; $stmts = $traverser->traverse($stmts); $stmt = $stmts[0]; - $this->assertSame(array('Bar', 'Baz'), $stmt->stmts[1]->expr->class->parts); + $assign = $stmt->stmts[1]->expr; + $this->assertSame(['Bar', 'Baz'], $assign->expr->class->parts); } public function testSpecialClassNamesAreCaseInsensitive() { @@ -442,9 +445,9 @@ EOC; $classStmt = $stmts[0]; $methodStmt = $classStmt->stmts[0]->stmts[0]; - $this->assertSame('SELF', (string)$methodStmt->stmts[0]->class); - $this->assertSame('PARENT', (string)$methodStmt->stmts[1]->class); - $this->assertSame('STATIC', (string)$methodStmt->stmts[2]->class); + $this->assertSame('SELF', (string) $methodStmt->stmts[0]->expr->class); + $this->assertSame('PARENT', (string) $methodStmt->stmts[1]->expr->class); + $this->assertSame('STATIC', (string) $methodStmt->stmts[2]->expr->class); } public function testAddOriginalNames() { @@ -465,4 +468,26 @@ EOC; $this->assertSame($n1, $stmts[0]->stmts[0]->class->getAttribute('originalName')); $this->assertSame($n2, $stmts[0]->stmts[1]->name->getAttribute('originalName')); } + + public function testAttributeOnlyMode() { + $traverser = new PhpParser\NodeTraverser; + $traverser->addVisitor(new NameResolver(null, ['replaceNodes' => false])); + + $n1 = new Name('Bar'); + $n2 = new Name('bar'); + $origStmts = [ + new Stmt\Namespace_(new Name('Foo'), [ + new Expr\ClassConstFetch($n1, 'FOO'), + new Expr\FuncCall($n2), + ]) + ]; + + $traverser->traverse($origStmts); + + $this->assertEquals( + new Name\FullyQualified('Foo\Bar'), $n1->getAttribute('resolvedName')); + $this->assertFalse($n2->hasAttribute('resolvedName')); + $this->assertEquals( + new Name\FullyQualified('Foo\bar'), $n2->getAttribute('namespacedName')); + } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php b/vendor/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php index 01d3b604..f7decb76 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php @@ -1,4 +1,4 @@ -getPrefer5(), [ - new Expr\Variable( + new Stmt\Expression(new Expr\Variable( new Expr\ArrayDimFetch(new Expr\Variable('a'), LNumber::fromString('0')) - ) + )) ] ], [ @@ -69,26 +70,27 @@ class MultipleTest extends ParserTest { 'getPrefer7(), [ - new Expr\ArrayDimFetch( + new Stmt\Expression(new Expr\ArrayDimFetch( new Expr\Variable(new Expr\Variable('a')), LNumber::fromString('0') - ) + )) ] ], ]; } public function testThrownError() { - $this->setExpectedException('PhpParser\Error', 'FAIL A'); + $this->expectException(Error::class); + $this->expectExceptionMessage('FAIL A'); - $parserA = $this->getMockBuilder('PhpParser\Parser')->getMock(); + $parserA = $this->getMockBuilder(\PhpParser\Parser::class)->getMock(); $parserA->expects($this->at(0)) ->method('parse')->will($this->throwException(new Error('FAIL A'))); - $parserB = $this->getMockBuilder('PhpParser\Parser')->getMock(); + $parserB = $this->getMockBuilder(\PhpParser\Parser::class)->getMock(); $parserB->expects($this->at(0)) ->method('parse')->will($this->throwException(new Error('FAIL B'))); $parser = new Multiple([$parserA, $parserB]); $parser->parse('dummy'); } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/test/PhpParser/Parser/Php5Test.php b/vendor/nikic/php-parser/test/PhpParser/Parser/Php5Test.php index 58c4e617..bb36a251 100644 --- a/vendor/nikic/php-parser/test/PhpParser/Parser/Php5Test.php +++ b/vendor/nikic/php-parser/test/PhpParser/Parser/Php5Test.php @@ -1,4 +1,4 @@ -assertInstanceOf($expected, (new ParserFactory)->create($kind, $lexer)); @@ -15,20 +18,20 @@ class ParserFactoryTest extends \PHPUnit_Framework_TestCase { return [ [ ParserFactory::PREFER_PHP7, $lexer, - 'PhpParser\Parser\Multiple' + Parser\Multiple::class ], [ ParserFactory::PREFER_PHP5, null, - 'PhpParser\Parser\Multiple' + Parser\Multiple::class ], [ ParserFactory::ONLY_PHP7, null, - 'PhpParser\Parser\Php7' + Parser\Php7::class ], [ ParserFactory::ONLY_PHP5, $lexer, - 'PhpParser\Parser\Php5' + Parser\Php5::class ] ]; } -} \ No newline at end of file +} diff --git a/vendor/nikic/php-parser/test/PhpParser/ParserTest.php b/vendor/nikic/php-parser/test/PhpParser/ParserTest.php index 0dabba21..9c4412dc 100644 --- a/vendor/nikic/php-parser/test/PhpParser/ParserTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/ParserTest.php @@ -1,13 +1,14 @@ - array( + $lexer = new Lexer([ + 'usedAttributes' => [ 'comments', 'startLine', 'endLine', 'startTokenPos', 'endTokenPos', - ) - )); + ] + ]); $code = <<<'EOC' getParser($lexer); $stmts = $parser->parse($code); - /** @var \PhpParser\Node\Stmt\Function_ $fn */ + /** @var Stmt\Function_ $fn */ $fn = $stmts[0]; - $this->assertInstanceOf('PhpParser\Node\Stmt\Function_', $fn); - $this->assertEquals(array( - 'comments' => array( - new Comment\Doc('/** Doc comment */', 2, 6), - ), + $this->assertInstanceOf(Stmt\Function_::class, $fn); + $this->assertEquals([ + 'comments' => [ + new Comment\Doc('/** Doc comment */', 2, 6, 1), + ], 'startLine' => 3, 'endLine' => 7, 'startTokenPos' => 3, 'endTokenPos' => 21, - ), $fn->getAttributes()); + ], $fn->getAttributes()); $param = $fn->params[0]; - $this->assertInstanceOf('PhpParser\Node\Param', $param); - $this->assertEquals(array( + $this->assertInstanceOf(Node\Param::class, $param); + $this->assertEquals([ 'startLine' => 3, 'endLine' => 3, 'startTokenPos' => 7, 'endTokenPos' => 7, - ), $param->getAttributes()); + ], $param->getAttributes()); - /** @var \PhpParser\Node\Stmt\Echo_ $echo */ + /** @var Stmt\Echo_ $echo */ $echo = $fn->stmts[0]; - $this->assertInstanceOf('PhpParser\Node\Stmt\Echo_', $echo); - $this->assertEquals(array( - 'comments' => array( - new Comment("// Line\n", 4, 49), - new Comment("// Comments\n", 5, 61), - ), + $this->assertInstanceOf(Stmt\Echo_::class, $echo); + $this->assertEquals([ + 'comments' => [ + new Comment("// Line\n", 4, 49, 12), + new Comment("// Comments\n", 5, 61, 14), + ], 'startLine' => 6, 'endLine' => 6, 'startTokenPos' => 16, 'endTokenPos' => 19, - ), $echo->getAttributes()); + ], $echo->getAttributes()); /** @var \PhpParser\Node\Expr\Variable $var */ $var = $echo->exprs[0]; - $this->assertInstanceOf('PhpParser\Node\Expr\Variable', $var); - $this->assertEquals(array( + $this->assertInstanceOf(Expr\Variable::class, $var); + $this->assertEquals([ 'startLine' => 6, 'endLine' => 6, 'startTokenPos' => 18, 'endTokenPos' => 18, - ), $var->getAttributes()); + ], $var->getAttributes()); } /** @@ -124,60 +125,60 @@ EOC; public function testExtraAttributes($code, $expectedAttributes) { $parser = $this->getParser(new Lexer); $stmts = $parser->parse("getAttributes(); + $node = $stmts[0] instanceof Stmt\Expression ? $stmts[0]->expr : $stmts[0]; + $attributes = $node->getAttributes(); foreach ($expectedAttributes as $name => $value) { $this->assertSame($value, $attributes[$name]); } } public function provideTestExtraAttributes() { - return array( - array('0', ['kind' => Scalar\LNumber::KIND_DEC]), - array('9', ['kind' => Scalar\LNumber::KIND_DEC]), - array('07', ['kind' => Scalar\LNumber::KIND_OCT]), - array('0xf', ['kind' => Scalar\LNumber::KIND_HEX]), - array('0XF', ['kind' => Scalar\LNumber::KIND_HEX]), - array('0b1', ['kind' => Scalar\LNumber::KIND_BIN]), - array('0B1', ['kind' => Scalar\LNumber::KIND_BIN]), - array('[]', ['kind' => Expr\Array_::KIND_SHORT]), - array('array()', ['kind' => Expr\Array_::KIND_LONG]), - array("'foo'", ['kind' => String_::KIND_SINGLE_QUOTED]), - array("b'foo'", ['kind' => String_::KIND_SINGLE_QUOTED]), - array("B'foo'", ['kind' => String_::KIND_SINGLE_QUOTED]), - array('"foo"', ['kind' => String_::KIND_DOUBLE_QUOTED]), - array('b"foo"', ['kind' => String_::KIND_DOUBLE_QUOTED]), - array('B"foo"', ['kind' => String_::KIND_DOUBLE_QUOTED]), - array('"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]), - array('b"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]), - array('B"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]), - array("<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']), - array("<< String_::KIND_HEREDOC, 'docLabel' => 'STR']), - array("<<<\"STR\"\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']), - array("b<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']), - array("B<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']), - array("<<< \t 'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']), - // HHVM doesn't support this due to a lexer bug - // (https://github.com/facebook/hhvm/issues/6970) - // array("<<<'\xff'\n\xff\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => "\xff"]), - array("<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']), - array("b<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']), - array("B<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']), - array("<<< \t \"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']), - array("die", ['kind' => Expr\Exit_::KIND_DIE]), - array("die('done')", ['kind' => Expr\Exit_::KIND_DIE]), - array("exit", ['kind' => Expr\Exit_::KIND_EXIT]), - array("exit(1)", ['kind' => Expr\Exit_::KIND_EXIT]), - array("?>Foo", ['hasLeadingNewline' => false]), - array("?>\nFoo", ['hasLeadingNewline' => true]), - array("namespace Foo;", ['kind' => Node\Stmt\Namespace_::KIND_SEMICOLON]), - array("namespace Foo {}", ['kind' => Node\Stmt\Namespace_::KIND_BRACED]), - array("namespace {}", ['kind' => Node\Stmt\Namespace_::KIND_BRACED]), - ); + return [ + ['0', ['kind' => Scalar\LNumber::KIND_DEC]], + ['9', ['kind' => Scalar\LNumber::KIND_DEC]], + ['07', ['kind' => Scalar\LNumber::KIND_OCT]], + ['0xf', ['kind' => Scalar\LNumber::KIND_HEX]], + ['0XF', ['kind' => Scalar\LNumber::KIND_HEX]], + ['0b1', ['kind' => Scalar\LNumber::KIND_BIN]], + ['0B1', ['kind' => Scalar\LNumber::KIND_BIN]], + ['[]', ['kind' => Expr\Array_::KIND_SHORT]], + ['array()', ['kind' => Expr\Array_::KIND_LONG]], + ["'foo'", ['kind' => String_::KIND_SINGLE_QUOTED]], + ["b'foo'", ['kind' => String_::KIND_SINGLE_QUOTED]], + ["B'foo'", ['kind' => String_::KIND_SINGLE_QUOTED]], + ['"foo"', ['kind' => String_::KIND_DOUBLE_QUOTED]], + ['b"foo"', ['kind' => String_::KIND_DOUBLE_QUOTED]], + ['B"foo"', ['kind' => String_::KIND_DOUBLE_QUOTED]], + ['"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]], + ['b"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]], + ['B"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]], + ["<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']], + ["<< String_::KIND_HEREDOC, 'docLabel' => 'STR']], + ["<<<\"STR\"\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']], + ["b<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']], + ["B<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']], + ["<<< \t 'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']], + ["<<<'\xff'\n\xff\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => "\xff"]], + ["<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']], + ["b<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']], + ["B<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']], + ["<<< \t \"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']], + ["die", ['kind' => Expr\Exit_::KIND_DIE]], + ["die('done')", ['kind' => Expr\Exit_::KIND_DIE]], + ["exit", ['kind' => Expr\Exit_::KIND_EXIT]], + ["exit(1)", ['kind' => Expr\Exit_::KIND_EXIT]], + ["?>Foo", ['hasLeadingNewline' => false]], + ["?>\nFoo", ['hasLeadingNewline' => true]], + ["namespace Foo;", ['kind' => Stmt\Namespace_::KIND_SEMICOLON]], + ["namespace Foo {}", ['kind' => Stmt\Namespace_::KIND_BRACED]], + ["namespace {}", ['kind' => Stmt\Namespace_::KIND_BRACED]], + ]; } } -class InvalidTokenLexer extends Lexer { - public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) { +class InvalidTokenLexer extends Lexer +{ + public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) : int { $value = 'foobar'; return 999; } diff --git a/vendor/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php b/vendor/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php index 908c18b2..b1555719 100644 --- a/vendor/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php +++ b/vendor/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php @@ -1,8 +1,7 @@ -assertSame($expected, $output5, $name); $this->assertNotSame($expected, $output7, $name); - } else if ('php7' === $version) { + } elseif ('php7' === $version) { $this->assertSame($expected, $output7, $name); $this->assertNotSame($expected, $output5, $name); } else { @@ -57,7 +56,7 @@ class PrettyPrinterTest extends CodeTestAbstract /** * @dataProvider provideTestPrettyPrint - * @covers PhpParser\PrettyPrinter\Standard + * @covers \PhpParser\PrettyPrinter\Standard */ public function testPrettyPrint($name, $code, $expected, $mode) { $this->doTestPrettyPrintMethod('prettyPrint', $name, $code, $expected, $mode); @@ -65,7 +64,7 @@ class PrettyPrinterTest extends CodeTestAbstract /** * @dataProvider provideTestPrettyPrintFile - * @covers PhpParser\PrettyPrinter\Standard + * @covers \PhpParser\PrettyPrinter\Standard */ public function testPrettyPrintFile($name, $code, $expected, $mode) { $this->doTestPrettyPrintMethod('prettyPrintFile', $name, $code, $expected, $mode); @@ -87,9 +86,9 @@ class PrettyPrinterTest extends CodeTestAbstract ); $this->assertEquals('($a + $b) * $c', $prettyPrinter->prettyPrintExpr($expr)); - $expr = new Expr\Closure(array( - 'stmts' => array(new Stmt\Return_(new String_("a\nb"))) - )); + $expr = new Expr\Closure([ + 'stmts' => [new Stmt\Return_(new String_("a\nb"))] + ]); $this->assertEquals("function () {\n return 'a\nb';\n}", $prettyPrinter->prettyPrintExpr($expr)); } @@ -102,8 +101,8 @@ class PrettyPrinterTest extends CodeTestAbstract } private function parseModeLine($modeLine) { - $parts = explode(' ', $modeLine, 2); - $version = isset($parts[0]) ? $parts[0] : 'both'; + $parts = explode(' ', (string) $modeLine, 2); + $version = $parts[0] ?? 'both'; $options = isset($parts[1]) ? json_decode($parts[1], true) : []; return [$version, $options]; } @@ -190,7 +189,9 @@ class PrettyPrinterTest extends CodeTestAbstract * @expectedExceptionMessage Cannot pretty-print AST with Error nodes */ public function testPrettyPrintWithError() { - $stmts = [new Expr\PropertyFetch(new Expr\Variable('a'), new Expr\Error())]; + $stmts = [new Stmt\Expression( + new Expr\PropertyFetch(new Expr\Variable('a'), new Expr\Error()) + )]; $prettyPrinter = new PrettyPrinter\Standard; $prettyPrinter->prettyPrint($stmts); } @@ -200,8 +201,115 @@ class PrettyPrinterTest extends CodeTestAbstract * @expectedExceptionMessage Cannot pretty-print AST with Error nodes */ public function testPrettyPrintWithErrorInClassConstFetch() { - $stmts = [new Expr\ClassConstFetch(new Name('Foo'), new Expr\Error())]; + $stmts = [new Stmt\Expression( + new Expr\ClassConstFetch(new Name('Foo'), new Expr\Error()) + )]; $prettyPrinter = new PrettyPrinter\Standard; $prettyPrinter->prettyPrint($stmts); } + + /** + * @expectedException \LogicException + * @expectedExceptionMessage Cannot directly print EncapsedStringPart + */ + public function testPrettyPrintEncapsedStringPart() { + $expr = new Node\Scalar\EncapsedStringPart('foo'); + $prettyPrinter = new PrettyPrinter\Standard; + $prettyPrinter->prettyPrintExpr($expr); + } + + /** + * @dataProvider provideTestFormatPreservingPrint + * @covers \PhpParser\PrettyPrinter\Standard + */ + public function testFormatPreservingPrint($name, $code, $modification, $expected, $modeLine) { + $lexer = new Lexer\Emulative([ + 'usedAttributes' => [ + 'comments', + 'startLine', 'endLine', + 'startTokenPos', 'endTokenPos', + ], + ]); + + $parser = new Parser\Php7($lexer); + $traverser = new NodeTraverser(); + $traverser->addVisitor(new NodeVisitor\CloningVisitor()); + + $printer = new PrettyPrinter\Standard(); + + $oldStmts = $parser->parse($code); + $oldTokens = $lexer->getTokens(); + + $newStmts = $traverser->traverse($oldStmts); + + /** @var callable $fn */ + eval(<<printFormatPreserving($newStmts, $oldStmts, $oldTokens); + $this->assertSame(canonicalize($expected), canonicalize($newCode), $name); + } + + public function provideTestFormatPreservingPrint() { + return $this->getTests(__DIR__ . '/../code/formatPreservation', 'test', 3); + } + + /** + * @dataProvider provideTestRoundTripPrint + * @covers \PhpParser\PrettyPrinter\Standard + */ + public function testRoundTripPrint($name, $code, $expected, $modeLine) { + /** + * This test makes sure that the format-preserving pretty printer round-trips for all + * the pretty printer tests (i.e. returns the input if no changes occurred). + */ + + list($version) = $this->parseModeLine($modeLine); + + $lexer = new Lexer\Emulative([ + 'usedAttributes' => [ + 'comments', + 'startLine', 'endLine', + 'startTokenPos', 'endTokenPos', + ], + ]); + + $parserClass = $version === 'php5' ? Parser\Php5::class : Parser\Php7::class; + /** @var Parser $parser */ + $parser = new $parserClass($lexer); + + $traverser = new NodeTraverser(); + $traverser->addVisitor(new NodeVisitor\CloningVisitor()); + + $printer = new PrettyPrinter\Standard(); + + try { + $oldStmts = $parser->parse($code); + } catch (Error $e) { + // Can't do a format-preserving print on a file with errors + return; + } + + $oldTokens = $lexer->getTokens(); + + $newStmts = $traverser->traverse($oldStmts); + + $newCode = $printer->printFormatPreserving($newStmts, $oldStmts, $oldTokens); + $this->assertSame(canonicalize($code), canonicalize($newCode), $name); + } + + public function provideTestRoundTripPrint() { + return array_merge( + $this->getTests(__DIR__ . '/../code/prettyPrinter', 'test'), + $this->getTests(__DIR__ . '/../code/parser', 'test') + ); + } } diff --git a/vendor/nikic/php-parser/test/PhpParser/Serializer/XMLTest.php b/vendor/nikic/php-parser/test/PhpParser/Serializer/XMLTest.php deleted file mode 100644 index e1186f4d..00000000 --- a/vendor/nikic/php-parser/test/PhpParser/Serializer/XMLTest.php +++ /dev/null @@ -1,172 +0,0 @@ - - */ - public function testSerialize() { - $code = << - - - - - 4 - - - - // comment - - /** doc comment */ - - - - 6 - - - - - - functionName - - - - - - 4 - - - 4 - - - - - - - - - - - - a - - - - - 4 - - - 4 - - - 10 - - - 0 - - - - - - - 4 - - - 4 - - - - - - - - - - - - b - - - - - 4 - - - 4 - - - 1 - - - - - - - - - - - - - - 5 - - - 5 - - - - - - 5 - - - 5 - - - 1 - - - Foo - - - - - - - - - - -XML; - - $parser = new PhpParser\Parser\Php7(new PhpParser\Lexer); - $serializer = new XML; - - $code = str_replace("\r\n", "\n", $code); - $stmts = $parser->parse($code); - $this->assertXmlStringEqualsXmlString($xml, $serializer->serialize($stmts)); - } - - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Unexpected node type - */ - public function testError() { - $serializer = new XML; - $serializer->serialize(array(new \stdClass)); - } -} diff --git a/vendor/nikic/php-parser/test/PhpParser/Unserializer/XMLTest.php b/vendor/nikic/php-parser/test/PhpParser/Unserializer/XMLTest.php deleted file mode 100644 index 3bc86dbe..00000000 --- a/vendor/nikic/php-parser/test/PhpParser/Unserializer/XMLTest.php +++ /dev/null @@ -1,150 +0,0 @@ - - - - - 1 - - - - // comment - - /** doc comment */ - - - - Test - - - -XML; - - $unserializer = new XML; - $this->assertEquals( - new Scalar\String_('Test', array( - 'startLine' => 1, - 'comments' => array( - new Comment('// comment' . "\n", 2), - new Comment\Doc('/** doc comment */', 3), - ), - )), - $unserializer->unserialize($xml) - ); - } - - public function testEmptyNode() { - $xml = << - - - -XML; - - $unserializer = new XML; - - $this->assertEquals( - new Scalar\MagicConst\Class_, - $unserializer->unserialize($xml) - ); - } - - public function testScalars() { - $xml = << - - - - - test - - - 1 - 1 - 1.5 - - - - - -XML; - $result = array( - array(), array(), - 'test', '', '', - 1, - 1, 1.5, - true, false, null - ); - - $unserializer = new XML; - $this->assertEquals($result, $unserializer->unserialize($xml)); - } - - /** - * @expectedException \DomainException - * @expectedExceptionMessage AST root element not found - */ - public function testWrongRootElementError() { - $xml = << - -XML; - - $unserializer = new XML; - $unserializer->unserialize($xml); - } - - /** - * @dataProvider provideTestErrors - */ - public function testErrors($xml, $errorMsg) { - $this->setExpectedException('DomainException', $errorMsg); - - $xml = << - - $xml - -XML; - - $unserializer = new XML; - $unserializer->unserialize($xml); - } - - public function provideTestErrors() { - return array( - array('test', '"true" scalar must be empty'), - array('test', '"false" scalar must be empty'), - array('test', '"null" scalar must be empty'), - array('bar', 'Unknown scalar type "foo"'), - array('x', '"x" is not a valid int'), - array('x', '"x" is not a valid float'), - array('', 'Expected node or scalar'), - array('test', 'Unexpected node of type "foo:bar"'), - array( - 'test', - 'Expected sub node or attribute, got node of type "foo:bar"' - ), - array( - '', - 'Expected node or scalar' - ), - array( - '', - 'Unknown node type "Foo"' - ), - ); - } -} diff --git a/vendor/nikic/php-parser/test/bootstrap.php b/vendor/nikic/php-parser/test/bootstrap.php index 9526b648..0bfa9d0a 100644 --- a/vendor/nikic/php-parser/test/bootstrap.php +++ b/vendor/nikic/php-parser/test/bootstrap.php @@ -18,3 +18,14 @@ function canonicalize($str) { }, $lines); return implode("\n", $lines); } + +function filesInDir($directory, $fileExtension) { + $directory = realpath($directory); + $it = new \RecursiveDirectoryIterator($directory); + $it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::LEAVES_ONLY); + $it = new \RegexIterator($it, '(\.' . preg_quote($fileExtension) . '$)'); + foreach ($it as $file) { + $fileName = $file->getPathname(); + yield $fileName => file_get_contents($fileName); + } +} diff --git a/vendor/nikic/php-parser/test/code/formatPreservation/anonClasses.test b/vendor/nikic/php-parser/test/code/formatPreservation/anonClasses.test new file mode 100644 index 00000000..7551059f --- /dev/null +++ b/vendor/nikic/php-parser/test/code/formatPreservation/anonClasses.test @@ -0,0 +1,16 @@ +Anonymous classes +----- +expr; +$new->class->extends = null; +$new->args[] = new Expr\Variable('y'); +----- +exprs[0]->left->right->value = 42; +----- +name = new Node\Identifier('bar'); +----- +byRef = true; +----- +byRef = true; +----- +stmts[0]; +$stmts[0]->stmts[0] = $stmts[1]; +$stmts[1] = $tmp; +----- +stmts[0]; +$stmts[1]->stmts[0] = $stmts[2]; +$stmts[2] = $tmp; +// Same test, but also removing first statement, triggering fallback +array_splice($stmts, 0, 1, []); +----- +exprs[0] = new Expr\ConstFetch(new Node\Name('C')); +----- +exprs[0]->parts[0] = new Expr\Variable('bar'); +$stmts[1]->exprs[0]->parts[0] = new Expr\Variable('bar'); +----- +stmts[] = new Stmt\Expression(new Expr\Variable('c')); +----- +stmts[] = new Stmt\Expression(new Expr\Variable('c')); +----- +setAttribute('comments', []); +----- +getComments(); +$comments[] = new Comment("// foo"); +$stmts[1]->setAttribute('comments', $comments); +----- +stmts[0]; +$method->setAttribute('comments', [new Comment\Doc("/**\n *\n */")]); +----- +expr->left = new Expr\BinaryOp\Plus(new Expr\Variable('a'), new Expr\Variable('b')); +// The parens here are "correct", because add is left assoc +$stmts[1]->expr->right = new Expr\BinaryOp\Plus(new Expr\Variable('b'), new Expr\Variable('c')); +// No parens necessary +$stmts[2]->expr->left = new Expr\BinaryOp\Plus(new Expr\Variable('a'), new Expr\Variable('b')); +// Parens for RHS not strictly necessary due to assign speciality +$stmts[3]->expr->cond = new Expr\Assign(new Expr\Variable('a'), new Expr\Variable('b')); +$stmts[3]->expr->if = new Expr\Assign(new Expr\Variable('a'), new Expr\Variable('b')); +$stmts[3]->expr->else = new Expr\Assign(new Expr\Variable('a'), new Expr\Variable('b')); +// Already has parens +$stmts[4]->expr->left = new Expr\BinaryOp\Plus(new Expr\Variable('a'), new Expr\Variable('b')); +$stmts[5]->expr->left = new Expr\BinaryOp\Plus(new Expr\Variable('a'), new Expr\Variable('b')); +----- + bar; +$foo -> bar; +$foo -> bar; +$foo -> bar; +$foo -> bar; +self :: $foo; +self :: $foo; +----- +$stmts[0]->expr->name = new Expr\Variable('a'); +$stmts[1]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b')); +$stmts[2]->expr->var = new Expr\Variable('bar'); +$stmts[3]->expr->var = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b')); +$stmts[4]->expr->name = new Node\Identifier('foo'); +// In this case the braces are not strictly necessary. However, on PHP 5 they may be required +// depending on where the property fetch node itself occurs. +$stmts[5]->expr->name = new Expr\Variable('bar'); +$stmts[6]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b')); +$stmts[7]->expr->name = new Node\VarLikeIdentifier('bar'); +$stmts[8]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b')); +----- + bar; +($a . $b) -> bar; +$foo -> foo; +$foo -> {$bar}; +$foo -> {$a . $b}; +self :: $bar; +self :: ${$a . $b}; \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/formatPreservation/inlineHtml.test b/vendor/nikic/php-parser/test/code/formatPreservation/inlineHtml.test new file mode 100644 index 00000000..7494e535 --- /dev/null +++ b/vendor/nikic/php-parser/test/code/formatPreservation/inlineHtml.test @@ -0,0 +1,54 @@ +Handling of inline HTML +----- +FoosetAttribute('origNode', null); +----- +FooBarstmts[2] = $stmts[0]->stmts[1]; +----- +BarBarstmts[1] = $stmts[0]->stmts[2]; +----- +returnType = new Node\Name('Foo'); +$stmts[0]->params[0]->type = new Node\Identifier('int'); +$stmts[0]->params[1]->type = new Node\Identifier('array'); +$stmts[0]->params[1]->default = new Expr\ConstFetch(new Node\Name('null')); +$stmts[1]->expr->dim = new Expr\Variable('a'); +$stmts[2]->expr->items[0]->key = new Scalar\String_('X'); +$stmts[3]->expr->returnType = new Node\Name('Bar'); +$stmts[4]->expr->if = new Expr\Variable('z'); +$stmts[5]->expr->key = new Expr\Variable('k'); +$stmts[6]->expr->value = new Expr\Variable('v'); +$stmts[7]->num = new Scalar\LNumber(2); +$stmts[8]->num = new Scalar\LNumber(2); +$stmts[9]->expr = new Expr\Variable('x'); +$stmts[10]->extends = new Node\Name\FullyQualified('Bar'); +$stmts[10]->stmts[0]->returnType = new Node\Name('Y'); +$stmts[10]->stmts[1]->props[0]->default = new Scalar\DNumber(42.0); +$stmts[11]->keyVar = new Expr\Variable('z'); +$stmts[12]->vars[0]->default = new Scalar\String_('abc'); +$stmts[13]->finally = new Stmt\Finally_([]); +$stmts[14]->else = new Stmt\Else_([]); +----- + $value +]; + +function +() : Bar +{}; + +$x +? $z +: +$y; + +yield +$k => $v ; +yield $v ; + +break 2 +; +continue 2 +; +return $x +; + +class +X extends \Bar +{ + public + function y() : Y + {} + + private + $x = 42.0 + ; +} + +foreach ( + $x + as + $z => $y +) {} + +static +$var = 'abc' +; + +try { +} catch (X +$y) { +} finally { +} + +if ($cond) { // Foo +} elseif ($cond2) { // Bar +} else { +} +----- +name = new Node\Name('Foo'); +----- +stmts[] = new Stmt\Expression(new Expr\Variable('baz')); +----- +params[] = new Node\Param(new Expr\Variable('param2')); +----- +catches[0]->types[] = new Node\Name('Bar'); +----- +params, new Node\Param(new Expr\Variable('param0'))); +----- +params[] = new Node\Param(new Expr\Variable('param0')); +/* Insertion into empty list not handled yet */ +----- +elseifs[] = new Stmt\ElseIf_(new Expr\Variable('cond3'), []); +----- +catches[] = new Stmt\Catch_([new Node\Name('Bar')], new Expr\Variable('bar'), []); +----- +setAttribute('comments', [new Comment('// Test')]); +$stmts[] = $node; +----- +setAttribute('comments', [new Comment('// Test'), new Comment('// Test 2')]); +$stmts[0]->stmts[] = $node; +----- +name->parts[0] = 'Xyz'; +----- +stmts, $node); +----- +setAttribute('comments', [new Comment('// Test')]); +array_unshift($stmts[0]->stmts, $node); +----- +setAttribute('comments', [new Comment('// Test')]); +array_unshift($stmts[0]->stmts, $node); +----- +setAttribute('comments', [new Comment('// Test')]); +array_unshift($stmts[0]->stmts, $node); +$stmts[0]->stmts[1]->setAttribute('comments', [new Comment('// Bar foo')]); +----- +setAttribute('comments', [new Comment('// Test')]); +array_unshift($stmts[0]->stmts, $node); +$stmts[0]->stmts[1]->setAttribute('comments', []); +----- +stmts, + new Stmt\Expression(new Expr\Variable('a')), + new Stmt\Expression(new Expr\Variable('b'))); +----- +stmts = [ + new Stmt\Expression(new Expr\Variable('a')), + new Stmt\Expression(new Expr\Variable('b')), +]; +----- +expr->expr->items, new Expr\ArrayItem(new Scalar\LNumber(42))); +$stmts[0]->expr->expr->items[] = new Expr\ArrayItem(new Scalar\LNumber(24)); +----- +expr->expr->items[] = new Expr\ArrayItem(new Scalar\LNumber(24)); +----- +foo = new Foo; +$this->foo->a() + ->b(); +----- +$outerCall = $stmts[1]->expr; +$innerCall = $outerCall->var; +$var = $innerCall->var; +$stmts[1]->expr = $innerCall; +$stmts[2] = new Stmt\Expression(new Expr\MethodCall($var, $outerCall->name)); +----- +foo = new Foo; +$this->foo->a(); +$this->foo->b(); \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/formatPreservation/listRemoval.test b/vendor/nikic/php-parser/test/code/formatPreservation/listRemoval.test new file mode 100644 index 00000000..0ac42390 --- /dev/null +++ b/vendor/nikic/php-parser/test/code/formatPreservation/listRemoval.test @@ -0,0 +1,41 @@ +Removing from list nodes +----- +params); +----- +params); +$stmts[0]->params[] = new Node\Param(new Expr\Variable('x')); +$stmts[0]->params[] = new Node\Param(new Expr\Variable('y')); +----- +flags = Stmt\Class_::MODIFIER_ABSTRACT; +$stmts[1]->flags = 0; +$stmts[1]->stmts[0]->flags = Stmt\Class_::MODIFIER_PRIVATE; +$stmts[1]->stmts[1]->flags = Stmt\Class_::MODIFIER_PROTECTED; +$stmts[1]->stmts[2]->flags |= Stmt\Class_::MODIFIER_FINAL; +----- + $b +, $c => $d]; + +yield +$foo +=> +$bar; +yield +$bar; + +break +2 +; +continue +2 +; + +foreach( + $array +as + $key + => + $value +) {} + +if +($x) +{ +} + +else {} + +return +$val +; +static + $x + = + $y +; + +try {} catch + (X $y) + {} +finally +{} +----- +$stmts[0]->returnType = null; +$stmts[0]->params[0]->default = null; +$stmts[0]->params[1]->type = null; +$stmts[1]->expr->returnType = null; +$stmts[2]->extends = null; +$stmts[2]->stmts[0]->returnType = null; +$stmts[2]->stmts[1]->props[0]->default = null; +$stmts[2]->stmts[2]->adaptations[0]->newName = null; +$stmts[3]->expr->dim = null; +$stmts[4]->expr->expr = null; +$stmts[5]->expr->if = null; +$stmts[6]->expr->items[1]->key = null; +$stmts[7]->expr->key = null; +$stmts[8]->expr->value = null; +$stmts[9]->num = null; +$stmts[10]->num = null; +$stmts[11]->keyVar = null; +$stmts[12]->else = null; +$stmts[13]->expr = null; +$stmts[14]->vars[0]->default = null; +$stmts[15]->finally = null; +----- + $b +, $d]; + +yield +$bar; +yield; + +break; +continue; + +foreach( + $array +as + $value +) {} + +if +($x) +{ +} + +return; +static + $x +; + +try {} catch + (X $y) + {} +----- +name = null; +----- + !!positions Syntax error, unexpected ';', expecting T_STRING or T_VARIABLE or '{' or '$' from 3:1 to 3:1 array( - 0: Expr_PropertyFetch[2:1 - 2:6]( - var: Expr_Variable[2:1 - 2:4]( - name: foo - ) - name: Expr_Error[3:1 - 2:6]( + 0: Stmt_Expression[2:1 - 3:1]( + expr: Expr_PropertyFetch[2:1 - 2:6]( + var: Expr_Variable[2:1 - 2:4]( + name: foo + ) + name: Expr_Error[3:1 - 2:6]( + ) ) ) ) @@ -267,16 +307,20 @@ Syntax error, unexpected '}', expecting T_STRING or T_VARIABLE or '{' or '$' fro array( 0: Stmt_Function[2:1 - 4:1]( byRef: false - name: foo + name: Identifier[2:10 - 2:12]( + name: foo + ) params: array( ) returnType: null stmts: array( - 0: Expr_PropertyFetch[3:5 - 3:10]( - var: Expr_Variable[3:5 - 3:8]( - name: bar - ) - name: Expr_Error[4:1 - 3:10]( + 0: Stmt_Expression[3:5 - 3:10]( + expr: Expr_PropertyFetch[3:5 - 3:10]( + var: Expr_Variable[3:5 - 3:8]( + name: bar + ) + name: Expr_Error[4:1 - 3:10]( + ) ) ) ) @@ -288,13 +332,15 @@ new T ----- Syntax error, unexpected EOF from 2:6 to 2:6 array( - 0: Expr_New( - class: Name( - parts: array( - 0: T + 0: Stmt_Expression( + expr: Expr_New( + class: Name( + parts: array( + 0: T + ) + ) + args: array( ) - ) - args: array( ) ) ) @@ -305,10 +351,12 @@ new !!php7,positions Syntax error, unexpected EOF from 2:4 to 2:4 array( - 0: Expr_New[2:1 - 2:3]( - class: Expr_Error[2:4 - 2:3]( - ) - args: array( + 0: Stmt_Expression[2:1 - 2:3]( + expr: Expr_New[2:1 - 2:3]( + class: Expr_Error[2:4 - 2:3]( + ) + args: array( + ) ) ) ) @@ -319,11 +367,13 @@ $foo instanceof !!php7 Syntax error, unexpected EOF from 2:16 to 2:16 array( - 0: Expr_Instanceof( - expr: Expr_Variable( - name: foo - ) - class: Expr_Error( + 0: Stmt_Expression( + expr: Expr_Instanceof( + expr: Expr_Variable( + name: foo + ) + class: Expr_Error( + ) ) ) ) @@ -334,8 +384,10 @@ $ !!php7 Syntax error, unexpected EOF, expecting T_VARIABLE or '{' or '$' from 2:2 to 2:2 array( - 0: Expr_Variable( - name: Expr_Error( + 0: Stmt_Expression( + expr: Expr_Variable( + name: Expr_Error( + ) ) ) ) @@ -346,13 +398,15 @@ Foo::$ !!php7 Syntax error, unexpected EOF, expecting T_VARIABLE or '{' or '$' from 2:7 to 2:7 array( - 0: Expr_StaticPropertyFetch( - class: Name( - parts: array( - 0: Foo + 0: Stmt_Expression( + expr: Expr_StaticPropertyFetch( + class: Name( + parts: array( + 0: Foo + ) + ) + name: Expr_Error( ) - ) - name: Expr_Error( ) ) ) @@ -363,13 +417,15 @@ Foo:: !!php7 Syntax error, unexpected EOF from 2:6 to 2:6 array( - 0: Expr_ClassConstFetch( - class: Name( - parts: array( - 0: Foo + 0: Stmt_Expression( + expr: Expr_ClassConstFetch( + class: Name( + parts: array( + 0: Foo + ) + ) + name: Expr_Error( ) - ) - name: Expr_Error( ) ) ) @@ -415,7 +471,7 @@ array( 0: A ) ) - alias: A + alias: null ) ) ) @@ -429,7 +485,7 @@ array( 0: a ) ) - alias: a + alias: null ) ) ) @@ -448,14 +504,16 @@ array( 0: B ) ) - alias: B + alias: null ) ) ) 3: Stmt_Const( consts: array( 0: Const( - name: A + name: Identifier( + name: A + ) value: Scalar_LNumber( value: 1 ) @@ -506,7 +564,9 @@ array( ) ) 13: Stmt_Goto( - name: label + name: Identifier( + name: label + ) ) ) ) @@ -553,11 +613,8 @@ A trailing comma is not allowed here from 11:25 to 11:25 A trailing comma is not allowed here from 13:17 to 13:17 A trailing comma is not allowed here from 14:14 to 14:14 A trailing comma is not allowed here from 16:22 to 16:22 -A trailing comma is not allowed here from 18:9 to 18:9 -A trailing comma is not allowed here from 19:9 to 19:9 A trailing comma is not allowed here from 21:13 to 21:13 A trailing comma is not allowed here from 23:16 to 23:16 -A trailing comma is not allowed here from 24:7 to 24:7 A trailing comma is not allowed here from 25:10 to 25:10 A trailing comma is not allowed here from 26:10 to 26:10 A trailing comma is not allowed here from 27:8 to 27:8 @@ -582,7 +639,7 @@ array( 0: B ) ) - alias: B + alias: null ) ) ) @@ -601,7 +658,7 @@ array( 0: b ) ) - alias: b + alias: null ) ) ) @@ -615,14 +672,16 @@ array( 0: A ) ) - alias: A + alias: null ) ) ) 3: Stmt_Const( consts: array( 0: Const( - name: A + name: Identifier( + name: A + ) value: Scalar_LNumber( value: 42 ) @@ -631,7 +690,9 @@ array( ) 4: Stmt_Class( flags: 0 - name: X + name: Identifier( + name: X + ) extends: null implements: array( 0: Name( @@ -667,7 +728,9 @@ array( 0: A ) ) - method: b + method: Identifier( + name: b + ) insteadof: array( 0: Name( parts: array( @@ -682,7 +745,9 @@ array( flags: 0 consts: array( 0: Const( - name: A + name: Identifier( + name: A + ) value: Scalar_LNumber( value: 42 ) @@ -693,7 +758,9 @@ array( flags: MODIFIER_PUBLIC (1) props: array( 0: Stmt_PropertyProperty( - name: x + name: VarLikeIdentifier( + name: x + ) default: null ) ) @@ -701,7 +768,9 @@ array( ) ) 5: Stmt_Interface( - name: I + name: Identifier( + name: I + ) extends: array( 0: Name( parts: array( @@ -719,17 +788,21 @@ array( ) ) ) - 7: Expr_Isset( - vars: array( - 0: Expr_Variable( - name: x + 7: Stmt_Expression( + expr: Expr_Isset( + vars: array( + 0: Expr_Variable( + name: x + ) ) ) ) 8: Stmt_Declare( declares: array( 0: Stmt_DeclareDeclare( - key: a + key: Identifier( + name: a + ) value: Scalar_LNumber( value: 42 ) @@ -739,13 +812,17 @@ array( ) 9: Stmt_Function( byRef: false - name: foo + name: Identifier( + name: foo + ) params: array( 0: Param( type: null byRef: false variadic: false - name: a + var: Expr_Variable( + name: a + ) default: null ) ) @@ -753,19 +830,21 @@ array( stmts: array( ) ) - 10: Expr_FuncCall( - name: Name( - parts: array( - 0: foo - ) - ) - args: array( - 0: Arg( - value: Expr_Variable( - name: a + 10: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: foo + ) + ) + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: false + unpack: false ) - byRef: false - unpack: false ) ) ) @@ -779,7 +858,9 @@ array( 12: Stmt_Static( vars: array( 0: Stmt_StaticVar( - name: a + var: Expr_Variable( + name: a + ) default: null ) ) @@ -810,26 +891,32 @@ array( stmts: array( ) ) - 15: Expr_Closure( - static: false - byRef: false - params: array( - 0: Param( - type: null - byRef: false - variadic: false - name: a - default: null + 15: Stmt_Expression( + expr: Expr_Closure( + static: false + byRef: false + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: a + ) + default: null + ) ) - ) - uses: array( - 0: Expr_ClosureUse( - var: b - byRef: false + uses: array( + 0: Expr_ClosureUse( + var: Expr_Variable( + name: b + ) + byRef: false + ) + ) + returnType: null + stmts: array( ) - ) - returnType: null - stmts: array( ) ) ) @@ -841,25 +928,341 @@ foo(Bar::); !!php7,positions Syntax error, unexpected ')' from 3:10 to 3:10 array( - 0: Expr_FuncCall[3:1 - 3:10]( - name: Name[3:1 - 3:3]( - parts: array( - 0: foo + 0: Stmt_Expression[3:1 - 3:11]( + expr: Expr_FuncCall[3:1 - 3:10]( + name: Name[3:1 - 3:3]( + parts: array( + 0: foo + ) ) - ) - args: array( - 0: Arg[3:5 - 3:9]( - value: Expr_ClassConstFetch[3:5 - 3:9]( - class: Name[3:5 - 3:7]( - parts: array( - 0: Bar + args: array( + 0: Arg[3:5 - 3:9]( + value: Expr_ClassConstFetch[3:5 - 3:9]( + class: Name[3:5 - 3:7]( + parts: array( + 0: Bar + ) + ) + name: Expr_Error[3:10 - 3:9]( ) ) - name: Expr_Error[3:10 - 3:9]( + byRef: false + unpack: false + ) + ) + ) + ) +) +----- + 'd', 'e' => &$f); ['a' => 'b']; ----- array( - 0: Expr_Array( - items: array( - ) - ) - 1: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_String( - value: a - ) - byRef: false + 0: Stmt_Expression( + expr: Expr_Array( + items: array( ) ) ) - 2: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_String( - value: a + 1: Stmt_Expression( + expr: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_String( + value: a + ) + byRef: false ) - byRef: false ) ) ) - 3: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_String( - value: a + 2: Stmt_Expression( + expr: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_String( + value: a + ) + byRef: false ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_String( - value: b - ) - byRef: false ) ) ) - 4: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_String( - value: a + 3: Stmt_Expression( + expr: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_String( + value: a + ) + byRef: false ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: b + 1: Expr_ArrayItem( + key: null + value: Scalar_String( + value: b + ) + byRef: false ) - byRef: true - ) - 2: Expr_ArrayItem( - key: Scalar_String( - value: c - ) - value: Scalar_String( - value: d - ) - byRef: false - ) - 3: Expr_ArrayItem( - key: Scalar_String( - value: e - ) - value: Expr_Variable( - name: f - ) - byRef: true ) ) ) - 5: Expr_Array( - items: array( + 4: Stmt_Expression( + expr: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_String( + value: a + ) + byRef: false + ) + 1: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: b + ) + byRef: true + ) + 2: Expr_ArrayItem( + key: Scalar_String( + value: c + ) + value: Scalar_String( + value: d + ) + byRef: false + ) + 3: Expr_ArrayItem( + key: Scalar_String( + value: e + ) + value: Expr_Variable( + name: f + ) + byRef: true + ) + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_Array( + items: array( + ) + comments: array( + 0: // short array syntax + ) ) comments: array( 0: // short array syntax ) ) - 6: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 1 + 6: Stmt_Expression( + expr: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 1 + ) + byRef: false ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 2 + 1: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 2 + ) + byRef: false ) - byRef: false - ) - 2: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 3 + 2: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 3 + ) + byRef: false ) - byRef: false ) ) ) - 7: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: Scalar_String( - value: a + 7: Stmt_Expression( + expr: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: Scalar_String( + value: a + ) + value: Scalar_String( + value: b + ) + byRef: false ) - value: Scalar_String( - value: b - ) - byRef: false ) ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/expr/arrayDestructuring.test b/vendor/nikic/php-parser/test/code/parser/expr/arrayDestructuring.test index 4ca76b21..7865e6ff 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/arrayDestructuring.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/arrayDestructuring.test @@ -9,136 +9,144 @@ Array destructuring ----- !!php7 array( - 0: Expr_Assign( - var: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: a + ) + byRef: false ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: b + 1: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: b + ) + byRef: false ) - byRef: false ) ) - ) - expr: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: c + expr: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: c + ) + byRef: false ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: d + 1: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: d + ) + byRef: false ) - byRef: false ) ) ) ) - 1: Expr_Assign( - var: Expr_Array( - items: array( - 0: null - 1: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: a + 1: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Array( + items: array( + 0: null + 1: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: a + ) + byRef: false ) - byRef: false - ) - 2: null - 3: null - 4: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: b + 2: null + 3: null + 4: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: b + ) + byRef: false ) - byRef: false + 5: null ) - 5: null + ) + expr: Expr_Variable( + name: foo ) ) - expr: Expr_Variable( - name: foo - ) ) - 2: Expr_Assign( - var: Expr_Array( - items: array( - 0: null - 1: Expr_ArrayItem( - key: null - value: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: a + 2: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Array( + items: array( + 0: null + 1: Expr_ArrayItem( + key: null + value: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: a + ) + byRef: false ) - byRef: false ) ) + byRef: false ) - byRef: false ) ) + byRef: false ) - byRef: false - ) - 2: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: b + 2: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: b + ) + byRef: false ) - byRef: false ) ) - ) - expr: Expr_Variable( - name: bar + expr: Expr_Variable( + name: bar + ) ) ) - 3: Expr_Assign( - var: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: Scalar_String( - value: a + 3: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: Scalar_String( + value: a + ) + value: Expr_Variable( + name: b + ) + byRef: false ) - value: Expr_Variable( - name: b + 1: Expr_ArrayItem( + key: Scalar_String( + value: b + ) + value: Expr_Variable( + name: a + ) + byRef: false ) - byRef: false - ) - 1: Expr_ArrayItem( - key: Scalar_String( - value: b - ) - value: Expr_Variable( - name: a - ) - byRef: false ) ) - ) - expr: Expr_Variable( - name: baz + expr: Expr_Variable( + name: baz + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/assign.test b/vendor/nikic/php-parser/test/code/parser/expr/assign.test index 1d6b187a..33335f89 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/assign.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/assign.test @@ -36,266 +36,328 @@ $a++; $a--; ----- array( - 0: Expr_Assign( - var: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Variable( + name: a + comments: array( + 0: // simple assign + ) + ) + expr: Expr_Variable( + name: b + ) comments: array( 0: // simple assign ) ) - expr: Expr_Variable( - name: b - ) comments: array( 0: // simple assign ) ) - 1: Expr_AssignOp_BitwiseAnd( - var: Expr_Variable( - name: a + 1: Stmt_Expression( + expr: Expr_AssignOp_BitwiseAnd( + var: Expr_Variable( + name: a + comments: array( + 0: // combined assign + ) + ) + expr: Expr_Variable( + name: b + ) comments: array( 0: // combined assign ) ) - expr: Expr_Variable( - name: b - ) comments: array( 0: // combined assign ) ) - 2: Expr_AssignOp_BitwiseOr( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 3: Expr_AssignOp_BitwiseXor( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 4: Expr_AssignOp_Concat( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 5: Expr_AssignOp_Div( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 6: Expr_AssignOp_Minus( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 7: Expr_AssignOp_Mod( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 8: Expr_AssignOp_Mul( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 9: Expr_AssignOp_Plus( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 10: Expr_AssignOp_ShiftLeft( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 11: Expr_AssignOp_ShiftRight( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 12: Expr_AssignOp_Pow( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - 13: Expr_Assign( - var: Expr_Variable( - name: a - comments: array( - 0: // chained assign - ) - ) - expr: Expr_AssignOp_Mul( + 2: Stmt_Expression( + expr: Expr_AssignOp_BitwiseOr( var: Expr_Variable( + name: a + ) + expr: Expr_Variable( name: b ) - expr: Expr_AssignOp_Pow( + ) + ) + 3: Stmt_Expression( + expr: Expr_AssignOp_BitwiseXor( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_AssignOp_Concat( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_AssignOp_Div( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_AssignOp_Minus( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_AssignOp_Mod( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 8: Stmt_Expression( + expr: Expr_AssignOp_Mul( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 9: Stmt_Expression( + expr: Expr_AssignOp_Plus( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 10: Stmt_Expression( + expr: Expr_AssignOp_ShiftLeft( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 11: Stmt_Expression( + expr: Expr_AssignOp_ShiftRight( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 12: Stmt_Expression( + expr: Expr_AssignOp_Pow( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 13: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Variable( + name: a + comments: array( + 0: // chained assign + ) + ) + expr: Expr_AssignOp_Mul( var: Expr_Variable( - name: c + name: b ) - expr: Expr_Variable( - name: d + expr: Expr_AssignOp_Pow( + var: Expr_Variable( + name: c + ) + expr: Expr_Variable( + name: d + ) ) ) + comments: array( + 0: // chained assign + ) ) comments: array( 0: // chained assign ) ) - 14: Expr_AssignRef( - var: Expr_Variable( - name: a + 14: Stmt_Expression( + expr: Expr_AssignRef( + var: Expr_Variable( + name: a + comments: array( + 0: // by ref assign + ) + ) + expr: Expr_Variable( + name: b + ) comments: array( 0: // by ref assign ) ) - expr: Expr_Variable( - name: b - ) comments: array( 0: // by ref assign ) ) - 15: Expr_Assign( - var: Expr_List( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: a + 15: Stmt_Expression( + expr: Expr_Assign( + var: Expr_List( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: a + ) + byRef: false ) - byRef: false ) + comments: array( + 0: // list() assign + ) + ) + expr: Expr_Variable( + name: b ) comments: array( 0: // list() assign ) ) - expr: Expr_Variable( - name: b - ) comments: array( 0: // list() assign ) ) - 16: Expr_Assign( - var: Expr_List( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: a + 16: Stmt_Expression( + expr: Expr_Assign( + var: Expr_List( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: a + ) + byRef: false ) - byRef: false - ) - 1: null - 2: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: b + 1: null + 2: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: b + ) + byRef: false ) - byRef: false ) ) - ) - expr: Expr_Variable( - name: c + expr: Expr_Variable( + name: c + ) ) ) - 17: Expr_Assign( - var: Expr_List( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: a + 17: Stmt_Expression( + expr: Expr_Assign( + var: Expr_List( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: a + ) + byRef: false ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Expr_List( - items: array( - 0: null - 1: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: c + 1: Expr_ArrayItem( + key: null + value: Expr_List( + items: array( + 0: null + 1: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: c + ) + byRef: false ) - byRef: false ) ) + byRef: false ) - byRef: false - ) - 2: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: d + 2: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: d + ) + byRef: false ) - byRef: false ) ) - ) - expr: Expr_Variable( - name: e + expr: Expr_Variable( + name: e + ) ) ) - 18: Expr_PreInc( - var: Expr_Variable( - name: a + 18: Stmt_Expression( + expr: Expr_PreInc( + var: Expr_Variable( + name: a + ) + comments: array( + 0: // inc/dec + ) ) comments: array( 0: // inc/dec ) ) - 19: Expr_PostInc( - var: Expr_Variable( - name: a + 19: Stmt_Expression( + expr: Expr_PostInc( + var: Expr_Variable( + name: a + ) ) ) - 20: Expr_PreDec( - var: Expr_Variable( - name: a + 20: Stmt_Expression( + expr: Expr_PreDec( + var: Expr_Variable( + name: a + ) ) ) - 21: Expr_PostDec( - var: Expr_Variable( - name: a + 21: Stmt_Expression( + expr: Expr_PostDec( + var: Expr_Variable( + name: a + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/assignNewByRef.test b/vendor/nikic/php-parser/test/code/parser/expr/assignNewByRef.test index 10e1317f..a66d943a 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/assignNewByRef.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/assignNewByRef.test @@ -5,17 +5,19 @@ $a =& new B; ----- !!php5 array( - 0: Expr_AssignRef( - var: Expr_Variable( - name: a - ) - expr: Expr_New( - class: Name( - parts: array( - 0: B - ) + 0: Stmt_Expression( + expr: Expr_AssignRef( + var: Expr_Variable( + name: a ) - args: array( + expr: Expr_New( + class: Name( + parts: array( + 0: B + ) + ) + args: array( + ) ) ) ) @@ -27,13 +29,15 @@ $a =& new B; !!php7 Syntax error, unexpected T_NEW from 2:7 to 2:9 array( - 0: Expr_New( - class: Name( - parts: array( - 0: B + 0: Stmt_Expression( + expr: Expr_New( + class: Name( + parts: array( + 0: B + ) + ) + args: array( ) - ) - args: array( ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/cast.test b/vendor/nikic/php-parser/test/code/parser/expr/cast.test index 3c54ba72..a875bb47 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/cast.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/cast.test @@ -14,59 +14,81 @@ Casts (unset) $a; ----- array( - 0: Expr_Cast_Array( - expr: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_Cast_Array( + expr: Expr_Variable( + name: a + ) ) ) - 1: Expr_Cast_Bool( - expr: Expr_Variable( - name: a + 1: Stmt_Expression( + expr: Expr_Cast_Bool( + expr: Expr_Variable( + name: a + ) ) ) - 2: Expr_Cast_Bool( - expr: Expr_Variable( - name: a + 2: Stmt_Expression( + expr: Expr_Cast_Bool( + expr: Expr_Variable( + name: a + ) ) ) - 3: Expr_Cast_Double( - expr: Expr_Variable( - name: a + 3: Stmt_Expression( + expr: Expr_Cast_Double( + expr: Expr_Variable( + name: a + ) ) ) - 4: Expr_Cast_Double( - expr: Expr_Variable( - name: a + 4: Stmt_Expression( + expr: Expr_Cast_Double( + expr: Expr_Variable( + name: a + ) ) ) - 5: Expr_Cast_Double( - expr: Expr_Variable( - name: a + 5: Stmt_Expression( + expr: Expr_Cast_Double( + expr: Expr_Variable( + name: a + ) ) ) - 6: Expr_Cast_Int( - expr: Expr_Variable( - name: a + 6: Stmt_Expression( + expr: Expr_Cast_Int( + expr: Expr_Variable( + name: a + ) ) ) - 7: Expr_Cast_Int( - expr: Expr_Variable( - name: a + 7: Stmt_Expression( + expr: Expr_Cast_Int( + expr: Expr_Variable( + name: a + ) ) ) - 8: Expr_Cast_Object( - expr: Expr_Variable( - name: a + 8: Stmt_Expression( + expr: Expr_Cast_Object( + expr: Expr_Variable( + name: a + ) ) ) - 9: Expr_Cast_String( - expr: Expr_Variable( - name: a + 9: Stmt_Expression( + expr: Expr_Cast_String( + expr: Expr_Variable( + name: a + ) ) ) - 10: Expr_Cast_Unset( - expr: Expr_Variable( - name: a + 10: Stmt_Expression( + expr: Expr_Cast_Unset( + expr: Expr_Variable( + name: a + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/clone.test b/vendor/nikic/php-parser/test/code/parser/expr/clone.test index 64015660..418eb0e6 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/clone.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/clone.test @@ -5,9 +5,11 @@ Clone clone $a; ----- array( - 0: Expr_Clone( - expr: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_Clone( + expr: Expr_Variable( + name: a + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/closure.test b/vendor/nikic/php-parser/test/code/parser/expr/closure.test index f459b602..c88de78b 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/closure.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/closure.test @@ -10,133 +10,167 @@ function($a) : array {}; function() use($a) : \Foo\Bar {}; ----- array( - 0: Expr_Closure( - static: false - byRef: false - params: array( - 0: Param( - type: null - byRef: false - variadic: false - name: a - default: null + 0: Stmt_Expression( + expr: Expr_Closure( + static: false + byRef: false + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: a + ) + default: null + ) ) - ) - uses: array( - ) - returnType: null - stmts: array( - 0: Expr_Variable( - name: a + uses: array( + ) + returnType: null + stmts: array( + 0: Stmt_Expression( + expr: Expr_Variable( + name: a + ) + ) ) ) ) - 1: Expr_Closure( - static: false - byRef: false - params: array( - 0: Param( - type: null - byRef: false - variadic: false - name: a - default: null + 1: Stmt_Expression( + expr: Expr_Closure( + static: false + byRef: false + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: a + ) + default: null + ) ) - ) - uses: array( - 0: Expr_ClosureUse( - var: b - byRef: false + uses: array( + 0: Expr_ClosureUse( + var: Expr_Variable( + name: b + ) + byRef: false + ) + ) + returnType: null + stmts: array( ) - ) - returnType: null - stmts: array( ) ) - 2: Expr_Closure( - static: false - byRef: false - params: array( - ) - uses: array( - 0: Expr_ClosureUse( - var: a - byRef: false + 2: Stmt_Expression( + expr: Expr_Closure( + static: false + byRef: false + params: array( ) - 1: Expr_ClosureUse( - var: b - byRef: true + uses: array( + 0: Expr_ClosureUse( + var: Expr_Variable( + name: a + ) + byRef: false + ) + 1: Expr_ClosureUse( + var: Expr_Variable( + name: b + ) + byRef: true + ) + ) + returnType: null + stmts: array( ) - ) - returnType: null - stmts: array( ) ) - 3: Expr_Closure( - static: false - byRef: true - params: array( - 0: Param( - type: null - byRef: false - variadic: false - name: a - default: null + 3: Stmt_Expression( + expr: Expr_Closure( + static: false + byRef: true + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: a + ) + default: null + ) + ) + uses: array( + ) + returnType: null + stmts: array( ) ) - uses: array( - ) - returnType: null - stmts: array( - ) ) - 4: Expr_Closure( - static: true - byRef: false - params: array( - ) - uses: array( - ) - returnType: null - stmts: array( - ) - ) - 5: Expr_Closure( - static: false - byRef: false - params: array( - 0: Param( - type: null - byRef: false - variadic: false - name: a - default: null + 4: Stmt_Expression( + expr: Expr_Closure( + static: true + byRef: false + params: array( + ) + uses: array( + ) + returnType: null + stmts: array( ) ) - uses: array( - ) - returnType: array - stmts: array( - ) ) - 6: Expr_Closure( - static: false - byRef: false - params: array( - ) - uses: array( - 0: Expr_ClosureUse( - var: a - byRef: false + 5: Stmt_Expression( + expr: Expr_Closure( + static: false + byRef: false + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: a + ) + default: null + ) + ) + uses: array( + ) + returnType: Identifier( + name: array + ) + stmts: array( ) ) - returnType: Name_FullyQualified( - parts: array( - 0: Foo - 1: Bar + ) + 6: Stmt_Expression( + expr: Expr_Closure( + static: false + byRef: false + params: array( + ) + uses: array( + 0: Expr_ClosureUse( + var: Expr_Variable( + name: a + ) + byRef: false + ) + ) + returnType: Name_FullyQualified( + parts: array( + 0: Foo + 1: Bar + ) + ) + stmts: array( ) ) - stmts: array( - ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/comparison.test b/vendor/nikic/php-parser/test/code/parser/expr/comparison.test index d5b1e354..011692f0 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/comparison.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/comparison.test @@ -14,94 +14,116 @@ $a instanceof B; $a instanceof $b; ----- array( - 0: Expr_BinaryOp_Smaller( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 1: Expr_BinaryOp_SmallerOrEqual( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 2: Expr_BinaryOp_Greater( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 3: Expr_BinaryOp_GreaterOrEqual( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 4: Expr_BinaryOp_Equal( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 5: Expr_BinaryOp_Identical( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 6: Expr_BinaryOp_NotEqual( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 7: Expr_BinaryOp_NotIdentical( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 8: Expr_BinaryOp_Spaceship( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 9: Expr_Instanceof( - expr: Expr_Variable( - name: a - ) - class: Name( - parts: array( - 0: B + 0: Stmt_Expression( + expr: Expr_BinaryOp_Smaller( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b ) ) ) - 10: Expr_Instanceof( - expr: Expr_Variable( - name: a - ) - class: Expr_Variable( - name: b + 1: Stmt_Expression( + expr: Expr_BinaryOp_SmallerOrEqual( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) ) ) -) + 2: Stmt_Expression( + expr: Expr_BinaryOp_Greater( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_BinaryOp_GreaterOrEqual( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_BinaryOp_Equal( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_BinaryOp_Identical( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_BinaryOp_NotEqual( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_BinaryOp_NotIdentical( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 8: Stmt_Expression( + expr: Expr_BinaryOp_Spaceship( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 9: Stmt_Expression( + expr: Expr_Instanceof( + expr: Expr_Variable( + name: a + ) + class: Name( + parts: array( + 0: B + ) + ) + ) + ) + 10: Stmt_Expression( + expr: Expr_Instanceof( + expr: Expr_Variable( + name: a + ) + class: Expr_Variable( + name: b + ) + ) + ) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/constant_expr.test b/vendor/nikic/php-parser/test/code/parser/expr/constant_expr.test index 3e7a23ef..d774de71 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/constant_expr.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/constant_expr.test @@ -44,7 +44,9 @@ array( 0: Stmt_Const( consts: array( 0: Const( - name: T_1 + name: Identifier( + name: T_1 + ) value: Expr_BinaryOp_ShiftLeft( left: Scalar_LNumber( value: 1 @@ -59,7 +61,9 @@ array( 1: Stmt_Const( consts: array( 0: Const( - name: T_2 + name: Identifier( + name: T_2 + ) value: Expr_BinaryOp_Div( left: Scalar_LNumber( value: 1 @@ -74,7 +78,9 @@ array( 2: Stmt_Const( consts: array( 0: Const( - name: T_3 + name: Identifier( + name: T_3 + ) value: Expr_BinaryOp_Plus( left: Scalar_DNumber( value: 1.5 @@ -89,7 +95,9 @@ array( 3: Stmt_Const( consts: array( 0: Const( - name: T_4 + name: Identifier( + name: T_4 + ) value: Expr_BinaryOp_Concat( left: Scalar_String( value: foo @@ -104,7 +112,9 @@ array( 4: Stmt_Const( consts: array( 0: Const( - name: T_5 + name: Identifier( + name: T_5 + ) value: Expr_BinaryOp_Mul( left: Expr_BinaryOp_Plus( left: Scalar_DNumber( @@ -124,7 +134,9 @@ array( 5: Stmt_Const( consts: array( 0: Const( - name: T_6 + name: Identifier( + name: T_6 + ) value: Expr_BinaryOp_Concat( left: Expr_BinaryOp_Concat( left: Expr_BinaryOp_Concat( @@ -149,7 +161,9 @@ array( 6: Stmt_Const( consts: array( 0: Const( - name: T_7 + name: Identifier( + name: T_7 + ) value: Scalar_MagicConst_Line( ) ) @@ -158,7 +172,9 @@ array( 7: Stmt_Const( consts: array( 0: Const( - name: T_8 + name: Identifier( + name: T_8 + ) value: Scalar_String( value: This is a test string ) @@ -168,7 +184,9 @@ array( 8: Stmt_Const( consts: array( 0: Const( - name: T_9 + name: Identifier( + name: T_9 + ) value: Expr_BitwiseNot( expr: Expr_UnaryMinus( expr: Scalar_LNumber( @@ -182,7 +200,9 @@ array( 9: Stmt_Const( consts: array( 0: Const( - name: T_10 + name: Identifier( + name: T_10 + ) value: Expr_BinaryOp_Plus( left: Expr_Ternary( cond: Expr_UnaryMinus( @@ -213,7 +233,9 @@ array( 10: Stmt_Const( consts: array( 0: Const( - name: T_11 + name: Identifier( + name: T_11 + ) value: Expr_BinaryOp_BooleanAnd( left: Scalar_LNumber( value: 1 @@ -228,7 +250,9 @@ array( 11: Stmt_Const( consts: array( 0: Const( - name: T_12 + name: Identifier( + name: T_12 + ) value: Expr_BinaryOp_LogicalAnd( left: Scalar_LNumber( value: 1 @@ -243,7 +267,9 @@ array( 12: Stmt_Const( consts: array( 0: Const( - name: T_13 + name: Identifier( + name: T_13 + ) value: Expr_BinaryOp_BooleanOr( left: Scalar_LNumber( value: 0 @@ -258,7 +284,9 @@ array( 13: Stmt_Const( consts: array( 0: Const( - name: T_14 + name: Identifier( + name: T_14 + ) value: Expr_BinaryOp_LogicalOr( left: Scalar_LNumber( value: 1 @@ -273,7 +301,9 @@ array( 14: Stmt_Const( consts: array( 0: Const( - name: T_15 + name: Identifier( + name: T_15 + ) value: Expr_BinaryOp_LogicalXor( left: Scalar_LNumber( value: 1 @@ -288,7 +318,9 @@ array( 15: Stmt_Const( consts: array( 0: Const( - name: T_16 + name: Identifier( + name: T_16 + ) value: Expr_BinaryOp_LogicalXor( left: Scalar_LNumber( value: 1 @@ -303,7 +335,9 @@ array( 16: Stmt_Const( consts: array( 0: Const( - name: T_17 + name: Identifier( + name: T_17 + ) value: Expr_BinaryOp_Smaller( left: Scalar_LNumber( value: 1 @@ -318,7 +352,9 @@ array( 17: Stmt_Const( consts: array( 0: Const( - name: T_18 + name: Identifier( + name: T_18 + ) value: Expr_BinaryOp_SmallerOrEqual( left: Scalar_LNumber( value: 0 @@ -333,7 +369,9 @@ array( 18: Stmt_Const( consts: array( 0: Const( - name: T_19 + name: Identifier( + name: T_19 + ) value: Expr_BinaryOp_Greater( left: Scalar_LNumber( value: 1 @@ -348,7 +386,9 @@ array( 19: Stmt_Const( consts: array( 0: Const( - name: T_20 + name: Identifier( + name: T_20 + ) value: Expr_BinaryOp_GreaterOrEqual( left: Scalar_LNumber( value: 1 @@ -363,7 +403,9 @@ array( 20: Stmt_Const( consts: array( 0: Const( - name: T_21 + name: Identifier( + name: T_21 + ) value: Expr_BinaryOp_Identical( left: Scalar_LNumber( value: 1 @@ -378,7 +420,9 @@ array( 21: Stmt_Const( consts: array( 0: Const( - name: T_22 + name: Identifier( + name: T_22 + ) value: Expr_BinaryOp_NotIdentical( left: Scalar_LNumber( value: 1 @@ -393,7 +437,9 @@ array( 22: Stmt_Const( consts: array( 0: Const( - name: T_23 + name: Identifier( + name: T_23 + ) value: Expr_BinaryOp_NotEqual( left: Scalar_LNumber( value: 0 @@ -408,7 +454,9 @@ array( 23: Stmt_Const( consts: array( 0: Const( - name: T_24 + name: Identifier( + name: T_24 + ) value: Expr_BinaryOp_Equal( left: Scalar_LNumber( value: 1 @@ -423,7 +471,9 @@ array( 24: Stmt_Const( consts: array( 0: Const( - name: T_25 + name: Identifier( + name: T_25 + ) value: Expr_BinaryOp_Plus( left: Scalar_LNumber( value: 1 @@ -443,7 +493,9 @@ array( 25: Stmt_Const( consts: array( 0: Const( - name: T_26 + name: Identifier( + name: T_26 + ) value: Expr_BinaryOp_Plus( left: Expr_BinaryOp_Plus( left: Scalar_String( @@ -463,7 +515,9 @@ array( 26: Stmt_Const( consts: array( 0: Const( - name: T_27 + name: Identifier( + name: T_27 + ) value: Expr_BinaryOp_Pow( left: Scalar_LNumber( value: 2 @@ -478,7 +532,9 @@ array( 27: Stmt_Const( consts: array( 0: Const( - name: T_28 + name: Identifier( + name: T_28 + ) value: Expr_ArrayDimFetch( var: Expr_Array( items: array( @@ -515,7 +571,9 @@ array( 28: Stmt_Const( consts: array( 0: Const( - name: T_29 + name: Identifier( + name: T_29 + ) value: Expr_BinaryOp_Minus( left: Scalar_LNumber( value: 12 @@ -530,7 +588,9 @@ array( 29: Stmt_Const( consts: array( 0: Const( - name: T_30 + name: Identifier( + name: T_30 + ) value: Expr_BinaryOp_BitwiseXor( left: Scalar_LNumber( value: 12 @@ -545,7 +605,9 @@ array( 30: Stmt_Const( consts: array( 0: Const( - name: T_31 + name: Identifier( + name: T_31 + ) value: Expr_BinaryOp_BitwiseAnd( left: Scalar_LNumber( value: 12 @@ -560,7 +622,9 @@ array( 31: Stmt_Const( consts: array( 0: Const( - name: T_32 + name: Identifier( + name: T_32 + ) value: Expr_BinaryOp_BitwiseOr( left: Scalar_LNumber( value: 12 @@ -575,7 +639,9 @@ array( 32: Stmt_Const( consts: array( 0: Const( - name: T_33 + name: Identifier( + name: T_33 + ) value: Expr_BinaryOp_Mod( left: Scalar_LNumber( value: 12 @@ -590,7 +656,9 @@ array( 33: Stmt_Const( consts: array( 0: Const( - name: T_34 + name: Identifier( + name: T_34 + ) value: Expr_BinaryOp_ShiftRight( left: Scalar_LNumber( value: 100 @@ -605,7 +673,9 @@ array( 34: Stmt_Const( consts: array( 0: Const( - name: T_35 + name: Identifier( + name: T_35 + ) value: Expr_BooleanNot( expr: Expr_ConstFetch( name: Name( diff --git a/vendor/nikic/php-parser/test/code/parser/expr/errorSuppress.test b/vendor/nikic/php-parser/test/code/parser/expr/errorSuppress.test index ce3fce96..7f099988 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/errorSuppress.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/errorSuppress.test @@ -4,9 +4,11 @@ Error suppression @$a; ----- array( - 0: Expr_ErrorSuppress( - expr: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_ErrorSuppress( + expr: Expr_Variable( + name: a + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/exit.test b/vendor/nikic/php-parser/test/code/parser/expr/exit.test index 8f21e5ba..c880921f 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/exit.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/exit.test @@ -9,26 +9,38 @@ die(); die('Exit!'); ----- array( - 0: Expr_Exit( - expr: null - ) - 1: Expr_Exit( - expr: null - ) - 2: Expr_Exit( - expr: Scalar_String( - value: Die! + 0: Stmt_Expression( + expr: Expr_Exit( + expr: null ) ) - 3: Expr_Exit( - expr: null + 1: Stmt_Expression( + expr: Expr_Exit( + expr: null + ) ) - 4: Expr_Exit( - expr: null + 2: Stmt_Expression( + expr: Expr_Exit( + expr: Scalar_String( + value: Die! + ) + ) ) - 5: Expr_Exit( - expr: Scalar_String( - value: Exit! + 3: Stmt_Expression( + expr: Expr_Exit( + expr: null + ) + ) + 4: Stmt_Expression( + expr: Expr_Exit( + expr: null + ) + ) + 5: Stmt_Expression( + expr: Expr_Exit( + expr: Scalar_String( + value: Exit! + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/args.test b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/args.test index 6d735209..24ca0310 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/args.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/args.test @@ -9,90 +9,100 @@ f(&$a); f($a, ...$b); ----- array( - 0: Expr_FuncCall( - name: Name( - parts: array( - 0: f - ) - ) - args: array( - ) - ) - 1: Expr_FuncCall( - name: Name( - parts: array( - 0: f - ) - ) - args: array( - 0: Arg( - value: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: f ) - byRef: false - unpack: false + ) + args: array( ) ) ) - 2: Expr_FuncCall( - name: Name( - parts: array( - 0: f - ) - ) - args: array( - 0: Arg( - value: Expr_Variable( - name: a + 1: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: f ) - byRef: false - unpack: false ) - 1: Arg( - value: Expr_Variable( - name: b + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: false + unpack: false ) - byRef: false - unpack: false ) ) ) - 3: Expr_FuncCall( - name: Name( - parts: array( - 0: f - ) - ) - args: array( - 0: Arg( - value: Expr_Variable( - name: a + 2: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: f + ) + ) + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: false + unpack: false + ) + 1: Arg( + value: Expr_Variable( + name: b + ) + byRef: false + unpack: false ) - byRef: true - unpack: false ) ) ) - 4: Expr_FuncCall( - name: Name( - parts: array( - 0: f + 3: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: f + ) + ) + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: true + unpack: false + ) ) ) - args: array( - 0: Arg( - value: Expr_Variable( - name: a + ) + 4: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: f ) - byRef: false - unpack: false ) - 1: Arg( - value: Expr_Variable( - name: b + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: false + unpack: false + ) + 1: Arg( + value: Expr_Variable( + name: b + ) + byRef: false + unpack: true ) - byRef: false - unpack: true ) ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/constFetch.test b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/constFetch.test index 7686d2d9..d00084ba 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/constFetch.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/constFetch.test @@ -7,27 +7,37 @@ A::B; A::class; ----- array( - 0: Expr_ConstFetch( - name: Name( - parts: array( - 0: A + 0: Stmt_Expression( + expr: Expr_ConstFetch( + name: Name( + parts: array( + 0: A + ) ) ) ) - 1: Expr_ClassConstFetch( - class: Name( - parts: array( - 0: A + 1: Stmt_Expression( + expr: Expr_ClassConstFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: Identifier( + name: B ) ) - name: B ) - 2: Expr_ClassConstFetch( - class: Name( - parts: array( - 0: A + 2: Stmt_Expression( + expr: Expr_ClassConstFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: Identifier( + name: class ) ) - name: class ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/constantDeref.test b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/constantDeref.test index 682f7808..4d14c09a 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/constantDeref.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/constantDeref.test @@ -16,216 +16,238 @@ Foo::BAR[1]; $foo::BAR[2][1][0]; ----- array( - 0: Expr_ArrayDimFetch( - var: Scalar_String( - value: abc - ) - dim: Scalar_LNumber( - value: 2 - ) - ) - 1: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( - var: Scalar_String( - value: abc - ) - dim: Scalar_LNumber( - value: 2 - ) + 0: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Scalar_String( + value: abc ) dim: Scalar_LNumber( - value: 0 + value: 2 ) ) - dim: Scalar_LNumber( - value: 0 - ) ) - 2: Expr_ArrayDimFetch( - var: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 1 + 1: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Scalar_String( + value: abc ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_LNumber( + dim: Scalar_LNumber( value: 2 ) - byRef: false - ) - 2: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 3 - ) - byRef: false - ) - ) - ) - dim: Scalar_LNumber( - value: 2 - ) - ) - 3: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( - var: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 1 - ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 2 - ) - byRef: false - ) - 2: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 3 - ) - byRef: false - ) - ) ) dim: Scalar_LNumber( - value: 2 + value: 0 ) ) dim: Scalar_LNumber( value: 0 ) ) - dim: Scalar_LNumber( - value: 0 + ) + 2: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 1 + ) + byRef: false + ) + 1: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 2 + ) + byRef: false + ) + 2: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 3 + ) + byRef: false + ) + ) + ) + dim: Scalar_LNumber( + value: 2 + ) ) ) - 4: Expr_ArrayDimFetch( - var: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 1 + 3: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 1 + ) + byRef: false + ) + 1: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 2 + ) + byRef: false + ) + 2: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 3 + ) + byRef: false + ) + ) ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_LNumber( + dim: Scalar_LNumber( value: 2 ) - byRef: false - ) - 2: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 3 - ) - byRef: false - ) - ) - ) - dim: Scalar_LNumber( - value: 2 - ) - ) - 5: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( - var: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 1 - ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 2 - ) - byRef: false - ) - 2: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 3 - ) - byRef: false - ) - ) ) dim: Scalar_LNumber( - value: 2 + value: 0 ) ) dim: Scalar_LNumber( value: 0 ) ) - dim: Scalar_LNumber( - value: 0 - ) ) - 6: Expr_ArrayDimFetch( - var: Expr_ConstFetch( - name: Name( - parts: array( - 0: FOO - ) - ) - ) - dim: Scalar_LNumber( - value: 0 - ) - ) - 7: Expr_ArrayDimFetch( - var: Expr_ClassConstFetch( - class: Name( - parts: array( - 0: Foo - ) - ) - name: BAR - ) - dim: Scalar_LNumber( - value: 1 - ) - ) - 8: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( - var: Expr_ClassConstFetch( - class: Expr_Variable( - name: foo + 4: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 1 + ) + byRef: false ) + 1: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 2 + ) + byRef: false + ) + 2: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 3 + ) + byRef: false + ) + ) + ) + dim: Scalar_LNumber( + value: 2 + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 1 + ) + byRef: false + ) + 1: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 2 + ) + byRef: false + ) + 2: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 3 + ) + byRef: false + ) + ) + ) + dim: Scalar_LNumber( + value: 2 + ) + ) + dim: Scalar_LNumber( + value: 0 + ) + ) + dim: Scalar_LNumber( + value: 0 + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_ConstFetch( + name: Name( + parts: array( + 0: FOO + ) + ) + ) + dim: Scalar_LNumber( + value: 0 + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_ClassConstFetch( + class: Name( + parts: array( + 0: Foo + ) + ) + name: Identifier( name: BAR ) - dim: Scalar_LNumber( - value: 2 - ) ) dim: Scalar_LNumber( value: 1 ) ) - dim: Scalar_LNumber( - value: 0 + ) + 8: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_ClassConstFetch( + class: Expr_Variable( + name: foo + ) + name: Identifier( + name: BAR + ) + ) + dim: Scalar_LNumber( + value: 2 + ) + ) + dim: Scalar_LNumber( + value: 1 + ) + ) + dim: Scalar_LNumber( + value: 0 + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/funcCall.test b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/funcCall.test index 62f69e34..4a826514 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/funcCall.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/funcCall.test @@ -16,114 +16,140 @@ $a->b['c'](); a()['b']; ----- array( - 0: Expr_FuncCall( - name: Name( - parts: array( - 0: a - ) - comments: array( - 0: // function name variations - ) - ) - args: array( - ) - comments: array( - 0: // function name variations - ) - ) - 1: Expr_FuncCall( - name: Expr_Variable( - name: a - ) - args: array( - ) - ) - 2: Expr_FuncCall( - name: Expr_Variable( - name: Scalar_String( - value: a - ) - ) - args: array( - ) - ) - 3: Expr_FuncCall( - name: Expr_Variable( - name: Expr_Variable( - name: a - ) - ) - args: array( - ) - ) - 4: Expr_FuncCall( - name: Expr_Variable( - name: Expr_Variable( - name: Expr_Variable( - name: a - ) - ) - ) - args: array( - ) - ) - 5: Expr_FuncCall( - name: Expr_ArrayDimFetch( - var: Expr_Variable( - name: a - ) - dim: Scalar_String( - value: b - ) - ) - args: array( - ) - ) - 6: Expr_FuncCall( - name: Expr_ArrayDimFetch( - var: Expr_Variable( - name: a - ) - dim: Scalar_String( - value: b - ) - ) - args: array( - ) - ) - 7: Expr_FuncCall( - name: Expr_ArrayDimFetch( - var: Expr_PropertyFetch( - var: Expr_Variable( - name: a - ) - name: b - ) - dim: Scalar_String( - value: c - ) - ) - args: array( - ) - ) - 8: Expr_ArrayDimFetch( - var: Expr_FuncCall( + 0: Stmt_Expression( + expr: Expr_FuncCall( name: Name( parts: array( 0: a ) comments: array( - 0: // array dereferencing + 0: // function name variations ) ) args: array( ) comments: array( - 0: // array dereferencing + 0: // function name variations ) ) - dim: Scalar_String( - value: b + comments: array( + 0: // function name variations + ) + ) + 1: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_Variable( + name: a + ) + args: array( + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_Variable( + name: Scalar_String( + value: a + ) + ) + args: array( + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_Variable( + name: Expr_Variable( + name: a + ) + ) + args: array( + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_Variable( + name: Expr_Variable( + name: Expr_Variable( + name: a + ) + ) + ) + args: array( + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_ArrayDimFetch( + var: Expr_Variable( + name: a + ) + dim: Scalar_String( + value: b + ) + ) + args: array( + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_ArrayDimFetch( + var: Expr_Variable( + name: a + ) + dim: Scalar_String( + value: b + ) + ) + args: array( + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_ArrayDimFetch( + var: Expr_PropertyFetch( + var: Expr_Variable( + name: a + ) + name: Identifier( + name: b + ) + ) + dim: Scalar_String( + value: c + ) + ) + args: array( + ) + ) + ) + 8: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_FuncCall( + name: Name( + parts: array( + 0: a + ) + comments: array( + 0: // array dereferencing + ) + ) + args: array( + ) + comments: array( + 0: // array dereferencing + ) + ) + dim: Scalar_String( + value: b + ) + comments: array( + 0: // array dereferencing + ) ) comments: array( 0: // array dereferencing diff --git a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/newDeref.test b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/newDeref.test index 5e36ff81..a4b7a724 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/newDeref.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/newDeref.test @@ -8,48 +8,42 @@ New expression dereferencing (new A)['b']['c']; ----- array( - 0: Expr_PropertyFetch( - var: Expr_New( - class: Name( - parts: array( - 0: A + 0: Stmt_Expression( + expr: Expr_PropertyFetch( + var: Expr_New( + class: Name( + parts: array( + 0: A + ) ) + args: array( + ) + ) + name: Identifier( + name: b + ) + ) + ) + 1: Stmt_Expression( + expr: Expr_MethodCall( + var: Expr_New( + class: Name( + parts: array( + 0: A + ) + ) + args: array( + ) + ) + name: Identifier( + name: b ) args: array( ) ) - name: b ) - 1: Expr_MethodCall( - var: Expr_New( - class: Name( - parts: array( - 0: A - ) - ) - args: array( - ) - ) - name: b - args: array( - ) - ) - 2: Expr_ArrayDimFetch( - var: Expr_New( - class: Name( - parts: array( - 0: A - ) - ) - args: array( - ) - ) - dim: Scalar_String( - value: b - ) - ) - 3: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( + 2: Stmt_Expression( + expr: Expr_ArrayDimFetch( var: Expr_New( class: Name( parts: array( @@ -63,8 +57,26 @@ array( value: b ) ) - dim: Scalar_String( - value: c + ) + 3: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_New( + class: Name( + parts: array( + 0: A + ) + ) + args: array( + ) + ) + dim: Scalar_String( + value: b + ) + ) + dim: Scalar_String( + value: c + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/objectAccess.test b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/objectAccess.test index 584461bd..2d1808b0 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/objectAccess.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/objectAccess.test @@ -19,123 +19,162 @@ $a->b(){'c'}; // invalid PHP: drop Support? ----- !!php5 array( - 0: Expr_PropertyFetch( - var: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_PropertyFetch( + var: Expr_Variable( + name: a + comments: array( + 0: // property fetch variations + ) + ) + name: Identifier( + name: b + ) comments: array( 0: // property fetch variations ) ) - name: b comments: array( 0: // property fetch variations ) ) - 1: Expr_ArrayDimFetch( - var: Expr_PropertyFetch( - var: Expr_Variable( - name: a - ) - name: b - ) - dim: Scalar_String( - value: c - ) - ) - 2: Expr_ArrayDimFetch( - var: Expr_PropertyFetch( - var: Expr_Variable( - name: a - ) - name: b - ) - dim: Scalar_String( - value: c - ) - ) - 3: Expr_MethodCall( - var: Expr_Variable( - name: a - comments: array( - 0: // method call variations - ) - ) - name: b - args: array( - ) - comments: array( - 0: // method call variations - ) - ) - 4: Expr_MethodCall( - var: Expr_Variable( - name: a - ) - name: Scalar_String( - value: b - ) - args: array( - ) - ) - 5: Expr_MethodCall( - var: Expr_Variable( - name: a - ) - name: Expr_Variable( - name: b - ) - args: array( - ) - ) - 6: Expr_MethodCall( - var: Expr_Variable( - name: a - ) - name: Expr_ArrayDimFetch( - var: Expr_Variable( - name: b + 1: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_PropertyFetch( + var: Expr_Variable( + name: a + ) + name: Identifier( + name: b + ) ) dim: Scalar_String( value: c ) ) - args: array( + ) + 2: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_PropertyFetch( + var: Expr_Variable( + name: a + ) + name: Identifier( + name: b + ) + ) + dim: Scalar_String( + value: c + ) ) ) - 7: Expr_ArrayDimFetch( - var: Expr_MethodCall( + 3: Stmt_Expression( + expr: Expr_MethodCall( var: Expr_Variable( name: a + comments: array( + 0: // method call variations + ) + ) + name: Identifier( + name: b + ) + args: array( + ) + comments: array( + 0: // method call variations + ) + ) + comments: array( + 0: // method call variations + ) + ) + 4: Stmt_Expression( + expr: Expr_MethodCall( + var: Expr_Variable( + name: a + ) + name: Scalar_String( + value: b + ) + args: array( + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_MethodCall( + var: Expr_Variable( + name: a + ) + name: Expr_Variable( + name: b + ) + args: array( + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_MethodCall( + var: Expr_Variable( + name: a + ) + name: Expr_ArrayDimFetch( + var: Expr_Variable( + name: b + ) + dim: Scalar_String( + value: c + ) + ) + args: array( + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_MethodCall( + var: Expr_Variable( + name: a + comments: array( + 0: // array dereferencing + ) + ) + name: Identifier( + name: b + ) + args: array( + ) comments: array( 0: // array dereferencing ) ) - name: b - args: array( + dim: Scalar_String( + value: c ) comments: array( 0: // array dereferencing ) ) - dim: Scalar_String( - value: c - ) comments: array( 0: // array dereferencing ) ) - 8: Expr_ArrayDimFetch( - var: Expr_MethodCall( - var: Expr_Variable( - name: a + 8: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_MethodCall( + var: Expr_Variable( + name: a + ) + name: Identifier( + name: b + ) + args: array( + ) ) - name: b - args: array( + dim: Scalar_String( + value: c ) ) - dim: Scalar_String( - value: c - ) ) 9: Stmt_Nop( comments: array( diff --git a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/simpleArrayAccess.test b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/simpleArrayAccess.test index ea3f9ef4..133771b7 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/simpleArrayAccess.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/simpleArrayAccess.test @@ -9,16 +9,8 @@ $a{'b'}; ${$a}['b']; ----- array( - 0: Expr_ArrayDimFetch( - var: Expr_Variable( - name: a - ) - dim: Scalar_String( - value: b - ) - ) - 1: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( + 0: Stmt_Expression( + expr: Expr_ArrayDimFetch( var: Expr_Variable( name: a ) @@ -26,37 +18,55 @@ array( value: b ) ) - dim: Scalar_String( - value: c + ) + 1: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_Variable( + name: a + ) + dim: Scalar_String( + value: b + ) + ) + dim: Scalar_String( + value: c + ) ) ) - 2: Expr_Assign( - var: Expr_ArrayDimFetch( + 2: Stmt_Expression( + expr: Expr_Assign( + var: Expr_ArrayDimFetch( + var: Expr_Variable( + name: a + ) + dim: null + ) + expr: Expr_Variable( + name: b + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_ArrayDimFetch( var: Expr_Variable( name: a ) - dim: null - ) - expr: Expr_Variable( - name: b - ) - ) - 3: Expr_ArrayDimFetch( - var: Expr_Variable( - name: a - ) - dim: Scalar_String( - value: b - ) - ) - 4: Expr_ArrayDimFetch( - var: Expr_Variable( - name: Expr_Variable( - name: a + dim: Scalar_String( + value: b ) ) - dim: Scalar_String( - value: b + ) + 4: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_Variable( + name: Expr_Variable( + name: a + ) + ) + dim: Scalar_String( + value: b + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticCall.test b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticCall.test index b806f7de..a34a3e4b 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticCall.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticCall.test @@ -20,71 +20,65 @@ $a['b']::c(); ----- !!php5 array( - 0: Expr_StaticCall( - class: Name( - parts: array( - 0: A + 0: Stmt_Expression( + expr: Expr_StaticCall( + class: Name( + parts: array( + 0: A + ) + comments: array( + 0: // method name variations + ) + ) + name: Identifier( + name: b + ) + args: array( ) comments: array( 0: // method name variations ) ) - name: b - args: array( - ) comments: array( 0: // method name variations ) ) - 1: Expr_StaticCall( - class: Name( - parts: array( - 0: A + 1: Stmt_Expression( + expr: Expr_StaticCall( + class: Name( + parts: array( + 0: A + ) + ) + name: Scalar_String( + value: b + ) + args: array( ) - ) - name: Scalar_String( - value: b - ) - args: array( ) ) - 2: Expr_StaticCall( - class: Name( - parts: array( - 0: A + 2: Stmt_Expression( + expr: Expr_StaticCall( + class: Name( + parts: array( + 0: A + ) ) - ) - name: Expr_Variable( - name: b - ) - args: array( - ) - ) - 3: Expr_StaticCall( - class: Name( - parts: array( - 0: A - ) - ) - name: Expr_ArrayDimFetch( - var: Expr_Variable( + name: Expr_Variable( name: b ) - dim: Scalar_String( - value: c + args: array( ) ) - args: array( - ) ) - 4: Expr_StaticCall( - class: Name( - parts: array( - 0: A + 3: Stmt_Expression( + expr: Expr_StaticCall( + class: Name( + parts: array( + 0: A + ) ) - ) - name: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( + name: Expr_ArrayDimFetch( var: Expr_Variable( name: b ) @@ -92,82 +86,129 @@ array( value: c ) ) - dim: Scalar_String( - value: d + args: array( ) ) - args: array( - ) ) - 5: Expr_ArrayDimFetch( - var: Expr_StaticCall( + 4: Stmt_Expression( + expr: Expr_StaticCall( class: Name( parts: array( 0: A ) + ) + name: Expr_ArrayDimFetch( + var: Expr_ArrayDimFetch( + var: Expr_Variable( + name: b + ) + dim: Scalar_String( + value: c + ) + ) + dim: Scalar_String( + value: d + ) + ) + args: array( + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_StaticCall( + class: Name( + parts: array( + 0: A + ) + comments: array( + 0: // array dereferencing + ) + ) + name: Identifier( + name: b + ) + args: array( + ) comments: array( 0: // array dereferencing ) ) - name: b - args: array( + dim: Scalar_String( + value: c ) comments: array( 0: // array dereferencing ) ) - dim: Scalar_String( - value: c - ) comments: array( 0: // array dereferencing ) ) - 6: Expr_StaticCall( - class: Name( - parts: array( - 0: static + 6: Stmt_Expression( + expr: Expr_StaticCall( + class: Name( + parts: array( + 0: static + ) + comments: array( + 0: // class name variations + ) + ) + name: Identifier( + name: b + ) + args: array( ) comments: array( 0: // class name variations ) ) - name: b - args: array( - ) comments: array( 0: // class name variations ) ) - 7: Expr_StaticCall( - class: Expr_Variable( - name: a - ) - name: b - args: array( - ) - ) - 8: Expr_StaticCall( - class: Expr_Variable( - name: Scalar_String( - value: a - ) - ) - name: b - args: array( - ) - ) - 9: Expr_StaticCall( - class: Expr_ArrayDimFetch( - var: Expr_Variable( + 7: Stmt_Expression( + expr: Expr_StaticCall( + class: Expr_Variable( name: a ) - dim: Scalar_String( - value: b + name: Identifier( + name: b + ) + args: array( ) ) - name: c - args: array( + ) + 8: Stmt_Expression( + expr: Expr_StaticCall( + class: Expr_Variable( + name: Scalar_String( + value: a + ) + ) + name: Identifier( + name: b + ) + args: array( + ) + ) + ) + 9: Stmt_Expression( + expr: Expr_StaticCall( + class: Expr_ArrayDimFetch( + var: Expr_Variable( + name: a + ) + dim: Scalar_String( + value: b + ) + ) + name: Identifier( + name: c + ) + args: array( + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticPropertyFetch.test b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticPropertyFetch.test index 3d3cde51..a1de3c8c 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticPropertyFetch.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticPropertyFetch.test @@ -14,73 +14,95 @@ A::$b{'c'}; // class name variations can be found in staticCall.test ----- array( - 0: Expr_StaticPropertyFetch( - class: Name( - parts: array( - 0: A - ) - comments: array( - 0: // property name variations - ) - ) - name: b - comments: array( - 0: // property name variations - ) - ) - 1: Expr_StaticPropertyFetch( - class: Name( - parts: array( - 0: A - ) - ) - name: Expr_Variable( - name: b - ) - ) - 2: Expr_StaticPropertyFetch( - class: Name( - parts: array( - 0: A - ) - ) - name: Scalar_String( - value: b - ) - ) - 3: Expr_ArrayDimFetch( - var: Expr_StaticPropertyFetch( + 0: Stmt_Expression( + expr: Expr_StaticPropertyFetch( class: Name( parts: array( 0: A ) comments: array( - 0: // array access + 0: // property name variations ) ) - name: b + name: VarLikeIdentifier( + name: b + ) comments: array( - 0: // array access + 0: // property name variations ) ) - dim: Scalar_String( - value: c - ) comments: array( - 0: // array access + 0: // property name variations ) ) - 4: Expr_ArrayDimFetch( - var: Expr_StaticPropertyFetch( + 1: Stmt_Expression( + expr: Expr_StaticPropertyFetch( class: Name( parts: array( 0: A ) ) - name: b + name: Expr_Variable( + name: b + ) ) - dim: Scalar_String( - value: c + ) + 2: Stmt_Expression( + expr: Expr_StaticPropertyFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: Scalar_String( + value: b + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_StaticPropertyFetch( + class: Name( + parts: array( + 0: A + ) + comments: array( + 0: // array access + ) + ) + name: VarLikeIdentifier( + name: b + ) + comments: array( + 0: // array access + ) + ) + dim: Scalar_String( + value: c + ) + comments: array( + 0: // array access + ) + ) + comments: array( + 0: // array access + ) + ) + 4: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_StaticPropertyFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: VarLikeIdentifier( + name: b + ) + ) + dim: Scalar_String( + value: c + ) ) ) 5: Stmt_Nop( diff --git a/vendor/nikic/php-parser/test/code/parser/expr/includeAndEval.test b/vendor/nikic/php-parser/test/code/parser/expr/includeAndEval.test index 8870ea5e..0ab18908 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/includeAndEval.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/includeAndEval.test @@ -8,33 +8,43 @@ require_once 'A.php'; eval('A'); ----- array( - 0: Expr_Include( - expr: Scalar_String( - value: A.php + 0: Stmt_Expression( + expr: Expr_Include( + expr: Scalar_String( + value: A.php + ) + type: TYPE_INCLUDE (1) ) - type: TYPE_INCLUDE (1) ) - 1: Expr_Include( - expr: Scalar_String( - value: A.php + 1: Stmt_Expression( + expr: Expr_Include( + expr: Scalar_String( + value: A.php + ) + type: TYPE_INCLUDE_ONCE (2) ) - type: TYPE_INCLUDE_ONCE (2) ) - 2: Expr_Include( - expr: Scalar_String( - value: A.php + 2: Stmt_Expression( + expr: Expr_Include( + expr: Scalar_String( + value: A.php + ) + type: TYPE_REQUIRE (3) ) - type: TYPE_REQUIRE (3) ) - 3: Expr_Include( - expr: Scalar_String( - value: A.php + 3: Stmt_Expression( + expr: Expr_Include( + expr: Scalar_String( + value: A.php + ) + type: TYPE_REQUIRE_ONCE (4) ) - type: TYPE_REQURE_ONCE (4) ) - 4: Expr_Eval( - expr: Scalar_String( - value: A + 4: Stmt_Expression( + expr: Expr_Eval( + expr: Scalar_String( + value: A + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/issetAndEmpty.test b/vendor/nikic/php-parser/test/code/parser/expr/issetAndEmpty.test index 3a43d0d4..cd074b1a 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/issetAndEmpty.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/issetAndEmpty.test @@ -9,65 +9,75 @@ empty(foo()); empty(array(1, 2, 3)); ----- array( - 0: Expr_Isset( - vars: array( - 0: Expr_Variable( + 0: Stmt_Expression( + expr: Expr_Isset( + vars: array( + 0: Expr_Variable( + name: a + ) + ) + ) + ) + 1: Stmt_Expression( + expr: Expr_Isset( + vars: array( + 0: Expr_Variable( + name: a + ) + 1: Expr_Variable( + name: b + ) + 2: Expr_Variable( + name: c + ) + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_Empty( + expr: Expr_Variable( name: a ) ) ) - 1: Expr_Isset( - vars: array( - 0: Expr_Variable( - name: a - ) - 1: Expr_Variable( - name: b - ) - 2: Expr_Variable( - name: c + 3: Stmt_Expression( + expr: Expr_Empty( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: foo + ) + ) + args: array( + ) ) ) ) - 2: Expr_Empty( - expr: Expr_Variable( - name: a - ) - ) - 3: Expr_Empty( - expr: Expr_FuncCall( - name: Name( - parts: array( - 0: foo - ) - ) - args: array( - ) - ) - ) - 4: Expr_Empty( - expr: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 1 + 4: Stmt_Expression( + expr: Expr_Empty( + expr: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 1 + ) + byRef: false ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 2 + 1: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 2 + ) + byRef: false ) - byRef: false - ) - 2: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 3 + 2: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 3 + ) + byRef: false ) - byRef: false ) ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/expr/listReferences.test b/vendor/nikic/php-parser/test/code/parser/expr/listReferences.test new file mode 100644 index 00000000..fd9b1e87 --- /dev/null +++ b/vendor/nikic/php-parser/test/code/parser/expr/listReferences.test @@ -0,0 +1,88 @@ +List reference assignments (PHP 7.3) +----- + &$v) = $x; +[&$v] = $x; +['k' => &$v] = $x; +----- +!!php7 +array( + 0: Stmt_Expression( + expr: Expr_Assign( + var: Expr_List( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: v + ) + byRef: true + ) + ) + ) + expr: Expr_Variable( + name: x + ) + ) + ) + 1: Stmt_Expression( + expr: Expr_Assign( + var: Expr_List( + items: array( + 0: Expr_ArrayItem( + key: Scalar_String( + value: k + ) + value: Expr_Variable( + name: v + ) + byRef: true + ) + ) + ) + expr: Expr_Variable( + name: x + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: v + ) + byRef: true + ) + ) + ) + expr: Expr_Variable( + name: x + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: Scalar_String( + value: k + ) + value: Expr_Variable( + name: v + ) + byRef: true + ) + ) + ) + expr: Expr_Variable( + name: x + ) + ) + ) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/listWithKeys.test b/vendor/nikic/php-parser/test/code/parser/expr/listWithKeys.test index 48e9637a..d0cfbb5f 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/listWithKeys.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/listWithKeys.test @@ -7,69 +7,73 @@ list('a' => list($b => $c), 'd' => $e) = $x; ----- !!php7 array( - 0: Expr_Assign( - var: Expr_List( - items: array( - 0: Expr_ArrayItem( - key: Scalar_String( - value: a + 0: Stmt_Expression( + expr: Expr_Assign( + var: Expr_List( + items: array( + 0: Expr_ArrayItem( + key: Scalar_String( + value: a + ) + value: Expr_Variable( + name: b + ) + byRef: false ) - value: Expr_Variable( - name: b - ) - byRef: false ) ) - ) - expr: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: Scalar_String( - value: a + expr: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: Scalar_String( + value: a + ) + value: Scalar_String( + value: b + ) + byRef: false ) - value: Scalar_String( - value: b - ) - byRef: false ) ) ) ) - 1: Expr_Assign( - var: Expr_List( - items: array( - 0: Expr_ArrayItem( - key: Scalar_String( - value: a - ) - value: Expr_List( - items: array( - 0: Expr_ArrayItem( - key: Expr_Variable( - name: b + 1: Stmt_Expression( + expr: Expr_Assign( + var: Expr_List( + items: array( + 0: Expr_ArrayItem( + key: Scalar_String( + value: a + ) + value: Expr_List( + items: array( + 0: Expr_ArrayItem( + key: Expr_Variable( + name: b + ) + value: Expr_Variable( + name: c + ) + byRef: false ) - value: Expr_Variable( - name: c - ) - byRef: false ) ) + byRef: false ) - byRef: false - ) - 1: Expr_ArrayItem( - key: Scalar_String( - value: d + 1: Expr_ArrayItem( + key: Scalar_String( + value: d + ) + value: Expr_Variable( + name: e + ) + byRef: false ) - value: Expr_Variable( - name: e - ) - byRef: false ) ) - ) - expr: Expr_Variable( - name: x + expr: Expr_Variable( + name: x + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/logic.test b/vendor/nikic/php-parser/test/code/parser/expr/logic.test index b3634e91..6b434565 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/logic.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/logic.test @@ -21,103 +21,148 @@ $a = $b || $c; $a = $b or $c; ----- array( - 0: Expr_BinaryOp_BooleanAnd( - left: Expr_Variable( - name: a - comments: array( - 0: // boolean ops - ) - ) - right: Expr_Variable( - name: b - ) - comments: array( - 0: // boolean ops - ) - ) - 1: Expr_BinaryOp_BooleanOr( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 2: Expr_BooleanNot( - expr: Expr_Variable( - name: a - ) - ) - 3: Expr_BooleanNot( - expr: Expr_BooleanNot( - expr: Expr_Variable( - name: a - ) - ) - ) - 4: Expr_BinaryOp_LogicalAnd( - left: Expr_Variable( - name: a - comments: array( - 0: // logical ops - ) - ) - right: Expr_Variable( - name: b - ) - comments: array( - 0: // logical ops - ) - ) - 5: Expr_BinaryOp_LogicalOr( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 6: Expr_BinaryOp_LogicalXor( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 7: Expr_BinaryOp_BooleanOr( - left: Expr_BinaryOp_BooleanAnd( + 0: Stmt_Expression( + expr: Expr_BinaryOp_BooleanAnd( left: Expr_Variable( name: a comments: array( - 0: // precedence + 0: // boolean ops ) ) right: Expr_Variable( name: b ) comments: array( - 0: // precedence + 0: // boolean ops ) ) - right: Expr_BinaryOp_BooleanAnd( + comments: array( + 0: // boolean ops + ) + ) + 1: Stmt_Expression( + expr: Expr_BinaryOp_BooleanOr( left: Expr_Variable( - name: c + name: a ) right: Expr_Variable( - name: d + name: b + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_BooleanNot( + expr: Expr_Variable( + name: a + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_BooleanNot( + expr: Expr_BooleanNot( + expr: Expr_Variable( + name: a + ) + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_BinaryOp_LogicalAnd( + left: Expr_Variable( + name: a + comments: array( + 0: // logical ops + ) + ) + right: Expr_Variable( + name: b + ) + comments: array( + 0: // logical ops + ) + ) + comments: array( + 0: // logical ops + ) + ) + 5: Stmt_Expression( + expr: Expr_BinaryOp_LogicalOr( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_BinaryOp_LogicalXor( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_BinaryOp_BooleanOr( + left: Expr_BinaryOp_BooleanAnd( + left: Expr_Variable( + name: a + comments: array( + 0: // precedence + ) + ) + right: Expr_Variable( + name: b + ) + comments: array( + 0: // precedence + ) + ) + right: Expr_BinaryOp_BooleanAnd( + left: Expr_Variable( + name: c + ) + right: Expr_Variable( + name: d + ) + ) + comments: array( + 0: // precedence ) ) comments: array( 0: // precedence ) ) - 8: Expr_BinaryOp_BooleanAnd( - left: Expr_BinaryOp_BooleanAnd( - left: Expr_Variable( + 8: Stmt_Expression( + expr: Expr_BinaryOp_BooleanAnd( + left: Expr_BinaryOp_BooleanAnd( + left: Expr_Variable( + name: a + ) + right: Expr_BinaryOp_BooleanOr( + left: Expr_Variable( + name: b + ) + right: Expr_Variable( + name: c + ) + ) + ) + right: Expr_Variable( + name: d + ) + ) + ) + 9: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Variable( name: a ) - right: Expr_BinaryOp_BooleanOr( + expr: Expr_BinaryOp_BooleanOr( left: Expr_Variable( name: b ) @@ -126,34 +171,20 @@ array( ) ) ) - right: Expr_Variable( - name: d - ) ) - 9: Expr_Assign( - var: Expr_Variable( - name: a - ) - expr: Expr_BinaryOp_BooleanOr( - left: Expr_Variable( - name: b + 10: Stmt_Expression( + expr: Expr_BinaryOp_LogicalOr( + left: Expr_Assign( + var: Expr_Variable( + name: a + ) + expr: Expr_Variable( + name: b + ) ) right: Expr_Variable( name: c ) ) ) - 10: Expr_BinaryOp_LogicalOr( - left: Expr_Assign( - var: Expr_Variable( - name: a - ) - expr: Expr_Variable( - name: b - ) - ) - right: Expr_Variable( - name: c - ) - ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/math.test b/vendor/nikic/php-parser/test/code/parser/expr/math.test index 3c00ebc7..8399400c 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/math.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/math.test @@ -34,223 +34,280 @@ $a ** $b ** $c; ($a ** $b) ** $c; ----- array( - 0: Expr_BitwiseNot( - expr: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_BitwiseNot( + expr: Expr_Variable( + name: a + ) + comments: array( + 0: // unary ops + ) ) comments: array( 0: // unary ops ) ) - 1: Expr_UnaryPlus( - expr: Expr_Variable( - name: a - ) - ) - 2: Expr_UnaryMinus( - expr: Expr_Variable( - name: a - ) - ) - 3: Expr_BinaryOp_BitwiseAnd( - left: Expr_Variable( - name: a - comments: array( - 0: // binary ops + 1: Stmt_Expression( + expr: Expr_UnaryPlus( + expr: Expr_Variable( + name: a ) ) - right: Expr_Variable( - name: b - ) - comments: array( - 0: // binary ops + ) + 2: Stmt_Expression( + expr: Expr_UnaryMinus( + expr: Expr_Variable( + name: a + ) ) ) - 4: Expr_BinaryOp_BitwiseOr( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 5: Expr_BinaryOp_BitwiseXor( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 6: Expr_BinaryOp_Concat( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 7: Expr_BinaryOp_Div( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 8: Expr_BinaryOp_Minus( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 9: Expr_BinaryOp_Mod( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 10: Expr_BinaryOp_Mul( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 11: Expr_BinaryOp_Plus( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 12: Expr_BinaryOp_ShiftLeft( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 13: Expr_BinaryOp_ShiftRight( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 14: Expr_BinaryOp_Pow( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - 15: Expr_BinaryOp_Mul( - left: Expr_BinaryOp_Mul( + 3: Stmt_Expression( + expr: Expr_BinaryOp_BitwiseAnd( left: Expr_Variable( name: a comments: array( - 0: // associativity + 0: // binary ops ) ) right: Expr_Variable( name: b ) comments: array( - 0: // associativity + 0: // binary ops ) ) - right: Expr_Variable( - name: c + comments: array( + 0: // binary ops + ) + ) + 4: Stmt_Expression( + expr: Expr_BinaryOp_BitwiseOr( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_BinaryOp_BitwiseXor( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_BinaryOp_Concat( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_BinaryOp_Div( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 8: Stmt_Expression( + expr: Expr_BinaryOp_Minus( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 9: Stmt_Expression( + expr: Expr_BinaryOp_Mod( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 10: Stmt_Expression( + expr: Expr_BinaryOp_Mul( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 11: Stmt_Expression( + expr: Expr_BinaryOp_Plus( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 12: Stmt_Expression( + expr: Expr_BinaryOp_ShiftLeft( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 13: Stmt_Expression( + expr: Expr_BinaryOp_ShiftRight( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 14: Stmt_Expression( + expr: Expr_BinaryOp_Pow( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + ) + 15: Stmt_Expression( + expr: Expr_BinaryOp_Mul( + left: Expr_BinaryOp_Mul( + left: Expr_Variable( + name: a + comments: array( + 0: // associativity + ) + ) + right: Expr_Variable( + name: b + ) + comments: array( + 0: // associativity + ) + ) + right: Expr_Variable( + name: c + ) + comments: array( + 0: // associativity + ) ) comments: array( 0: // associativity ) ) - 16: Expr_BinaryOp_Mul( - left: Expr_Variable( - name: a - ) - right: Expr_BinaryOp_Mul( + 16: Stmt_Expression( + expr: Expr_BinaryOp_Mul( left: Expr_Variable( - name: b + name: a ) - right: Expr_Variable( - name: c + right: Expr_BinaryOp_Mul( + left: Expr_Variable( + name: b + ) + right: Expr_Variable( + name: c + ) ) ) ) - 17: Expr_BinaryOp_Plus( - left: Expr_Variable( - name: a + 17: Stmt_Expression( + expr: Expr_BinaryOp_Plus( + left: Expr_Variable( + name: a + comments: array( + 0: // precedence + ) + ) + right: Expr_BinaryOp_Mul( + left: Expr_Variable( + name: b + ) + right: Expr_Variable( + name: c + ) + ) comments: array( 0: // precedence ) ) - right: Expr_BinaryOp_Mul( - left: Expr_Variable( - name: b - ) - right: Expr_Variable( - name: c - ) - ) comments: array( 0: // precedence ) ) - 18: Expr_BinaryOp_Mul( - left: Expr_BinaryOp_Plus( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - right: Expr_Variable( - name: c - ) - ) - 19: Expr_BinaryOp_Pow( - left: Expr_Variable( - name: a - comments: array( - 0: // pow is special - ) - ) - right: Expr_BinaryOp_Pow( - left: Expr_Variable( - name: b + 18: Stmt_Expression( + expr: Expr_BinaryOp_Mul( + left: Expr_BinaryOp_Plus( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) ) right: Expr_Variable( name: c ) ) + ) + 19: Stmt_Expression( + expr: Expr_BinaryOp_Pow( + left: Expr_Variable( + name: a + comments: array( + 0: // pow is special + ) + ) + right: Expr_BinaryOp_Pow( + left: Expr_Variable( + name: b + ) + right: Expr_Variable( + name: c + ) + ) + comments: array( + 0: // pow is special + ) + ) comments: array( 0: // pow is special ) ) - 20: Expr_BinaryOp_Pow( - left: Expr_BinaryOp_Pow( - left: Expr_Variable( - name: a + 20: Stmt_Expression( + expr: Expr_BinaryOp_Pow( + left: Expr_BinaryOp_Pow( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) ) right: Expr_Variable( - name: b + name: c ) ) - right: Expr_Variable( - name: c - ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/new.test b/vendor/nikic/php-parser/test/code/parser/expr/new.test index a132bbb4..2735bfe9 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/new.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/new.test @@ -19,128 +19,169 @@ new $a->b{'c'}(); (new A); ----- array( - 0: Expr_New( - class: Name( - parts: array( - 0: A - ) - ) - args: array( - ) - ) - 1: Expr_New( - class: Name( - parts: array( - 0: A - ) - ) - args: array( - 0: Arg( - value: Expr_Variable( - name: b - ) - byRef: false - unpack: false - ) - ) - ) - 2: Expr_New( - class: Expr_Variable( - name: a - ) - args: array( - ) - comments: array( - 0: // class name variations - ) - ) - 3: Expr_New( - class: Expr_ArrayDimFetch( - var: Expr_Variable( - name: a - ) - dim: Scalar_String( - value: b - ) - ) - args: array( - ) - ) - 4: Expr_New( - class: Expr_StaticPropertyFetch( + 0: Stmt_Expression( + expr: Expr_New( class: Name( parts: array( 0: A ) ) - name: b - ) - args: array( + args: array( + ) ) ) - 5: Expr_New( - class: Expr_PropertyFetch( - var: Expr_Variable( + 1: Stmt_Expression( + expr: Expr_New( + class: Name( + parts: array( + 0: A + ) + ) + args: array( + 0: Arg( + value: Expr_Variable( + name: b + ) + byRef: false + unpack: false + ) + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_New( + class: Expr_Variable( name: a ) - name: b + args: array( + ) + comments: array( + 0: // class name variations + ) ) - args: array( + comments: array( + 0: // class name variations + ) + ) + 3: Stmt_Expression( + expr: Expr_New( + class: Expr_ArrayDimFetch( + var: Expr_Variable( + name: a + ) + dim: Scalar_String( + value: b + ) + ) + args: array( + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_New( + class: Expr_StaticPropertyFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: VarLikeIdentifier( + name: b + ) + ) + args: array( + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_New( + class: Expr_PropertyFetch( + var: Expr_Variable( + name: a + ) + name: Identifier( + name: b + ) + ) + args: array( + ) + comments: array( + 0: // DNCR object access + ) ) comments: array( 0: // DNCR object access ) ) - 6: Expr_New( - class: Expr_PropertyFetch( - var: Expr_PropertyFetch( - var: Expr_Variable( - name: a + 6: Stmt_Expression( + expr: Expr_New( + class: Expr_PropertyFetch( + var: Expr_PropertyFetch( + var: Expr_Variable( + name: a + ) + name: Identifier( + name: b + ) + ) + name: Identifier( + name: c ) - name: b ) - name: c - ) - args: array( + args: array( + ) ) ) - 7: Expr_New( - class: Expr_ArrayDimFetch( - var: Expr_PropertyFetch( - var: Expr_Variable( - name: a + 7: Stmt_Expression( + expr: Expr_New( + class: Expr_ArrayDimFetch( + var: Expr_PropertyFetch( + var: Expr_Variable( + name: a + ) + name: Identifier( + name: b + ) + ) + dim: Scalar_String( + value: c ) - name: b ) - dim: Scalar_String( - value: c + args: array( ) ) - args: array( - ) ) - 8: Expr_New( - class: Expr_ArrayDimFetch( - var: Expr_PropertyFetch( - var: Expr_Variable( - name: a + 8: Stmt_Expression( + expr: Expr_New( + class: Expr_ArrayDimFetch( + var: Expr_PropertyFetch( + var: Expr_Variable( + name: a + ) + name: Identifier( + name: b + ) + ) + dim: Scalar_String( + value: c ) - name: b ) - dim: Scalar_String( - value: c + args: array( ) ) - args: array( - ) ) - 9: Expr_New( - class: Name( - parts: array( - 0: A + 9: Stmt_Expression( + expr: Expr_New( + class: Name( + parts: array( + 0: A + ) + ) + args: array( ) ) - args: array( + comments: array( + 0: // test regression introduces by new dereferencing syntax ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/newWithoutClass.test b/vendor/nikic/php-parser/test/code/parser/expr/newWithoutClass.test index ca7f4981..318f9301 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/newWithoutClass.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/newWithoutClass.test @@ -14,10 +14,12 @@ new; !!php7 Syntax error, unexpected ';' from 2:4 to 2:4 array( - 0: Expr_New( - class: Expr_Error( - ) - args: array( + 0: Stmt_Expression( + expr: Expr_New( + class: Expr_Error( + ) + args: array( + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/print.test b/vendor/nikic/php-parser/test/code/parser/expr/print.test index d07afda0..84ed7775 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/print.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/print.test @@ -4,9 +4,11 @@ Print print $a; ----- array( - 0: Expr_Print( - expr: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_Print( + expr: Expr_Variable( + name: a + ) ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/shellExec.test b/vendor/nikic/php-parser/test/code/parser/expr/shellExec.test index 2304fd98..115d9f0a 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/shellExec.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/shellExec.test @@ -8,38 +8,48 @@ Shell execution `test \"`; ----- array( - 0: Expr_ShellExec( - parts: array( - ) - ) - 1: Expr_ShellExec( - parts: array( - 0: Scalar_EncapsedStringPart( - value: test + 0: Stmt_Expression( + expr: Expr_ShellExec( + parts: array( ) ) ) - 2: Expr_ShellExec( - parts: array( - 0: Scalar_EncapsedStringPart( - value: test - ) - 1: Expr_Variable( - name: A + 1: Stmt_Expression( + expr: Expr_ShellExec( + parts: array( + 0: Scalar_EncapsedStringPart( + value: test + ) ) ) ) - 3: Expr_ShellExec( - parts: array( - 0: Scalar_EncapsedStringPart( - value: test ` + 2: Stmt_Expression( + expr: Expr_ShellExec( + parts: array( + 0: Scalar_EncapsedStringPart( + value: test + ) + 1: Expr_Variable( + name: A + ) ) ) ) - 4: Expr_ShellExec( - parts: array( - 0: Scalar_EncapsedStringPart( - value: test \" + 3: Stmt_Expression( + expr: Expr_ShellExec( + parts: array( + 0: Scalar_EncapsedStringPart( + value: test ` + ) + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_ShellExec( + parts: array( + 0: Scalar_EncapsedStringPart( + value: test \" + ) ) ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/expr/ternaryAndCoalesce.test b/vendor/nikic/php-parser/test/code/parser/expr/ternaryAndCoalesce.test index 268935db..ea1010ca 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/ternaryAndCoalesce.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/ternaryAndCoalesce.test @@ -17,38 +17,12 @@ $a ?? $b ? $c : $d; $a && $b ?? $c; ----- array( - 0: Expr_Ternary( - cond: Expr_Variable( - name: a - comments: array( - 0: // ternary - ) - ) - if: Expr_Variable( - name: b - ) - else: Expr_Variable( - name: c - ) - comments: array( - 0: // ternary - ) - ) - 1: Expr_Ternary( - cond: Expr_Variable( - name: a - ) - if: null - else: Expr_Variable( - name: c - ) - ) - 2: Expr_Ternary( - cond: Expr_Ternary( + 0: Stmt_Expression( + expr: Expr_Ternary( cond: Expr_Variable( name: a comments: array( - 0: // precedence + 0: // ternary ) ) if: Expr_Variable( @@ -58,92 +32,143 @@ array( name: c ) comments: array( - 0: // precedence + 0: // ternary ) ) - if: Expr_Variable( - name: d - ) - else: Expr_Variable( - name: e - ) comments: array( - 0: // precedence + 0: // ternary ) ) - 3: Expr_Ternary( - cond: Expr_Variable( - name: a - ) - if: Expr_Variable( - name: b - ) - else: Expr_Ternary( + 1: Stmt_Expression( + expr: Expr_Ternary( cond: Expr_Variable( + name: a + ) + if: null + else: Expr_Variable( name: c ) + ) + ) + 2: Stmt_Expression( + expr: Expr_Ternary( + cond: Expr_Ternary( + cond: Expr_Variable( + name: a + comments: array( + 0: // precedence + ) + ) + if: Expr_Variable( + name: b + ) + else: Expr_Variable( + name: c + ) + comments: array( + 0: // precedence + ) + ) if: Expr_Variable( name: d ) else: Expr_Variable( name: e ) + comments: array( + 0: // precedence + ) + ) + comments: array( + 0: // precedence ) ) - 4: Expr_BinaryOp_Coalesce( - left: Expr_Variable( - name: a + 3: Stmt_Expression( + expr: Expr_Ternary( + cond: Expr_Variable( + name: a + ) + if: Expr_Variable( + name: b + ) + else: Expr_Ternary( + cond: Expr_Variable( + name: c + ) + if: Expr_Variable( + name: d + ) + else: Expr_Variable( + name: e + ) + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_BinaryOp_Coalesce( + left: Expr_Variable( + name: a + comments: array( + 0: // null coalesce + ) + ) + right: Expr_Variable( + name: b + ) comments: array( 0: // null coalesce ) ) - right: Expr_Variable( - name: b - ) comments: array( 0: // null coalesce ) ) - 5: Expr_BinaryOp_Coalesce( - left: Expr_Variable( - name: a - ) - right: Expr_BinaryOp_Coalesce( + 5: Stmt_Expression( + expr: Expr_BinaryOp_Coalesce( left: Expr_Variable( - name: b + name: a + ) + right: Expr_BinaryOp_Coalesce( + left: Expr_Variable( + name: b + ) + right: Expr_Variable( + name: c + ) + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_Ternary( + cond: Expr_BinaryOp_Coalesce( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) + ) + if: Expr_Variable( + name: c + ) + else: Expr_Variable( + name: d + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_BinaryOp_Coalesce( + left: Expr_BinaryOp_BooleanAnd( + left: Expr_Variable( + name: a + ) + right: Expr_Variable( + name: b + ) ) right: Expr_Variable( name: c ) ) ) - 6: Expr_Ternary( - cond: Expr_BinaryOp_Coalesce( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - if: Expr_Variable( - name: c - ) - else: Expr_Variable( - name: d - ) - ) - 7: Expr_BinaryOp_Coalesce( - left: Expr_BinaryOp_BooleanAnd( - left: Expr_Variable( - name: a - ) - right: Expr_Variable( - name: b - ) - ) - right: Expr_Variable( - name: c - ) - ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/trailingCommas.test b/vendor/nikic/php-parser/test/code/parser/expr/trailingCommas.test new file mode 100644 index 00000000..11092d98 --- /dev/null +++ b/vendor/nikic/php-parser/test/code/parser/expr/trailingCommas.test @@ -0,0 +1,140 @@ +PHP 7.3 trailing comma additions +----- +bar($a, $b, ); +Foo::bar($a, $b, ); +new Foo($a, $b, ); +unset($a, $b, ); +isset($a, $b, ); +----- +!!php7 +array( + 0: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: foo + ) + ) + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: false + unpack: false + ) + 1: Arg( + value: Expr_Variable( + name: b + ) + byRef: false + unpack: false + ) + ) + ) + ) + 1: Stmt_Expression( + expr: Expr_MethodCall( + var: Expr_Variable( + name: foo + ) + name: Identifier( + name: bar + ) + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: false + unpack: false + ) + 1: Arg( + value: Expr_Variable( + name: b + ) + byRef: false + unpack: false + ) + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_StaticCall( + class: Name( + parts: array( + 0: Foo + ) + ) + name: Identifier( + name: bar + ) + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: false + unpack: false + ) + 1: Arg( + value: Expr_Variable( + name: b + ) + byRef: false + unpack: false + ) + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_New( + class: Name( + parts: array( + 0: Foo + ) + ) + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: false + unpack: false + ) + 1: Arg( + value: Expr_Variable( + name: b + ) + byRef: false + unpack: false + ) + ) + ) + ) + 4: Stmt_Unset( + vars: array( + 0: Expr_Variable( + name: a + ) + 1: Expr_Variable( + name: b + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_Isset( + vars: array( + 0: Expr_Variable( + name: a + ) + 1: Expr_Variable( + name: b + ) + ) + ) + ) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/uvs/globalNonSimpleVarError.test b/vendor/nikic/php-parser/test/code/parser/expr/uvs/globalNonSimpleVarError.test index 4cd2e680..5ae4f958 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/uvs/globalNonSimpleVarError.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/uvs/globalNonSimpleVarError.test @@ -15,10 +15,12 @@ array( ) ) ) - 1: Expr_ConstFetch( - name: Name( - parts: array( - 0: bar + 1: Stmt_Expression( + expr: Expr_ConstFetch( + name: Name( + parts: array( + 0: bar + ) ) ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/expr/uvs/indirectCall.test b/vendor/nikic/php-parser/test/code/parser/expr/uvs/indirectCall.test index bb3e7fbe..2f36cc7a 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/uvs/indirectCall.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/uvs/indirectCall.test @@ -17,35 +17,8 @@ id(['udef', 'id'])[1]()('var_dump')(5); ----- !!php7 array( - 0: Expr_FuncCall( - name: Expr_FuncCall( - name: Name( - parts: array( - 0: id - ) - ) - args: array( - 0: Arg( - value: Scalar_String( - value: var_dump - ) - byRef: false - unpack: false - ) - ) - ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 1 - ) - byRef: false - unpack: false - ) - ) - ) - 1: Expr_FuncCall( - name: Expr_FuncCall( + 0: Stmt_Expression( + expr: Expr_FuncCall( name: Expr_FuncCall( name: Name( parts: array( @@ -55,7 +28,7 @@ array( args: array( 0: Arg( value: Scalar_String( - value: id + value: var_dump ) byRef: false unpack: false @@ -64,26 +37,17 @@ array( ) args: array( 0: Arg( - value: Scalar_String( - value: var_dump + value: Scalar_LNumber( + value: 1 ) byRef: false unpack: false ) ) ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 2 - ) - byRef: false - unpack: false - ) - ) ) - 2: Expr_FuncCall( - name: Expr_FuncCall( + 1: Stmt_Expression( + expr: Expr_FuncCall( name: Expr_FuncCall( name: Expr_FuncCall( name: Name( @@ -92,123 +56,19 @@ array( ) ) args: array( - ) - ) - args: array( - ) - ) - args: array( - 0: Arg( - value: Scalar_String( - value: var_dump - ) - byRef: false - unpack: false - ) - ) - ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 4 - ) - byRef: false - unpack: false - ) - ) - ) - 3: Expr_FuncCall( - name: Expr_FuncCall( - name: Expr_FuncCall( - name: Expr_ArrayDimFetch( - var: Expr_FuncCall( - name: Name( - parts: array( - 0: id + 0: Arg( + value: Scalar_String( + value: id ) - ) - args: array( - 0: Arg( - value: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_String( - value: udef - ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_String( - value: id - ) - byRef: false - ) - ) - ) - byRef: false - unpack: false - ) - ) - ) - dim: Scalar_LNumber( - value: 1 - ) - ) - args: array( - ) - ) - args: array( - 0: Arg( - value: Scalar_String( - value: var_dump - ) - byRef: false - unpack: false - ) - ) - ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 5 - ) - byRef: false - unpack: false - ) - ) - ) - 4: Expr_FuncCall( - name: Expr_FuncCall( - name: Expr_FuncCall( - name: Expr_Closure( - static: false - byRef: false - params: array( - 0: Param( - type: null byRef: false - variadic: false - name: x - default: null - ) - ) - uses: array( - ) - returnType: null - stmts: array( - 0: Stmt_Return( - expr: Expr_Variable( - name: x - ) + unpack: false ) ) ) args: array( 0: Arg( value: Scalar_String( - value: id + value: var_dump ) byRef: false unpack: false @@ -217,71 +77,23 @@ array( ) args: array( 0: Arg( - value: Scalar_String( - value: var_dump + value: Scalar_LNumber( + value: 2 ) byRef: false unpack: false ) ) ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 8 - ) - byRef: false - unpack: false - ) - ) ) - 5: Expr_FuncCall( - name: Expr_FuncCall( + 2: Stmt_Expression( + expr: Expr_FuncCall( name: Expr_FuncCall( name: Expr_FuncCall( name: Expr_FuncCall( - name: Expr_Assign( - var: Expr_Variable( - name: f - ) - expr: Expr_Closure( - static: false - byRef: false - params: array( - 0: Param( - type: null - byRef: false - variadic: false - name: x - default: Expr_ConstFetch( - name: Name( - parts: array( - 0: null - ) - ) - ) - ) - ) - uses: array( - 0: Expr_ClosureUse( - var: f - byRef: true - ) - ) - returnType: null - stmts: array( - 0: Stmt_Return( - expr: Expr_Ternary( - cond: Expr_Variable( - name: x - ) - if: null - else: Expr_Variable( - name: f - ) - ) - ) - ) + name: Name( + parts: array( + 0: id ) ) args: array( @@ -291,50 +103,309 @@ array( ) ) args: array( + 0: Arg( + value: Scalar_String( + value: var_dump + ) + byRef: false + unpack: false + ) ) ) args: array( 0: Arg( - value: Scalar_String( - value: var_dump + value: Scalar_LNumber( + value: 4 ) byRef: false unpack: false ) ) ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 9 + ) + 3: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_ArrayDimFetch( + var: Expr_FuncCall( + name: Name( + parts: array( + 0: id + ) + ) + args: array( + 0: Arg( + value: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_String( + value: udef + ) + byRef: false + ) + 1: Expr_ArrayItem( + key: null + value: Scalar_String( + value: id + ) + byRef: false + ) + ) + ) + byRef: false + unpack: false + ) + ) + ) + dim: Scalar_LNumber( + value: 1 + ) + ) + args: array( + ) + ) + args: array( + 0: Arg( + value: Scalar_String( + value: var_dump + ) + byRef: false + unpack: false + ) + ) + ) + args: array( + 0: Arg( + value: Scalar_LNumber( + value: 5 + ) + byRef: false + unpack: false ) - byRef: false - unpack: false ) ) ) - 6: Expr_FuncCall( - name: Expr_FuncCall( + 4: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_Closure( + static: false + byRef: false + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: x + ) + default: null + ) + ) + uses: array( + ) + returnType: null + stmts: array( + 0: Stmt_Return( + expr: Expr_Variable( + name: x + ) + ) + ) + ) + args: array( + 0: Arg( + value: Scalar_String( + value: id + ) + byRef: false + unpack: false + ) + ) + ) + args: array( + 0: Arg( + value: Scalar_String( + value: var_dump + ) + byRef: false + unpack: false + ) + ) + ) + args: array( + 0: Arg( + value: Scalar_LNumber( + value: 8 + ) + byRef: false + unpack: false + ) + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_FuncCall( name: Expr_FuncCall( name: Expr_FuncCall( name: Expr_FuncCall( - name: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Variable( - name: obj - ) - byRef: false + name: Expr_FuncCall( + name: Expr_Assign( + var: Expr_Variable( + name: f ) - 1: Expr_ArrayItem( - key: null - value: Scalar_String( - value: id - ) + expr: Expr_Closure( + static: false byRef: false + params: array( + 0: Param( + type: null + byRef: false + variadic: false + var: Expr_Variable( + name: x + ) + default: Expr_ConstFetch( + name: Name( + parts: array( + 0: null + ) + ) + ) + ) + ) + uses: array( + 0: Expr_ClosureUse( + var: Expr_Variable( + name: f + ) + byRef: true + ) + ) + returnType: null + stmts: array( + 0: Stmt_Return( + expr: Expr_Ternary( + cond: Expr_Variable( + name: x + ) + if: null + else: Expr_Variable( + name: f + ) + ) + ) + ) ) ) + args: array( + ) + ) + args: array( + ) + ) + args: array( + ) + ) + args: array( + 0: Arg( + value: Scalar_String( + value: var_dump + ) + byRef: false + unpack: false + ) + ) + ) + args: array( + 0: Arg( + value: Scalar_LNumber( + value: 9 + ) + byRef: false + unpack: false + ) + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Variable( + name: obj + ) + byRef: false + ) + 1: Expr_ArrayItem( + key: null + value: Scalar_String( + value: id + ) + byRef: false + ) + ) + ) + args: array( + ) + ) + args: array( + 0: Arg( + value: Scalar_String( + value: id + ) + byRef: false + unpack: false + ) + ) + ) + args: array( + 0: Arg( + value: Expr_Variable( + name: id + ) + byRef: false + unpack: false + ) + ) + ) + args: array( + 0: Arg( + value: Scalar_String( + value: var_dump + ) + byRef: false + unpack: false + ) + ) + ) + args: array( + 0: Arg( + value: Scalar_LNumber( + value: 10 + ) + byRef: false + unpack: false + ) + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_FuncCall( + name: Expr_FuncCall( + name: Scalar_String( + value: id ) args: array( ) @@ -351,8 +422,8 @@ array( ) args: array( 0: Arg( - value: Expr_Variable( - name: id + value: Scalar_String( + value: var_dump ) byRef: false unpack: false @@ -361,30 +432,26 @@ array( ) args: array( 0: Arg( - value: Scalar_String( - value: var_dump + value: Scalar_LNumber( + value: 12 ) byRef: false unpack: false ) ) ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 10 - ) - byRef: false - unpack: false - ) - ) ) - 7: Expr_FuncCall( - name: Expr_FuncCall( + 8: Stmt_Expression( + expr: Expr_FuncCall( name: Expr_FuncCall( name: Expr_FuncCall( - name: Scalar_String( - value: id + name: Expr_BinaryOp_Concat( + left: Scalar_String( + value: i + ) + right: Scalar_String( + value: d + ) ) args: array( ) @@ -392,7 +459,7 @@ array( args: array( 0: Arg( value: Scalar_String( - value: id + value: var_dump ) byRef: false unpack: false @@ -401,81 +468,40 @@ array( ) args: array( 0: Arg( - value: Scalar_String( - value: var_dump + value: Scalar_LNumber( + value: 13 ) byRef: false unpack: false ) ) ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 12 - ) - byRef: false - unpack: false - ) - ) ) - 8: Expr_FuncCall( - name: Expr_FuncCall( + 9: Stmt_Expression( + expr: Expr_FuncCall( name: Expr_FuncCall( - name: Expr_BinaryOp_Concat( - left: Scalar_String( - value: i - ) - right: Scalar_String( - value: d - ) + name: Scalar_String( + value: \id ) args: array( + 0: Arg( + value: Scalar_String( + value: var_dump + ) + byRef: false + unpack: false + ) ) ) args: array( 0: Arg( - value: Scalar_String( - value: var_dump + value: Scalar_LNumber( + value: 14 ) byRef: false unpack: false ) ) ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 13 - ) - byRef: false - unpack: false - ) - ) ) - 9: Expr_FuncCall( - name: Expr_FuncCall( - name: Scalar_String( - value: \id - ) - args: array( - 0: Arg( - value: Scalar_String( - value: var_dump - ) - byRef: false - unpack: false - ) - ) - ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 14 - ) - byRef: false - unpack: false - ) - ) - ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/uvs/isset.test b/vendor/nikic/php-parser/test/code/parser/expr/uvs/isset.test index 35bc8ed1..68133a86 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/uvs/isset.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/uvs/isset.test @@ -8,67 +8,77 @@ isset("str"->a); ----- !!php7 array( - 0: Expr_Isset( - vars: array( - 0: Expr_ArrayDimFetch( - var: Expr_BinaryOp_Plus( - left: Expr_Array( + 0: Stmt_Expression( + expr: Expr_Isset( + vars: array( + 0: Expr_ArrayDimFetch( + var: Expr_BinaryOp_Plus( + left: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 0 + ) + byRef: false + ) + 1: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 1 + ) + byRef: false + ) + ) + ) + right: Expr_Array( + items: array( + ) + ) + ) + dim: Scalar_LNumber( + value: 0 + ) + ) + ) + ) + ) + 1: Stmt_Expression( + expr: Expr_Isset( + vars: array( + 0: Expr_PropertyFetch( + var: Expr_Array( items: array( 0: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 0 + key: Scalar_String( + value: a ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 1 + value: Scalar_String( + value: b ) byRef: false ) ) ) - right: Expr_Array( - items: array( - ) + name: Identifier( + name: a ) ) - dim: Scalar_LNumber( - value: 0 - ) ) ) ) - 1: Expr_Isset( - vars: array( - 0: Expr_PropertyFetch( - var: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: Scalar_String( - value: a - ) - value: Scalar_String( - value: b - ) - byRef: false - ) + 2: Stmt_Expression( + expr: Expr_Isset( + vars: array( + 0: Expr_PropertyFetch( + var: Scalar_String( + value: str + ) + name: Identifier( + name: a ) ) - name: a ) ) ) - 2: Expr_Isset( - vars: array( - 0: Expr_PropertyFetch( - var: Scalar_String( - value: str - ) - name: a - ) - ) - ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/uvs/misc.test b/vendor/nikic/php-parser/test/code/parser/expr/uvs/misc.test index 2c5ba900..73b515f0 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/uvs/misc.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/uvs/misc.test @@ -10,100 +10,118 @@ A::A[0][1][2]; ----- !!php7 array( - 0: Expr_ArrayDimFetch( - var: Expr_ClassConstFetch( - class: Name( - parts: array( - 0: A + 0: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_ClassConstFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: Identifier( + name: A ) ) - name: A - ) - dim: Scalar_LNumber( - value: 0 + dim: Scalar_LNumber( + value: 0 + ) ) ) - 1: Expr_ArrayDimFetch( - var: Expr_ArrayDimFetch( + 1: Stmt_Expression( + expr: Expr_ArrayDimFetch( var: Expr_ArrayDimFetch( - var: Expr_ClassConstFetch( - class: Name( - parts: array( - 0: A + var: Expr_ArrayDimFetch( + var: Expr_ClassConstFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: Identifier( + name: A ) ) - name: A + dim: Scalar_LNumber( + value: 0 + ) + ) + dim: Scalar_LNumber( + value: 1 + ) + ) + dim: Scalar_LNumber( + value: 2 + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_MethodCall( + var: Scalar_String( + value: string + ) + name: Identifier( + name: length + ) + args: array( + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_FuncCall( + name: Expr_ArrayDimFetch( + var: Expr_PropertyFetch( + var: Expr_Clone( + expr: Expr_Variable( + name: obj + ) + ) + name: Identifier( + name: b + ) ) dim: Scalar_LNumber( value: 0 ) ) - dim: Scalar_LNumber( + args: array( + 0: Arg( + value: Scalar_LNumber( + value: 1 + ) + byRef: false + unpack: false + ) + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_Assign( + var: Expr_ArrayDimFetch( + var: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 0 + ) + byRef: false + ) + 1: Expr_ArrayItem( + key: null + value: Scalar_LNumber( + value: 1 + ) + byRef: false + ) + ) + ) + dim: Scalar_LNumber( + value: 0 + ) + ) + expr: Scalar_LNumber( value: 1 ) ) - dim: Scalar_LNumber( - value: 2 - ) ) - 2: Expr_MethodCall( - var: Scalar_String( - value: string - ) - name: length - args: array( - ) - ) - 3: Expr_FuncCall( - name: Expr_ArrayDimFetch( - var: Expr_PropertyFetch( - var: Expr_Clone( - expr: Expr_Variable( - name: obj - ) - ) - name: b - ) - dim: Scalar_LNumber( - value: 0 - ) - ) - args: array( - 0: Arg( - value: Scalar_LNumber( - value: 1 - ) - byRef: false - unpack: false - ) - ) - ) - 4: Expr_Assign( - var: Expr_ArrayDimFetch( - var: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 0 - ) - byRef: false - ) - 1: Expr_ArrayItem( - key: null - value: Scalar_LNumber( - value: 1 - ) - byRef: false - ) - ) - ) - dim: Scalar_LNumber( - value: 0 - ) - ) - expr: Scalar_LNumber( - value: 1 - ) - ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/uvs/new.test b/vendor/nikic/php-parser/test/code/parser/expr/uvs/new.test index e5f92f97..5e1caf2f 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/uvs/new.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/uvs/new.test @@ -11,85 +11,109 @@ new $weird[0]->foo::$className; ----- !!php7 array( - 0: Expr_New( - class: Expr_Variable( - name: className - ) - args: array( - ) - ) - 1: Expr_New( - class: Expr_ArrayDimFetch( - var: Expr_Variable( - name: array - ) - dim: Scalar_String( - value: className - ) - ) - args: array( - ) - ) - 2: Expr_New( - class: Expr_ArrayDimFetch( - var: Expr_Variable( - name: array - ) - dim: Scalar_String( - value: className - ) - ) - args: array( - ) - ) - 3: Expr_New( - class: Expr_PropertyFetch( - var: Expr_Variable( - name: obj - ) - name: className - ) - args: array( - ) - ) - 4: Expr_New( - class: Expr_StaticPropertyFetch( - class: Name( - parts: array( - 0: Test - ) - ) - name: className - ) - args: array( - ) - ) - 5: Expr_New( - class: Expr_StaticPropertyFetch( + 0: Stmt_Expression( + expr: Expr_New( class: Expr_Variable( - name: test + name: className + ) + args: array( ) - name: className - ) - args: array( ) ) - 6: Expr_New( - class: Expr_StaticPropertyFetch( + 1: Stmt_Expression( + expr: Expr_New( + class: Expr_ArrayDimFetch( + var: Expr_Variable( + name: array + ) + dim: Scalar_String( + value: className + ) + ) + args: array( + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_New( + class: Expr_ArrayDimFetch( + var: Expr_Variable( + name: array + ) + dim: Scalar_String( + value: className + ) + ) + args: array( + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_New( class: Expr_PropertyFetch( - var: Expr_ArrayDimFetch( - var: Expr_Variable( - name: weird - ) - dim: Scalar_LNumber( - value: 0 + var: Expr_Variable( + name: obj + ) + name: Identifier( + name: className + ) + ) + args: array( + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_New( + class: Expr_StaticPropertyFetch( + class: Name( + parts: array( + 0: Test ) ) - name: foo + name: VarLikeIdentifier( + name: className + ) + ) + args: array( ) - name: className - ) - args: array( ) ) -) + 5: Stmt_Expression( + expr: Expr_New( + class: Expr_StaticPropertyFetch( + class: Expr_Variable( + name: test + ) + name: VarLikeIdentifier( + name: className + ) + ) + args: array( + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_New( + class: Expr_StaticPropertyFetch( + class: Expr_PropertyFetch( + var: Expr_ArrayDimFetch( + var: Expr_Variable( + name: weird + ) + dim: Scalar_LNumber( + value: 0 + ) + ) + name: Identifier( + name: foo + ) + ) + name: VarLikeIdentifier( + name: className + ) + ) + args: array( + ) + ) + ) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/uvs/staticProperty.test b/vendor/nikic/php-parser/test/code/parser/expr/uvs/staticProperty.test index 5fadfc48..bf3547ca 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/uvs/staticProperty.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/uvs/staticProperty.test @@ -12,82 +12,112 @@ A::$A::$b; ----- !!php7 array( - 0: Expr_StaticPropertyFetch( - class: Name( - parts: array( - 0: A + 0: Stmt_Expression( + expr: Expr_StaticPropertyFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: VarLikeIdentifier( + name: b ) ) - name: b ) - 1: Expr_StaticPropertyFetch( - class: Expr_Variable( - name: A + 1: Stmt_Expression( + expr: Expr_StaticPropertyFetch( + class: Expr_Variable( + name: A + ) + name: VarLikeIdentifier( + name: b + ) ) - name: b ) - 2: Expr_StaticPropertyFetch( - class: Scalar_String( - value: A - ) - name: b - ) - 3: Expr_StaticPropertyFetch( - class: Expr_BinaryOp_Concat( - left: Scalar_String( + 2: Stmt_Expression( + expr: Expr_StaticPropertyFetch( + class: Scalar_String( value: A ) - right: Scalar_String( - value: + name: VarLikeIdentifier( + name: b ) ) - name: b - ) - 4: Expr_StaticPropertyFetch( - class: Expr_ArrayDimFetch( - var: Scalar_String( - value: A - ) - dim: Scalar_LNumber( - value: 0 - ) - ) - name: b - ) - 5: Expr_StaticPropertyFetch( - class: Name( - parts: array( - 0: A - ) - ) - name: Expr_Variable( - name: b - ) ) - 6: Expr_ArrayDimFetch( - var: Expr_StaticPropertyFetch( + 3: Stmt_Expression( + expr: Expr_StaticPropertyFetch( + class: Expr_BinaryOp_Concat( + left: Scalar_String( + value: A + ) + right: Scalar_String( + value: + ) + ) + name: VarLikeIdentifier( + name: b + ) + ) + ) + 4: Stmt_Expression( + expr: Expr_StaticPropertyFetch( + class: Expr_ArrayDimFetch( + var: Scalar_String( + value: A + ) + dim: Scalar_LNumber( + value: 0 + ) + ) + name: VarLikeIdentifier( + name: b + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_StaticPropertyFetch( class: Name( parts: array( 0: A ) ) name: Expr_Variable( - name: c + name: b ) ) - dim: Scalar_LNumber( - value: 1 - ) ) - 7: Expr_StaticPropertyFetch( - class: Expr_StaticPropertyFetch( - class: Name( - parts: array( - 0: A + 6: Stmt_Expression( + expr: Expr_ArrayDimFetch( + var: Expr_StaticPropertyFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: Expr_Variable( + name: c ) ) - name: A + dim: Scalar_LNumber( + value: 1 + ) ) - name: b ) -) + 7: Stmt_Expression( + expr: Expr_StaticPropertyFetch( + class: Expr_StaticPropertyFetch( + class: Name( + parts: array( + 0: A + ) + ) + name: VarLikeIdentifier( + name: A + ) + ) + name: VarLikeIdentifier( + name: b + ) + ) + ) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/expr/variable.test b/vendor/nikic/php-parser/test/code/parser/expr/variable.test index 3a709f99..c30326cc 100644 --- a/vendor/nikic/php-parser/test/code/parser/expr/variable.test +++ b/vendor/nikic/php-parser/test/code/parser/expr/variable.test @@ -11,45 +11,57 @@ $$a['b']; ----- !!php5 array( - 0: Expr_Variable( - name: a - ) - 1: Expr_Variable( - name: Scalar_String( - value: a - ) - ) - 2: Expr_Variable( - name: Expr_FuncCall( - name: Name( - parts: array( - 0: foo - ) - ) - args: array( - ) - ) - ) - 3: Expr_Variable( - name: Expr_Variable( + 0: Stmt_Expression( + expr: Expr_Variable( name: a ) ) - 4: Expr_Variable( - name: Expr_Variable( + 1: Stmt_Expression( + expr: Expr_Variable( + name: Scalar_String( + value: a + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_Variable( + name: Expr_FuncCall( + name: Name( + parts: array( + 0: foo + ) + ) + args: array( + ) + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_Variable( name: Expr_Variable( name: a ) ) ) - 5: Expr_Variable( - name: Expr_ArrayDimFetch( - var: Expr_Variable( - name: a - ) - dim: Scalar_String( - value: b + 4: Stmt_Expression( + expr: Expr_Variable( + name: Expr_Variable( + name: Expr_Variable( + name: a + ) ) ) ) -) + 5: Stmt_Expression( + expr: Expr_Variable( + name: Expr_ArrayDimFetch( + var: Expr_Variable( + name: a + ) + dim: Scalar_String( + value: b + ) + ) + ) + ) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/exprStmtMode.test b/vendor/nikic/php-parser/test/code/parser/exprStmtMode.test new file mode 100644 index 00000000..759e9e54 --- /dev/null +++ b/vendor/nikic/php-parser/test/code/parser/exprStmtMode.test @@ -0,0 +1,57 @@ +Expression statement mode +----- + float overflows + 1: // (all are actually the same number, just in different representations) + ) + ) comments: array( 0: // various integer -> float overflows 1: // (all are actually the same number, just in different representations) ) ) - 11: Scalar_DNumber( - value: 1.844674407371E+19 + 11: Stmt_Expression( + expr: Scalar_DNumber( + value: 1.844674407371E+19 + ) ) - 12: Scalar_DNumber( - value: 1.844674407371E+19 + 12: Stmt_Expression( + expr: Scalar_DNumber( + value: 1.844674407371E+19 + ) ) - 13: Scalar_DNumber( - value: 1.844674407371E+19 + 13: Stmt_Expression( + expr: Scalar_DNumber( + value: 1.844674407371E+19 + ) ) - 14: Scalar_DNumber( - value: 1.844674407371E+19 + 14: Stmt_Expression( + expr: Scalar_DNumber( + value: 1.844674407371E+19 + ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/scalar/int.test b/vendor/nikic/php-parser/test/code/parser/scalar/int.test index 5a212677..b65858db 100644 --- a/vendor/nikic/php-parser/test/code/parser/scalar/int.test +++ b/vendor/nikic/php-parser/test/code/parser/scalar/int.test @@ -13,31 +13,49 @@ Different integer syntaxes 0b111000111000; ----- array( - 0: Scalar_LNumber( - value: 0 + 0: Stmt_Expression( + expr: Scalar_LNumber( + value: 0 + ) ) - 1: Scalar_LNumber( - value: 1 + 1: Stmt_Expression( + expr: Scalar_LNumber( + value: 1 + ) ) - 2: Scalar_LNumber( - value: @@{ PHP_INT_MAX }@@ + 2: Stmt_Expression( + expr: Scalar_LNumber( + value: @@{ PHP_INT_MAX }@@ + ) ) - 3: Scalar_DNumber( - value: @@{ PHP_INT_MAX + 1 }@@ + 3: Stmt_Expression( + expr: Scalar_DNumber( + value: @@{ PHP_INT_MAX + 1 }@@ + ) ) - 4: Scalar_LNumber( - value: 4095 + 4: Stmt_Expression( + expr: Scalar_LNumber( + value: 4095 + ) ) - 5: Scalar_LNumber( - value: 4095 + 5: Stmt_Expression( + expr: Scalar_LNumber( + value: 4095 + ) ) - 6: Scalar_LNumber( - value: 4095 + 6: Stmt_Expression( + expr: Scalar_LNumber( + value: 4095 + ) ) - 7: Scalar_LNumber( - value: 511 + 7: Stmt_Expression( + expr: Scalar_LNumber( + value: 511 + ) ) - 8: Scalar_LNumber( - value: 3640 + 8: Stmt_Expression( + expr: Scalar_LNumber( + value: 3640 + ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/scalar/invalidOctal.test b/vendor/nikic/php-parser/test/code/parser/scalar/invalidOctal.test index bef3061c..cd0cbfba 100644 --- a/vendor/nikic/php-parser/test/code/parser/scalar/invalidOctal.test +++ b/vendor/nikic/php-parser/test/code/parser/scalar/invalidOctal.test @@ -6,8 +6,10 @@ Invalid octal literals !!php7 Invalid numeric literal from 2:1 to 2:4 array( - 0: Scalar_LNumber( - value: 0 + 0: Stmt_Expression( + expr: Scalar_LNumber( + value: 0 + ) ) ) ----- @@ -16,7 +18,9 @@ array( ----- !!php5 array( - 0: Scalar_LNumber( - value: 7 + 0: Stmt_Expression( + expr: Scalar_LNumber( + value: 7 + ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/scalar/magicConst.test b/vendor/nikic/php-parser/test/code/parser/scalar/magicConst.test index 9b981eb6..520ea177 100644 --- a/vendor/nikic/php-parser/test/code/parser/scalar/magicConst.test +++ b/vendor/nikic/php-parser/test/code/parser/scalar/magicConst.test @@ -12,20 +12,36 @@ __NAMESPACE__; __TRAIT__; ----- array( - 0: Scalar_MagicConst_Class( + 0: Stmt_Expression( + expr: Scalar_MagicConst_Class( + ) ) - 1: Scalar_MagicConst_Dir( + 1: Stmt_Expression( + expr: Scalar_MagicConst_Dir( + ) ) - 2: Scalar_MagicConst_File( + 2: Stmt_Expression( + expr: Scalar_MagicConst_File( + ) ) - 3: Scalar_MagicConst_Function( + 3: Stmt_Expression( + expr: Scalar_MagicConst_Function( + ) ) - 4: Scalar_MagicConst_Line( + 4: Stmt_Expression( + expr: Scalar_MagicConst_Line( + ) ) - 5: Scalar_MagicConst_Method( + 5: Stmt_Expression( + expr: Scalar_MagicConst_Method( + ) ) - 6: Scalar_MagicConst_Namespace( + 6: Stmt_Expression( + expr: Scalar_MagicConst_Namespace( + ) ) - 7: Scalar_MagicConst_Trait( + 7: Stmt_Expression( + expr: Scalar_MagicConst_Trait( + ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/scalar/unicodeEscape.test b/vendor/nikic/php-parser/test/code/parser/scalar/unicodeEscape.test index 33a96119..95d98295 100644 --- a/vendor/nikic/php-parser/test/code/parser/scalar/unicodeEscape.test +++ b/vendor/nikic/php-parser/test/code/parser/scalar/unicodeEscape.test @@ -8,13 +8,19 @@ Unicode escape sequence ----- !!php7 array( - 0: Scalar_String( - value: @@{"\0"}@@ + 0: Stmt_Expression( + expr: Scalar_String( + value: @@{"\0"}@@ + ) ) - 1: Scalar_String( - value: Ĕ + 1: Stmt_Expression( + expr: Scalar_String( + value: Ĕ + ) ) - 2: Scalar_String( - value: @@{"\xF0\x9F\x98\x82"}@@ + 2: Stmt_Expression( + expr: Scalar_String( + value: @@{"\xF0\x9F\x98\x82"}@@ + ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/semiReserved.test b/vendor/nikic/php-parser/test/code/parser/semiReserved.test index 34105300..da155e64 100644 --- a/vendor/nikic/php-parser/test/code/parser/semiReserved.test +++ b/vendor/nikic/php-parser/test/code/parser/semiReserved.test @@ -55,7 +55,9 @@ class Foo { array( 0: Stmt_Class( flags: 0 - name: Test + name: Identifier( + name: Test + ) extends: null implements: array( ) @@ -63,7 +65,9 @@ array( 0: Stmt_ClassMethod( flags: 0 byRef: false - name: array + name: Identifier( + name: array + ) params: array( ) returnType: null @@ -73,7 +77,9 @@ array( 1: Stmt_ClassMethod( flags: 0 byRef: false - name: public + name: Identifier( + name: public + ) params: array( ) returnType: null @@ -83,7 +89,9 @@ array( 2: Stmt_ClassMethod( flags: MODIFIER_STATIC (8) byRef: false - name: list + name: Identifier( + name: list + ) params: array( ) returnType: null @@ -93,7 +101,9 @@ array( 3: Stmt_ClassMethod( flags: MODIFIER_STATIC (8) byRef: false - name: protected + name: Identifier( + name: protected + ) params: array( ) returnType: null @@ -104,7 +114,9 @@ array( flags: MODIFIER_PUBLIC (1) props: array( 0: Stmt_PropertyProperty( - name: class + name: VarLikeIdentifier( + name: class + ) default: null ) ) @@ -113,7 +125,9 @@ array( flags: MODIFIER_PUBLIC (1) props: array( 0: Stmt_PropertyProperty( - name: private + name: VarLikeIdentifier( + name: private + ) default: null ) ) @@ -122,13 +136,17 @@ array( flags: 0 consts: array( 0: Const( - name: TRAIT + name: Identifier( + name: TRAIT + ) value: Scalar_LNumber( value: 3 ) ) 1: Const( - name: FINAL + name: Identifier( + name: FINAL + ) value: Scalar_LNumber( value: 4 ) @@ -139,49 +157,65 @@ array( flags: 0 consts: array( 0: Const( - name: __CLASS__ + name: Identifier( + name: __CLASS__ + ) value: Scalar_LNumber( value: 1 ) ) 1: Const( - name: __TRAIT__ + name: Identifier( + name: __TRAIT__ + ) value: Scalar_LNumber( value: 2 ) ) 2: Const( - name: __FUNCTION__ + name: Identifier( + name: __FUNCTION__ + ) value: Scalar_LNumber( value: 3 ) ) 3: Const( - name: __METHOD__ + name: Identifier( + name: __METHOD__ + ) value: Scalar_LNumber( value: 4 ) ) 4: Const( - name: __LINE__ + name: Identifier( + name: __LINE__ + ) value: Scalar_LNumber( value: 5 ) ) 5: Const( - name: __FILE__ + name: Identifier( + name: __FILE__ + ) value: Scalar_LNumber( value: 6 ) ) 6: Const( - name: __DIR__ + name: Identifier( + name: __DIR__ + ) value: Scalar_LNumber( value: 7 ) ) 7: Const( - name: __NAMESPACE__ + name: Identifier( + name: __NAMESPACE__ + ) value: Scalar_LNumber( value: 8 ) @@ -190,87 +224,123 @@ array( ) ) ) - 1: Expr_Assign( - var: Expr_Variable( - name: t - ) - expr: Expr_New( - class: Name( - parts: array( - 0: Test + 1: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Variable( + name: t + ) + expr: Expr_New( + class: Name( + parts: array( + 0: Test + ) ) + args: array( + ) + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_MethodCall( + var: Expr_Variable( + name: t + ) + name: Identifier( + name: array ) args: array( ) ) ) - 2: Expr_MethodCall( - var: Expr_Variable( - name: t - ) - name: array - args: array( - ) - ) - 3: Expr_MethodCall( - var: Expr_Variable( - name: t - ) - name: public - args: array( - ) - ) - 4: Expr_StaticCall( - class: Name( - parts: array( - 0: Test + 3: Stmt_Expression( + expr: Expr_MethodCall( + var: Expr_Variable( + name: t + ) + name: Identifier( + name: public + ) + args: array( ) ) - name: list - args: array( - ) ) - 5: Expr_StaticCall( - class: Name( - parts: array( - 0: Test + 4: Stmt_Expression( + expr: Expr_StaticCall( + class: Name( + parts: array( + 0: Test + ) + ) + name: Identifier( + name: list + ) + args: array( ) ) - name: protected - args: array( - ) ) - 6: Expr_PropertyFetch( - var: Expr_Variable( - name: t - ) - name: class - ) - 7: Expr_PropertyFetch( - var: Expr_Variable( - name: t - ) - name: private - ) - 8: Expr_ClassConstFetch( - class: Name( - parts: array( - 0: Test + 5: Stmt_Expression( + expr: Expr_StaticCall( + class: Name( + parts: array( + 0: Test + ) + ) + name: Identifier( + name: protected + ) + args: array( ) ) - name: TRAIT ) - 9: Expr_ClassConstFetch( - class: Name( - parts: array( - 0: Test + 6: Stmt_Expression( + expr: Expr_PropertyFetch( + var: Expr_Variable( + name: t + ) + name: Identifier( + name: class + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_PropertyFetch( + var: Expr_Variable( + name: t + ) + name: Identifier( + name: private + ) + ) + ) + 8: Stmt_Expression( + expr: Expr_ClassConstFetch( + class: Name( + parts: array( + 0: Test + ) + ) + name: Identifier( + name: TRAIT + ) + ) + ) + 9: Stmt_Expression( + expr: Expr_ClassConstFetch( + class: Name( + parts: array( + 0: Test + ) + ) + name: Identifier( + name: FINAL ) ) - name: FINAL ) 10: Stmt_Class( flags: 0 - name: Foo + name: Identifier( + name: Foo + ) extends: null implements: array( ) @@ -295,7 +365,9 @@ array( 0: TraitA ) ) - method: catch + method: Identifier( + name: catch + ) insteadof: array( 0: Name_Relative( parts: array( @@ -310,9 +382,13 @@ array( 0: TraitA ) ) - method: list + method: Identifier( + name: list + ) newModifier: null - newName: foreach + newName: Identifier( + name: foreach + ) ) 2: Stmt_TraitUseAdaptation_Alias( trait: Name( @@ -320,9 +396,13 @@ array( 0: TraitB ) ) - method: throw + method: Identifier( + name: throw + ) newModifier: MODIFIER_PROTECTED (2) - newName: public + newName: Identifier( + name: public + ) ) 3: Stmt_TraitUseAdaptation_Alias( trait: Name( @@ -330,15 +410,21 @@ array( 0: TraitB ) ) - method: self + method: Identifier( + name: self + ) newModifier: MODIFIER_PROTECTED (2) newName: null ) 4: Stmt_TraitUseAdaptation_Alias( trait: null - method: exit + method: Identifier( + name: exit + ) newModifier: null - newName: die + newName: Identifier( + name: die + ) ) 5: Stmt_TraitUseAdaptation_Alias( trait: Name_FullyQualified( @@ -346,9 +432,13 @@ array( 0: TraitC ) ) - method: exit + method: Identifier( + name: exit + ) newModifier: null - newName: bye + newName: Identifier( + name: bye + ) ) 6: Stmt_TraitUseAdaptation_Alias( trait: Name_Relative( @@ -356,9 +446,13 @@ array( 0: TraitC ) ) - method: exit + method: Identifier( + name: exit + ) newModifier: null - newName: byebye + newName: Identifier( + name: byebye + ) ) 7: Stmt_TraitUseAdaptation_Precedence( trait: Name( @@ -366,7 +460,14 @@ array( 0: TraitA ) ) - method: catch + method: Identifier( + name: catch + comments: array( + 0: // + 1: /** doc comment */ + 2: # + ) + ) insteadof: array( 0: Name( parts: array( diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/blocklessStatement.test b/vendor/nikic/php-parser/test/code/parser/stmt/blocklessStatement.test index ae83dabb..abf58646 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/blocklessStatement.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/blocklessStatement.test @@ -22,8 +22,10 @@ array( name: a ) stmts: array( - 0: Expr_Variable( - name: A + 0: Stmt_Expression( + expr: Expr_Variable( + name: A + ) ) ) elseifs: array( @@ -32,16 +34,20 @@ array( name: b ) stmts: array( - 0: Expr_Variable( - name: B + 0: Stmt_Expression( + expr: Expr_Variable( + name: B + ) ) ) ) ) else: Stmt_Else( stmts: array( - 0: Expr_Variable( - name: C + 0: Stmt_Expression( + expr: Expr_Variable( + name: C + ) ) ) ) @@ -54,8 +60,10 @@ array( loop: array( ) stmts: array( - 0: Expr_Variable( - name: foo + 0: Stmt_Expression( + expr: Expr_Variable( + name: foo + ) ) ) ) @@ -69,8 +77,10 @@ array( name: b ) stmts: array( - 0: Expr_Variable( - name: AB + 0: Stmt_Expression( + expr: Expr_Variable( + name: AB + ) ) ) ) @@ -79,33 +89,41 @@ array( name: a ) stmts: array( - 0: Expr_Variable( - name: A + 0: Stmt_Expression( + expr: Expr_Variable( + name: A + ) ) ) ) 4: Stmt_Do( + stmts: array( + 0: Stmt_Expression( + expr: Expr_Variable( + name: A + ) + ) + ) cond: Expr_Variable( name: a ) - stmts: array( - 0: Expr_Variable( - name: A - ) - ) ) 5: Stmt_Declare( declares: array( 0: Stmt_DeclareDeclare( - key: a + key: Identifier( + name: a + ) value: Scalar_String( value: b ) ) ) stmts: array( - 0: Expr_Variable( - name: C + 0: Stmt_Expression( + expr: Expr_Variable( + name: C + ) ) ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/abstract.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/abstract.test index 8c9a99c7..01a82e51 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/abstract.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/abstract.test @@ -10,7 +10,9 @@ abstract class A { array( 0: Stmt_Class( flags: MODIFIER_ABSTRACT (16) - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -18,7 +20,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_PUBLIC (1) byRef: false - name: a + name: Identifier( + name: a + ) params: array( ) returnType: null @@ -28,7 +32,9 @@ array( 1: Stmt_ClassMethod( flags: MODIFIER_PUBLIC | MODIFIER_ABSTRACT (17) byRef: false - name: b + name: Identifier( + name: b + ) params: array( ) returnType: null diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/anonymous.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/anonymous.test index 266d9435..a676db68 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/anonymous.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/anonymous.test @@ -22,123 +22,137 @@ class A { } ----- array( - 0: Expr_New( - class: Stmt_Class( - flags: 0 - name: null - extends: null - implements: array( - ) - stmts: array( - 0: Stmt_ClassMethod( - flags: MODIFIER_PUBLIC (1) - byRef: false - name: test - params: array( - ) - returnType: null - stmts: array( - ) + 0: Stmt_Expression( + expr: Expr_New( + class: Stmt_Class( + flags: 0 + name: null + extends: null + implements: array( ) - ) - ) - args: array( - ) - ) - 1: Expr_New( - class: Stmt_Class( - flags: 0 - name: null - extends: Name( - parts: array( - 0: A - ) - ) - implements: array( - 0: Name( - parts: array( - 0: B - ) - ) - 1: Name( - parts: array( - 0: C - ) - ) - ) - stmts: array( - ) - ) - args: array( - ) - ) - 2: Expr_New( - class: Stmt_Class( - flags: 0 - name: null - extends: null - implements: array( - ) - stmts: array( - 0: Stmt_Property( - flags: MODIFIER_PUBLIC (1) - props: array( - 0: Stmt_PropertyProperty( - name: foo - default: null + stmts: array( + 0: Stmt_ClassMethod( + flags: MODIFIER_PUBLIC (1) + byRef: false + name: Identifier( + name: test + ) + params: array( + ) + returnType: null + stmts: array( ) ) ) ) - ) - args: array( + args: array( + ) ) ) - 3: Expr_New( - class: Stmt_Class( - flags: 0 - name: null - extends: Name( - parts: array( - 0: A + 1: Stmt_Expression( + expr: Expr_New( + class: Stmt_Class( + flags: 0 + name: null + extends: Name( + parts: array( + 0: A + ) + ) + implements: array( + 0: Name( + parts: array( + 0: B + ) + ) + 1: Name( + parts: array( + 0: C + ) + ) + ) + stmts: array( ) ) - implements: array( + args: array( ) - stmts: array( - 0: Stmt_TraitUse( - traits: array( - 0: Name( - parts: array( - 0: T + ) + ) + 2: Stmt_Expression( + expr: Expr_New( + class: Stmt_Class( + flags: 0 + name: null + extends: null + implements: array( + ) + stmts: array( + 0: Stmt_Property( + flags: MODIFIER_PUBLIC (1) + props: array( + 0: Stmt_PropertyProperty( + name: VarLikeIdentifier( + name: foo + ) + default: null ) ) ) - adaptations: array( + ) + ) + args: array( + ) + ) + ) + 3: Stmt_Expression( + expr: Expr_New( + class: Stmt_Class( + flags: 0 + name: null + extends: Name( + parts: array( + 0: A + ) + ) + implements: array( + ) + stmts: array( + 0: Stmt_TraitUse( + traits: array( + 0: Name( + parts: array( + 0: T + ) + ) + ) + adaptations: array( + ) ) ) ) - ) - args: array( - 0: Arg( - value: Expr_Variable( - name: a + args: array( + 0: Arg( + value: Expr_Variable( + name: a + ) + byRef: false + unpack: false ) - byRef: false - unpack: false - ) - 1: Arg( - value: Expr_Variable( - name: b + 1: Arg( + value: Expr_Variable( + name: b + ) + byRef: false + unpack: false ) - byRef: false - unpack: false ) ) ) 4: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -146,7 +160,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_PUBLIC (1) byRef: false - name: test + name: Identifier( + name: test + ) params: array( ) returnType: null @@ -168,7 +184,9 @@ array( flags: 0 consts: array( 0: Const( - name: A + name: Identifier( + name: A + ) value: Scalar_String( value: B ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/conditional.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/conditional.test index e18090c7..40a93508 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/conditional.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/conditional.test @@ -18,7 +18,9 @@ array( stmts: array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/constModifierErrors.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/constModifierErrors.test index b3604ed6..a6aa7972 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/constModifierErrors.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/constModifierErrors.test @@ -10,7 +10,9 @@ Cannot use 'static' as constant modifier from 3:5 to 3:10 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -19,7 +21,9 @@ array( flags: MODIFIER_STATIC (8) consts: array( 0: Const( - name: X + name: Identifier( + name: X + ) value: Scalar_LNumber( value: 1 ) @@ -40,7 +44,9 @@ Cannot use 'abstract' as constant modifier from 3:5 to 3:12 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -49,7 +55,9 @@ array( flags: MODIFIER_ABSTRACT (16) consts: array( 0: Const( - name: X + name: Identifier( + name: X + ) value: Scalar_LNumber( value: 1 ) @@ -70,7 +78,9 @@ Cannot use 'final' as constant modifier from 3:5 to 3:9 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -79,7 +89,9 @@ array( flags: MODIFIER_FINAL (32) consts: array( 0: Const( - name: X + name: Identifier( + name: X + ) value: Scalar_LNumber( value: 1 ) @@ -100,7 +112,9 @@ Multiple access type modifiers are not allowed from 3:12 to 3:17 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -109,7 +123,9 @@ array( flags: MODIFIER_PUBLIC (1) consts: array( 0: Const( - name: X + name: Identifier( + name: X + ) value: Scalar_LNumber( value: 1 ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/constModifiers.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/constModifiers.test index 7129d284..24d72198 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/constModifiers.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/constModifiers.test @@ -13,7 +13,9 @@ class Foo { array( 0: Stmt_Class( flags: 0 - name: Foo + name: Identifier( + name: Foo + ) extends: null implements: array( ) @@ -22,7 +24,9 @@ array( flags: 0 consts: array( 0: Const( - name: A + name: Identifier( + name: A + ) value: Scalar_LNumber( value: 1 ) @@ -33,7 +37,9 @@ array( flags: MODIFIER_PUBLIC (1) consts: array( 0: Const( - name: B + name: Identifier( + name: B + ) value: Scalar_LNumber( value: 2 ) @@ -44,7 +50,9 @@ array( flags: MODIFIER_PROTECTED (2) consts: array( 0: Const( - name: C + name: Identifier( + name: C + ) value: Scalar_LNumber( value: 3 ) @@ -55,7 +63,9 @@ array( flags: MODIFIER_PRIVATE (4) consts: array( 0: Const( - name: D + name: Identifier( + name: D + ) value: Scalar_LNumber( value: 4 ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/final.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/final.test index 86cc4586..ecb7a5c3 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/final.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/final.test @@ -7,7 +7,9 @@ final class A {} array( 0: Stmt_Class( flags: MODIFIER_FINAL (32) - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/implicitPublic.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/implicitPublic.test index 08452c15..bd43dce9 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/implicitPublic.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/implicitPublic.test @@ -15,7 +15,9 @@ abstract class A { array( 0: Stmt_Class( flags: MODIFIER_ABSTRACT (16) - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -24,7 +26,9 @@ array( flags: 0 props: array( 0: Stmt_PropertyProperty( - name: a + name: VarLikeIdentifier( + name: a + ) default: null ) ) @@ -33,7 +37,9 @@ array( flags: MODIFIER_STATIC (8) props: array( 0: Stmt_PropertyProperty( - name: b + name: VarLikeIdentifier( + name: b + ) default: null ) ) @@ -41,7 +47,9 @@ array( 2: Stmt_ClassMethod( flags: MODIFIER_ABSTRACT (16) byRef: false - name: c + name: Identifier( + name: c + ) params: array( ) returnType: null @@ -50,7 +58,9 @@ array( 3: Stmt_ClassMethod( flags: MODIFIER_FINAL (32) byRef: false - name: d + name: Identifier( + name: d + ) params: array( ) returnType: null @@ -60,7 +70,9 @@ array( 4: Stmt_ClassMethod( flags: MODIFIER_STATIC (8) byRef: false - name: e + name: Identifier( + name: e + ) params: array( ) returnType: null @@ -70,7 +82,9 @@ array( 5: Stmt_ClassMethod( flags: MODIFIER_STATIC | MODIFIER_FINAL (40) byRef: false - name: f + name: Identifier( + name: f + ) params: array( ) returnType: null @@ -80,7 +94,9 @@ array( 6: Stmt_ClassMethod( flags: 0 byRef: false - name: g + name: Identifier( + name: g + ) params: array( ) returnType: null diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/interface.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/interface.test index d00bdbdc..7ac15970 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/interface.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/interface.test @@ -8,7 +8,9 @@ interface A extends C, D { ----- array( 0: Stmt_Interface( - name: A + name: Identifier( + name: A + ) extends: array( 0: Name( parts: array( @@ -25,7 +27,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_PUBLIC (1) byRef: false - name: a + name: Identifier( + name: a + ) params: array( ) returnType: null diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/modifier.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/modifier.test index 5a1fd3fc..cbeb57e1 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/modifier.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/modifier.test @@ -6,7 +6,9 @@ Multiple access type modifiers are not allowed from 1:24 to 1:29 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -15,7 +17,9 @@ array( flags: MODIFIER_PUBLIC (1) props: array( 0: Stmt_PropertyProperty( - name: a + name: VarLikeIdentifier( + name: a + ) default: null ) ) @@ -30,7 +34,9 @@ Multiple access type modifiers are not allowed from 1:24 to 1:32 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -39,7 +45,9 @@ array( flags: MODIFIER_PUBLIC | MODIFIER_PROTECTED (3) props: array( 0: Stmt_PropertyProperty( - name: a + name: VarLikeIdentifier( + name: a + ) default: null ) ) @@ -54,7 +62,9 @@ Multiple abstract modifiers are not allowed from 1:26 to 1:33 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -62,7 +72,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_ABSTRACT (16) byRef: false - name: a + name: Identifier( + name: a + ) params: array( ) returnType: null @@ -78,7 +90,9 @@ Multiple static modifiers are not allowed from 1:24 to 1:29 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -87,7 +101,9 @@ array( flags: MODIFIER_STATIC (8) props: array( 0: Stmt_PropertyProperty( - name: a + name: VarLikeIdentifier( + name: a + ) default: null ) ) @@ -102,7 +118,9 @@ Multiple final modifiers are not allowed from 1:23 to 1:27 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -110,7 +128,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_FINAL (32) byRef: false - name: a + name: Identifier( + name: a + ) params: array( ) returnType: null @@ -127,7 +147,9 @@ Cannot use the final modifier on an abstract class member from 1:26 to 1:30 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -135,7 +157,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_ABSTRACT | MODIFIER_FINAL (48) byRef: false - name: a + name: Identifier( + name: a + ) params: array( ) returnType: null @@ -152,7 +176,9 @@ Syntax error, unexpected T_FINAL, expecting T_CLASS from 1:16 to 1:20 array( 0: Stmt_Class( flags: MODIFIER_FINAL (32) - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -172,7 +198,9 @@ Properties cannot be declared abstract from 1:17 to 1:24 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -181,7 +209,9 @@ array( flags: MODIFIER_ABSTRACT (16) props: array( 0: Stmt_PropertyProperty( - name: a + name: VarLikeIdentifier( + name: a + ) default: null ) ) @@ -196,7 +226,9 @@ Properties cannot be declared final from 1:17 to 1:21 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -205,11 +237,13 @@ array( flags: MODIFIER_FINAL (32) props: array( 0: Stmt_PropertyProperty( - name: a + name: VarLikeIdentifier( + name: a + ) default: null ) ) ) ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/name.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/name.test index d5333052..40cb2fe2 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/name.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/name.test @@ -6,7 +6,9 @@ Cannot use 'self' as class name as it is reserved from 1:13 to 1:16 array( 0: Stmt_Class( flags: 0 - name: self + name: Identifier( + name: self + ) extends: null implements: array( ) @@ -21,7 +23,9 @@ Cannot use 'PARENT' as class name as it is reserved from 1:13 to 1:18 array( 0: Stmt_Class( flags: 0 - name: PARENT + name: Identifier( + name: PARENT + ) extends: null implements: array( ) @@ -42,7 +46,9 @@ Cannot use 'self' as class name as it is reserved from 1:23 to 1:26 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: Name( parts: array( 0: self @@ -61,7 +67,9 @@ Cannot use 'PARENT' as class name as it is reserved from 1:23 to 1:28 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: Name( parts: array( 0: PARENT @@ -80,7 +88,9 @@ Cannot use 'static' as class name as it is reserved from 1:23 to 1:28 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: Name( parts: array( 0: static @@ -99,7 +109,9 @@ Cannot use 'self' as interface name as it is reserved from 1:26 to 1:29 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( 0: Name( @@ -119,7 +131,9 @@ Cannot use 'PARENT' as interface name as it is reserved from 1:26 to 1:31 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( 0: Name( @@ -139,7 +153,9 @@ Cannot use 'static' as interface name as it is reserved from 1:26 to 1:31 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( 0: Name( @@ -158,7 +174,9 @@ array( Cannot use 'self' as class name as it is reserved from 1:17 to 1:20 array( 0: Stmt_Interface( - name: self + name: Identifier( + name: self + ) extends: array( ) stmts: array( @@ -171,7 +189,9 @@ array( Cannot use 'PARENT' as class name as it is reserved from 1:17 to 1:22 array( 0: Stmt_Interface( - name: PARENT + name: Identifier( + name: PARENT + ) extends: array( ) stmts: array( @@ -190,7 +210,9 @@ array( Cannot use 'self' as interface name as it is reserved from 1:27 to 1:30 array( 0: Stmt_Interface( - name: A + name: Identifier( + name: A + ) extends: array( 0: Name( parts: array( @@ -208,7 +230,9 @@ array( Cannot use 'PARENT' as interface name as it is reserved from 1:27 to 1:32 array( 0: Stmt_Interface( - name: A + name: Identifier( + name: A + ) extends: array( 0: Name( parts: array( @@ -226,7 +250,9 @@ array( Cannot use 'static' as interface name as it is reserved from 1:27 to 1:32 array( 0: Stmt_Interface( - name: A + name: Identifier( + name: A + ) extends: array( 0: Name( parts: array( diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/php4Style.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/php4Style.test index e459e175..d6070b88 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/php4Style.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/php4Style.test @@ -11,7 +11,9 @@ class A { array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -20,7 +22,9 @@ array( flags: 0 props: array( 0: Stmt_PropertyProperty( - name: foo + name: VarLikeIdentifier( + name: foo + ) default: null ) ) @@ -28,7 +32,9 @@ array( 1: Stmt_ClassMethod( flags: 0 byRef: false - name: bar + name: Identifier( + name: bar + ) params: array( ) returnType: null @@ -38,7 +44,9 @@ array( 2: Stmt_ClassMethod( flags: MODIFIER_ABSTRACT | MODIFIER_STATIC (24) byRef: false - name: baz + name: Identifier( + name: baz + ) params: array( ) returnType: null diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/simple.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/simple.test index b2f89944..9247eec9 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/simple.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/simple.test @@ -19,7 +19,9 @@ class A extends B implements C, D { array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: Name( parts: array( 0: B @@ -42,13 +44,17 @@ array( flags: 0 consts: array( 0: Const( - name: A + name: Identifier( + name: A + ) value: Scalar_String( value: B ) ) 1: Const( - name: C + name: Identifier( + name: C + ) value: Scalar_String( value: D ) @@ -59,13 +65,17 @@ array( flags: MODIFIER_PUBLIC (1) props: array( 0: Stmt_PropertyProperty( - name: a + name: VarLikeIdentifier( + name: a + ) default: Scalar_String( value: b ) ) 1: Stmt_PropertyProperty( - name: c + name: VarLikeIdentifier( + name: c + ) default: Scalar_String( value: d ) @@ -76,7 +86,9 @@ array( flags: MODIFIER_PROTECTED (2) props: array( 0: Stmt_PropertyProperty( - name: e + name: VarLikeIdentifier( + name: e + ) default: null ) ) @@ -85,7 +97,9 @@ array( flags: MODIFIER_PRIVATE (4) props: array( 0: Stmt_PropertyProperty( - name: f + name: VarLikeIdentifier( + name: f + ) default: null ) ) @@ -93,7 +107,9 @@ array( 4: Stmt_ClassMethod( flags: MODIFIER_PUBLIC (1) byRef: false - name: a + name: Identifier( + name: a + ) params: array( ) returnType: null @@ -103,13 +119,17 @@ array( 5: Stmt_ClassMethod( flags: MODIFIER_PUBLIC | MODIFIER_STATIC (9) byRef: false - name: b + name: Identifier( + name: b + ) params: array( 0: Param( type: null byRef: false variadic: false - name: a + var: Expr_Variable( + name: a + ) default: null ) ) @@ -120,7 +140,9 @@ array( 6: Stmt_ClassMethod( flags: MODIFIER_PUBLIC | MODIFIER_FINAL (33) byRef: false - name: c + name: Identifier( + name: c + ) params: array( ) returnType: Name( @@ -134,7 +156,9 @@ array( 7: Stmt_ClassMethod( flags: MODIFIER_PROTECTED (2) byRef: false - name: d + name: Identifier( + name: d + ) params: array( ) returnType: null @@ -144,7 +168,9 @@ array( 8: Stmt_ClassMethod( flags: MODIFIER_PRIVATE (4) byRef: false - name: e + name: Identifier( + name: e + ) params: array( ) returnType: null diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/staticMethod.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/staticMethod.test index 225596ac..0540930e 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/staticMethod.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/staticMethod.test @@ -6,7 +6,9 @@ Constructor __construct() cannot be static from 1:17 to 1:22 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -14,7 +16,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_STATIC (8) byRef: false - name: __construct + name: Identifier( + name: __construct + ) params: array( ) returnType: null @@ -31,7 +35,9 @@ Destructor __destruct() cannot be static from 1:17 to 1:22 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -39,7 +45,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_STATIC (8) byRef: false - name: __destruct + name: Identifier( + name: __destruct + ) params: array( ) returnType: null @@ -56,7 +64,9 @@ Clone method __clone() cannot be static from 1:17 to 1:22 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -64,7 +74,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_STATIC (8) byRef: false - name: __clone + name: Identifier( + name: __clone + ) params: array( ) returnType: null @@ -81,7 +93,9 @@ Constructor __CONSTRUCT() cannot be static from 1:17 to 1:22 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -89,7 +103,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_STATIC (8) byRef: false - name: __CONSTRUCT + name: Identifier( + name: __CONSTRUCT + ) params: array( ) returnType: null @@ -106,7 +122,9 @@ Destructor __Destruct() cannot be static from 1:17 to 1:22 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -114,7 +132,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_STATIC (8) byRef: false - name: __Destruct + name: Identifier( + name: __Destruct + ) params: array( ) returnType: null @@ -131,7 +151,9 @@ Clone method __cLoNe() cannot be static from 1:17 to 1:22 array( 0: Stmt_Class( flags: 0 - name: A + name: Identifier( + name: A + ) extends: null implements: array( ) @@ -139,7 +161,9 @@ array( 0: Stmt_ClassMethod( flags: MODIFIER_STATIC (8) byRef: false - name: __cLoNe + name: Identifier( + name: __cLoNe + ) params: array( ) returnType: null diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/class/trait.test b/vendor/nikic/php-parser/test/code/parser/stmt/class/trait.test index 75c6ec66..bda3cc56 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/class/trait.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/class/trait.test @@ -23,12 +23,16 @@ class B { ----- array( 0: Stmt_Trait( - name: A + name: Identifier( + name: A + ) stmts: array( 0: Stmt_ClassMethod( flags: MODIFIER_PUBLIC (1) byRef: false - name: a + name: Identifier( + name: a + ) params: array( ) returnType: null @@ -39,7 +43,9 @@ array( ) 1: Stmt_Class( flags: 0 - name: B + name: Identifier( + name: B + ) extends: null implements: array( ) @@ -66,19 +72,29 @@ array( adaptations: array( 0: Stmt_TraitUseAdaptation_Alias( trait: null - method: a + method: Identifier( + name: a + ) newModifier: MODIFIER_PROTECTED (2) - newName: b + newName: Identifier( + name: b + ) ) 1: Stmt_TraitUseAdaptation_Alias( trait: null - method: c + method: Identifier( + name: c + ) newModifier: null - newName: d + newName: Identifier( + name: d + ) ) 2: Stmt_TraitUseAdaptation_Alias( trait: null - method: e + method: Identifier( + name: e + ) newModifier: MODIFIER_PRIVATE (4) newName: null ) @@ -109,7 +125,9 @@ array( 0: E ) ) - method: a + method: Identifier( + name: a + ) insteadof: array( 0: Name( parts: array( @@ -129,9 +147,13 @@ array( 0: E ) ) - method: b + method: Identifier( + name: b + ) newModifier: MODIFIER_PROTECTED (2) - newName: c + newName: Identifier( + name: c + ) ) 2: Stmt_TraitUseAdaptation_Alias( trait: Name( @@ -139,9 +161,13 @@ array( 0: E ) ) - method: d + method: Identifier( + name: d + ) newModifier: null - newName: e + newName: Identifier( + name: e + ) ) 3: Stmt_TraitUseAdaptation_Alias( trait: Name( @@ -149,7 +175,9 @@ array( 0: E ) ) - method: f + method: Identifier( + name: f + ) newModifier: MODIFIER_PRIVATE (4) newName: null ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/const.test b/vendor/nikic/php-parser/test/code/parser/stmt/const.test index da21f416..e6c4db84 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/const.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/const.test @@ -8,25 +8,33 @@ array( 0: Stmt_Const( consts: array( 0: Const( - name: A + name: Identifier( + name: A + ) value: Scalar_LNumber( value: 0 ) ) 1: Const( - name: B + name: Identifier( + name: B + ) value: Scalar_DNumber( value: 1 ) ) 2: Const( - name: C + name: Identifier( + name: C + ) value: Scalar_String( value: A ) ) 3: Const( - name: D + name: Identifier( + name: D + ) value: Expr_ConstFetch( name: Name( parts: array( diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/controlFlow.test b/vendor/nikic/php-parser/test/code/parser/stmt/controlFlow.test index 2de1c4f2..d9c9fcf3 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/controlFlow.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/controlFlow.test @@ -47,9 +47,13 @@ array( ) ) 7: Stmt_Label( - name: label + name: Identifier( + name: label + ) ) 8: Stmt_Goto( - name: label + name: Identifier( + name: label + ) ) ) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/declare.test b/vendor/nikic/php-parser/test/code/parser/stmt/declare.test index 93afe67b..f044d24f 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/declare.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/declare.test @@ -13,7 +13,9 @@ array( 0: Stmt_Declare( declares: array( 0: Stmt_DeclareDeclare( - key: X + key: Identifier( + name: X + ) value: Scalar_String( value: Y ) @@ -24,13 +26,17 @@ array( 1: Stmt_Declare( declares: array( 0: Stmt_DeclareDeclare( - key: A + key: Identifier( + name: A + ) value: Scalar_String( value: B ) ) 1: Stmt_DeclareDeclare( - key: C + key: Identifier( + name: C + ) value: Scalar_String( value: D ) @@ -42,13 +48,17 @@ array( 2: Stmt_Declare( declares: array( 0: Stmt_DeclareDeclare( - key: A + key: Identifier( + name: A + ) value: Scalar_String( value: B ) ) 1: Stmt_DeclareDeclare( - key: C + key: Identifier( + name: C + ) value: Scalar_String( value: D ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/builtinTypeDeclarations.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/builtinTypeDeclarations.test index aecced5d..b90fd019 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/builtinTypeDeclarations.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/builtinTypeDeclarations.test @@ -7,52 +7,80 @@ function test(bool $a, Int $b, FLOAT $c, StRiNg $d, iterable $e, object $f) : vo array( 0: Stmt_Function( byRef: false - name: test + name: Identifier( + name: test + ) params: array( 0: Param( - type: bool + type: Identifier( + name: bool + ) byRef: false variadic: false - name: a + var: Expr_Variable( + name: a + ) default: null ) 1: Param( - type: int + type: Identifier( + name: int + ) byRef: false variadic: false - name: b + var: Expr_Variable( + name: b + ) default: null ) 2: Param( - type: float + type: Identifier( + name: float + ) byRef: false variadic: false - name: c + var: Expr_Variable( + name: c + ) default: null ) 3: Param( - type: string + type: Identifier( + name: string + ) byRef: false variadic: false - name: d + var: Expr_Variable( + name: d + ) default: null ) 4: Param( - type: iterable + type: Identifier( + name: iterable + ) byRef: false variadic: false - name: e + var: Expr_Variable( + name: e + ) default: null ) 5: Param( - type: object + type: Identifier( + name: object + ) byRef: false variadic: false - name: f + var: Expr_Variable( + name: f + ) default: null ) ) - returnType: void + returnType: Identifier( + name: void + ) stmts: array( ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/byRef.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/byRef.test index 1c1669c1..4b276e73 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/byRef.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/byRef.test @@ -8,13 +8,17 @@ function &a($b) {} array( 0: Stmt_Function( byRef: false - name: a + name: Identifier( + name: a + ) params: array( 0: Param( type: null byRef: true variadic: false - name: b + var: Expr_Variable( + name: b + ) default: null ) ) @@ -24,13 +28,17 @@ array( ) 1: Stmt_Function( byRef: true - name: a + name: Identifier( + name: a + ) params: array( 0: Param( type: null byRef: false variadic: false - name: b + var: Expr_Variable( + name: b + ) default: null ) ) @@ -38,4 +46,4 @@ array( stmts: array( ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/conditional.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/conditional.test index d9c886ed..8495aad1 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/conditional.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/conditional.test @@ -18,7 +18,9 @@ array( stmts: array( 0: Stmt_Function( byRef: false - name: A + name: Identifier( + name: A + ) params: array( ) returnType: null @@ -30,4 +32,4 @@ array( ) else: null ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/defaultValues.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/defaultValues.test index d77d4f35..6ae96fa6 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/defaultValues.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/defaultValues.test @@ -17,13 +17,17 @@ function a( array( 0: Stmt_Function( byRef: false - name: a + name: Identifier( + name: a + ) params: array( 0: Param( type: null byRef: false variadic: false - name: b + var: Expr_Variable( + name: b + ) default: Expr_ConstFetch( name: Name( parts: array( @@ -36,7 +40,9 @@ array( type: null byRef: false variadic: false - name: c + var: Expr_Variable( + name: c + ) default: Scalar_String( value: foo ) @@ -45,21 +51,27 @@ array( type: null byRef: false variadic: false - name: d + var: Expr_Variable( + name: d + ) default: Expr_ClassConstFetch( class: Name( parts: array( 0: A ) ) - name: B + name: Identifier( + name: B + ) ) ) 3: Param( type: null byRef: false variadic: false - name: f + var: Expr_Variable( + name: f + ) default: Expr_UnaryPlus( expr: Scalar_LNumber( value: 1 @@ -70,7 +82,9 @@ array( type: null byRef: false variadic: false - name: g + var: Expr_Variable( + name: g + ) default: Expr_UnaryMinus( expr: Scalar_DNumber( value: 1 @@ -81,7 +95,9 @@ array( type: null byRef: false variadic: false - name: h + var: Expr_Variable( + name: h + ) default: Expr_Array( items: array( ) @@ -91,7 +107,9 @@ array( type: null byRef: false variadic: false - name: i + var: Expr_Variable( + name: i + ) default: Expr_Array( items: array( ) @@ -101,7 +119,9 @@ array( type: null byRef: false variadic: false - name: j + var: Expr_Variable( + name: j + ) default: Expr_Array( items: array( 0: Expr_ArrayItem( @@ -118,7 +138,9 @@ array( type: null byRef: false variadic: false - name: k + var: Expr_Variable( + name: k + ) default: Expr_Array( items: array( 0: Expr_ArrayItem( @@ -145,4 +167,4 @@ array( stmts: array( ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/nullableTypes.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/nullableTypes.test index d96df4fa..8bf2d31d 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/nullableTypes.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/nullableTypes.test @@ -9,7 +9,9 @@ function test(?Foo $bar, ?string $foo) : ?Baz { array( 0: Stmt_Function( byRef: false - name: test + name: Identifier( + name: test + ) params: array( 0: Param( type: NullableType( @@ -21,16 +23,22 @@ array( ) byRef: false variadic: false - name: bar + var: Expr_Variable( + name: bar + ) default: null ) 1: Param( type: NullableType( - type: string + type: Identifier( + name: string + ) ) byRef: false variadic: false - name: foo + var: Expr_Variable( + name: foo + ) default: null ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/returnTypes.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/returnTypes.test index ca6c3106..8b71595e 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/returnTypes.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/returnTypes.test @@ -10,7 +10,9 @@ function test4() : Foo\Bar {} array( 0: Stmt_Function( byRef: false - name: test1 + name: Identifier( + name: test1 + ) params: array( ) returnType: null @@ -19,25 +21,35 @@ array( ) 1: Stmt_Function( byRef: false - name: test2 + name: Identifier( + name: test2 + ) params: array( ) - returnType: array + returnType: Identifier( + name: array + ) stmts: array( ) ) 2: Stmt_Function( byRef: false - name: test3 + name: Identifier( + name: test3 + ) params: array( ) - returnType: callable + returnType: Identifier( + name: callable + ) stmts: array( ) ) 3: Stmt_Function( byRef: false - name: test4 + name: Identifier( + name: test4 + ) params: array( ) returnType: Name( @@ -49,4 +61,4 @@ array( stmts: array( ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/specialVars.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/specialVars.test index f2f35acf..10a9e079 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/specialVars.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/specialVars.test @@ -10,7 +10,9 @@ function a() { array( 0: Stmt_Function( byRef: false - name: a + name: Identifier( + name: a + ) params: array( ) returnType: null @@ -35,11 +37,15 @@ array( 1: Stmt_Static( vars: array( 0: Stmt_StaticVar( - name: c + var: Expr_Variable( + name: c + ) default: null ) 1: Stmt_StaticVar( - name: d + var: Expr_Variable( + name: d + ) default: Scalar_String( value: e ) @@ -48,4 +54,4 @@ array( ) ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/typeDeclarations.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/typeDeclarations.test index 53c462c5..8327cf32 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/typeDeclarations.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/typeDeclarations.test @@ -7,27 +7,39 @@ function a($b, array $c, callable $d, E $f) {} array( 0: Stmt_Function( byRef: false - name: a + name: Identifier( + name: a + ) params: array( 0: Param( type: null byRef: false variadic: false - name: b + var: Expr_Variable( + name: b + ) default: null ) 1: Param( - type: array + type: Identifier( + name: array + ) byRef: false variadic: false - name: c + var: Expr_Variable( + name: c + ) default: null ) 2: Param( - type: callable + type: Identifier( + name: callable + ) byRef: false variadic: false - name: d + var: Expr_Variable( + name: d + ) default: null ) 3: Param( @@ -38,7 +50,9 @@ array( ) byRef: false variadic: false - name: f + var: Expr_Variable( + name: f + ) default: null ) ) @@ -46,4 +60,4 @@ array( stmts: array( ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/variadic.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/variadic.test index f9d848c7..afbcf68f 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/variadic.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/variadic.test @@ -9,20 +9,26 @@ function test($a, Type &... $b) {} array( 0: Stmt_Function( byRef: false - name: test + name: Identifier( + name: test + ) params: array( 0: Param( type: null byRef: false variadic: false - name: a + var: Expr_Variable( + name: a + ) default: null ) 1: Param( type: null byRef: false variadic: true - name: b + var: Expr_Variable( + name: b + ) default: null ) ) @@ -32,20 +38,26 @@ array( ) 1: Stmt_Function( byRef: false - name: test + name: Identifier( + name: test + ) params: array( 0: Param( type: null byRef: false variadic: false - name: a + var: Expr_Variable( + name: a + ) default: null ) 1: Param( type: null byRef: true variadic: true - name: b + var: Expr_Variable( + name: b + ) default: null ) ) @@ -55,13 +67,17 @@ array( ) 2: Stmt_Function( byRef: false - name: test + name: Identifier( + name: test + ) params: array( 0: Param( type: null byRef: false variadic: false - name: a + var: Expr_Variable( + name: a + ) default: null ) 1: Param( @@ -72,7 +88,9 @@ array( ) byRef: false variadic: true - name: b + var: Expr_Variable( + name: b + ) default: null ) ) @@ -82,13 +100,17 @@ array( ) 3: Stmt_Function( byRef: false - name: test + name: Identifier( + name: test + ) params: array( 0: Param( type: null byRef: false variadic: false - name: a + var: Expr_Variable( + name: a + ) default: null ) 1: Param( @@ -99,7 +121,9 @@ array( ) byRef: true variadic: true - name: b + var: Expr_Variable( + name: b + ) default: null ) ) @@ -107,4 +131,4 @@ array( stmts: array( ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/function/variadicDefaultValue.test b/vendor/nikic/php-parser/test/code/parser/stmt/function/variadicDefaultValue.test index 0c3714f2..0431f39a 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/function/variadicDefaultValue.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/function/variadicDefaultValue.test @@ -7,13 +7,17 @@ Variadic parameter cannot have a default value from 2:24 to 2:25 array( 0: Stmt_Function( byRef: false - name: foo + name: Identifier( + name: foo + ) params: array( 0: Param( type: null byRef: false variadic: true - name: foo + var: Expr_Variable( + name: foo + ) default: Expr_Array( items: array( ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/generator/basic.test b/vendor/nikic/php-parser/test/code/parser/stmt/generator/basic.test index 8a184aaf..78ea9c09 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/generator/basic.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/generator/basic.test @@ -34,51 +34,26 @@ function gen() { array( 0: Stmt_Function( byRef: false - name: gen + name: Identifier( + name: gen + ) params: array( ) returnType: null stmts: array( - 0: Expr_Yield( - key: null - value: null + 0: Stmt_Expression( + expr: Expr_Yield( + key: null + value: null + comments: array( + 0: // statements + ) + ) comments: array( 0: // statements ) ) - 1: Expr_Yield( - key: null - value: Expr_Variable( - name: value - ) - ) - 2: Expr_Yield( - key: Expr_Variable( - name: key - ) - value: Expr_Variable( - name: value - ) - ) - 3: Expr_Assign( - var: Expr_Variable( - name: data - comments: array( - 0: // expressions - ) - ) - expr: Expr_Yield( - key: null - value: null - ) - comments: array( - 0: // expressions - ) - ) - 4: Expr_Assign( - var: Expr_Variable( - name: data - ) + 1: Stmt_Expression( expr: Expr_Yield( key: null value: Expr_Variable( @@ -86,10 +61,7 @@ array( ) ) ) - 5: Expr_Assign( - var: Expr_Variable( - name: data - ) + 2: Stmt_Expression( expr: Expr_Yield( key: Expr_Variable( name: key @@ -99,6 +71,54 @@ array( ) ) ) + 3: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Variable( + name: data + comments: array( + 0: // expressions + ) + ) + expr: Expr_Yield( + key: null + value: null + ) + comments: array( + 0: // expressions + ) + ) + comments: array( + 0: // expressions + ) + ) + 4: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Variable( + name: data + ) + expr: Expr_Yield( + key: null + value: Expr_Variable( + name: value + ) + ) + ) + ) + 5: Stmt_Expression( + expr: Expr_Assign( + var: Expr_Variable( + name: data + ) + expr: Expr_Yield( + key: Expr_Variable( + name: key + ) + value: Expr_Variable( + name: value + ) + ) + ) + ) 6: Stmt_If( cond: Expr_Yield( key: null @@ -159,14 +179,14 @@ array( ) ) 9: Stmt_Do( + stmts: array( + ) cond: Expr_Yield( key: null value: Expr_Variable( name: foo ) ) - stmts: array( - ) ) 10: Stmt_Switch( cond: Expr_Yield( @@ -178,100 +198,119 @@ array( cases: array( ) ) - 11: Expr_Exit( - expr: Expr_Yield( - key: null - value: Expr_Variable( - name: foo + 11: Stmt_Expression( + expr: Expr_Exit( + expr: Expr_Yield( + key: null + value: Expr_Variable( + name: foo + ) ) ) ) - 12: Expr_FuncCall( - name: Name( - parts: array( - 0: func + 12: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: func + ) + comments: array( + 0: // yield in function calls + ) + ) + args: array( + 0: Arg( + value: Expr_Yield( + key: null + value: Expr_Variable( + name: foo + ) + ) + byRef: false + unpack: false + ) ) comments: array( 0: // yield in function calls ) ) - args: array( - 0: Arg( - value: Expr_Yield( - key: null - value: Expr_Variable( - name: foo - ) - ) - byRef: false - unpack: false - ) - ) comments: array( 0: // yield in function calls ) ) - 13: Expr_MethodCall( - var: Expr_Variable( - name: foo - ) - name: func - args: array( - 0: Arg( - value: Expr_Yield( - key: null - value: Expr_Variable( - name: foo + 13: Stmt_Expression( + expr: Expr_MethodCall( + var: Expr_Variable( + name: foo + ) + name: Identifier( + name: func + ) + args: array( + 0: Arg( + value: Expr_Yield( + key: null + value: Expr_Variable( + name: foo + ) ) + byRef: false + unpack: false ) - byRef: false - unpack: false ) ) ) - 14: Expr_New( - class: Name( - parts: array( - 0: Foo + 14: Stmt_Expression( + expr: Expr_New( + class: Name( + parts: array( + 0: Foo + ) ) - ) - args: array( - 0: Arg( - value: Expr_Yield( - key: null - value: Expr_Variable( - name: foo + args: array( + 0: Arg( + value: Expr_Yield( + key: null + value: Expr_Variable( + name: foo + ) ) + byRef: false + unpack: false ) - byRef: false - unpack: false ) ) ) - 15: Expr_YieldFrom( - expr: Expr_Variable( - name: foo - ) - ) - 16: Expr_BinaryOp_LogicalAnd( - left: Expr_YieldFrom( + 15: Stmt_Expression( + expr: Expr_YieldFrom( expr: Expr_Variable( name: foo ) ) - right: Expr_YieldFrom( - expr: Expr_Variable( - name: bar + ) + 16: Stmt_Expression( + expr: Expr_BinaryOp_LogicalAnd( + left: Expr_YieldFrom( + expr: Expr_Variable( + name: foo + ) + ) + right: Expr_YieldFrom( + expr: Expr_Variable( + name: bar + ) ) ) ) - 17: Expr_YieldFrom( - expr: Expr_BinaryOp_Plus( - left: Expr_Variable( - name: foo - ) - right: Expr_Variable( - name: bar + 17: Stmt_Expression( + expr: Expr_YieldFrom( + expr: Expr_BinaryOp_Plus( + left: Expr_Variable( + name: foo + ) + right: Expr_Variable( + name: bar + ) ) ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/generator/yieldPrecedence.test b/vendor/nikic/php-parser/test/code/parser/stmt/generator/yieldPrecedence.test index ff0d4df0..1f843c31 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/generator/yieldPrecedence.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/generator/yieldPrecedence.test @@ -18,154 +18,85 @@ function gen() { array( 0: Stmt_Function( byRef: false - name: gen + name: Identifier( + name: gen + ) params: array( ) returnType: null stmts: array( - 0: Expr_Yield( - key: null - value: Expr_BinaryOp_Concat( - left: Scalar_String( - value: a - ) - right: Scalar_String( - value: b - ) - ) - ) - 1: Expr_BinaryOp_LogicalOr( - left: Expr_Yield( + 0: Stmt_Expression( + expr: Expr_Yield( key: null - value: Scalar_String( - value: a - ) - ) - right: Expr_Exit( - expr: null - ) - ) - 2: Expr_Yield( - key: Scalar_String( - value: k - ) - value: Expr_BinaryOp_Concat( - left: Scalar_String( - value: a - ) - right: Scalar_String( - value: b + value: Expr_BinaryOp_Concat( + left: Scalar_String( + value: a + ) + right: Scalar_String( + value: b + ) ) ) ) - 3: Expr_BinaryOp_LogicalOr( - left: Expr_Yield( + 1: Stmt_Expression( + expr: Expr_BinaryOp_LogicalOr( + left: Expr_Yield( + key: null + value: Scalar_String( + value: a + ) + ) + right: Expr_Exit( + expr: null + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_Yield( key: Scalar_String( value: k ) - value: Scalar_String( - value: a - ) - ) - right: Expr_Exit( - expr: null - ) - ) - 4: Expr_FuncCall( - name: Name( - parts: array( - 0: var_dump - ) - ) - args: array( - 0: Arg( - value: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Yield( - key: Scalar_String( - value: k - ) - value: Expr_BinaryOp_Concat( - left: Scalar_String( - value: a - ) - right: Scalar_String( - value: b - ) - ) - ) - byRef: false - ) - ) + value: Expr_BinaryOp_Concat( + left: Scalar_String( + value: a + ) + right: Scalar_String( + value: b ) - byRef: false - unpack: false ) ) ) - 5: Expr_Yield( - key: null - value: Expr_Yield( - key: Scalar_String( - value: k1 - ) - value: Expr_Yield( + 3: Stmt_Expression( + expr: Expr_BinaryOp_LogicalOr( + left: Expr_Yield( key: Scalar_String( - value: k2 + value: k ) - value: Expr_BinaryOp_Concat( - left: Scalar_String( - value: a - ) - right: Scalar_String( - value: b - ) - ) - ) - ) - ) - 6: Expr_Yield( - key: Expr_Yield( - key: Scalar_String( - value: k1 - ) - value: Expr_Yield( - key: null value: Scalar_String( - value: k2 + value: a ) ) - ) - value: Expr_BinaryOp_Concat( - left: Scalar_String( - value: a - ) - right: Scalar_String( - value: b + right: Expr_Exit( + expr: null ) ) ) - 7: Expr_FuncCall( - name: Name( - parts: array( - 0: var_dump + 4: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: var_dump + ) ) - ) - args: array( - 0: Arg( - value: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: null - value: Expr_Yield( - key: Scalar_String( - value: k1 - ) + args: array( + 0: Arg( + value: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null value: Expr_Yield( key: Scalar_String( - value: k2 + value: k ) value: Expr_BinaryOp_Concat( left: Scalar_String( @@ -176,55 +107,144 @@ array( ) ) ) + byRef: false ) - byRef: false ) ) + byRef: false + unpack: false ) - byRef: false - unpack: false ) ) ) - 8: Expr_FuncCall( - name: Name( - parts: array( - 0: var_dump - ) - ) - args: array( - 0: Arg( - value: Expr_Array( - items: array( - 0: Expr_ArrayItem( - key: Expr_Yield( - key: Scalar_String( - value: k1 - ) - value: Expr_Yield( - key: null - value: Scalar_String( - value: k2 - ) - ) - ) - value: Expr_BinaryOp_Concat( - left: Scalar_String( - value: a - ) - right: Scalar_String( - value: b - ) - ) - byRef: false + 5: Stmt_Expression( + expr: Expr_Yield( + key: null + value: Expr_Yield( + key: Scalar_String( + value: k1 + ) + value: Expr_Yield( + key: Scalar_String( + value: k2 + ) + value: Expr_BinaryOp_Concat( + left: Scalar_String( + value: a + ) + right: Scalar_String( + value: b ) ) ) - byRef: false - unpack: false + ) + ) + ) + 6: Stmt_Expression( + expr: Expr_Yield( + key: Expr_Yield( + key: Scalar_String( + value: k1 + ) + value: Expr_Yield( + key: null + value: Scalar_String( + value: k2 + ) + ) + ) + value: Expr_BinaryOp_Concat( + left: Scalar_String( + value: a + ) + right: Scalar_String( + value: b + ) + ) + ) + ) + 7: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: var_dump + ) + ) + args: array( + 0: Arg( + value: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: null + value: Expr_Yield( + key: Scalar_String( + value: k1 + ) + value: Expr_Yield( + key: Scalar_String( + value: k2 + ) + value: Expr_BinaryOp_Concat( + left: Scalar_String( + value: a + ) + right: Scalar_String( + value: b + ) + ) + ) + ) + byRef: false + ) + ) + ) + byRef: false + unpack: false + ) + ) + ) + ) + 8: Stmt_Expression( + expr: Expr_FuncCall( + name: Name( + parts: array( + 0: var_dump + ) + ) + args: array( + 0: Arg( + value: Expr_Array( + items: array( + 0: Expr_ArrayItem( + key: Expr_Yield( + key: Scalar_String( + value: k1 + ) + value: Expr_Yield( + key: null + value: Scalar_String( + value: k2 + ) + ) + ) + value: Expr_BinaryOp_Concat( + left: Scalar_String( + value: a + ) + right: Scalar_String( + value: b + ) + ) + byRef: false + ) + ) + ) + byRef: false + unpack: false + ) ) ) ) ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/generator/yieldUnaryPrecedence.test b/vendor/nikic/php-parser/test/code/parser/stmt/generator/yieldUnaryPrecedence.test index 13f96602..6b77d335 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/generator/yieldUnaryPrecedence.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/generator/yieldUnaryPrecedence.test @@ -11,38 +11,46 @@ function gen() { array( 0: Stmt_Function( byRef: false - name: gen + name: Identifier( + name: gen + ) params: array( ) returnType: null stmts: array( - 0: Expr_Yield( - key: null - value: Expr_UnaryPlus( - expr: Scalar_LNumber( - value: 1 - ) - ) - ) - 1: Expr_Yield( - key: null - value: Expr_UnaryMinus( - expr: Scalar_LNumber( - value: 1 - ) - ) - ) - 2: Expr_BinaryOp_Mul( - left: Expr_Yield( + 0: Stmt_Expression( + expr: Expr_Yield( key: null - value: null + value: Expr_UnaryPlus( + expr: Scalar_LNumber( + value: 1 + ) + ) ) - right: Expr_UnaryMinus( - expr: Scalar_LNumber( - value: 1 + ) + 1: Stmt_Expression( + expr: Expr_Yield( + key: null + value: Expr_UnaryMinus( + expr: Scalar_LNumber( + value: 1 + ) + ) + ) + ) + 2: Stmt_Expression( + expr: Expr_BinaryOp_Mul( + left: Expr_Yield( + key: null + value: null + ) + right: Expr_UnaryMinus( + expr: Scalar_LNumber( + value: 1 + ) ) ) ) ) ) -) +) \ No newline at end of file diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/haltCompiler.test b/vendor/nikic/php-parser/test/code/parser/stmt/haltCompiler.test index 67133ba7..112946ea 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/haltCompiler.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/haltCompiler.test @@ -8,8 +8,10 @@ __halt_compiler() Hallo World! ----- array( - 0: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_Variable( + name: a + ) ) 1: Stmt_HaltCompiler( remaining: Hallo World! @@ -22,8 +24,10 @@ $a; __halt_compiler();Hallo World! ----- array( - 0: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_Variable( + name: a + ) ) 1: Stmt_HaltCompiler( remaining: Hallo World! @@ -44,8 +48,10 @@ array( ) ) stmts: array( - 0: Expr_Variable( - name: a + 0: Stmt_Expression( + expr: Expr_Variable( + name: a + ) ) ) ) diff --git a/vendor/nikic/php-parser/test/code/parser/stmt/haltCompilerInvalidSyntax.test b/vendor/nikic/php-parser/test/code/parser/stmt/haltCompilerInvalidSyntax.test index 597710f2..381019a9 100644 --- a/vendor/nikic/php-parser/test/code/parser/stmt/haltCompilerInvalidSyntax.test +++ b/vendor/nikic/php-parser/test/code/parser/stmt/haltCompilerInvalidSyntax.test @@ -3,4 +3,4 @@ Invalid __halt_compiler() syntax +Test + +Test + $code) { + if (false !== strpos($code, '@@{')) { + // Skip tests with evaluate segments + continue; + } + + list($name, $tests) = $testParser->parseTest($code, 2); + $newTests = []; + foreach ($tests as list($modeLine, list($input, $expected))) { + $modes = null !== $modeLine ? array_fill_keys(explode(',', $modeLine), true) : []; + list($parser5, $parser7) = $codeParsingTest->createParsers($modes); + $output = isset($modes['php5']) + ? $codeParsingTest->getParseOutput($parser5, $input, $modes) + : $codeParsingTest->getParseOutput($parser7, $input, $modes); + $newTests[] = [$modeLine, [$input, $output]]; + } + + $newCode = $testParser->reconstructTest($name, $newTests); + file_put_contents($fileName, $newCode); +} diff --git a/vendor/nikic/php-parser/test_old/run.php b/vendor/nikic/php-parser/test_old/run.php index bc14d893..2d7cdacc 100644 --- a/vendor/nikic/php-parser/test_old/run.php +++ b/vendor/nikic/php-parser/test_old/run.php @@ -110,17 +110,24 @@ switch ($testType) { showHelp('Test type must be one of: PHP5, PHP7 or Symfony'); } -require_once dirname(__FILE__) . '/../lib/PhpParser/Autoloader.php'; -PhpParser\Autoloader::register(); +require_once __DIR__ . '/../vendor/autoload.php'; -$parserName = 'PhpParser\Parser\\' . $version; -$parser = new $parserName(new PhpParser\Lexer\Emulative); +$lexer = new PhpParser\Lexer\Emulative(['usedAttributes' => [ + 'comments', 'startLine', 'endLine', 'startTokenPos', 'endTokenPos', +]]); +$parserName = 'PhpParser\Parser\\' . $version; +/** @var PhpParser\Parser $parser */ +$parser = new $parserName($lexer); $prettyPrinter = new PhpParser\PrettyPrinter\Standard; -$nodeDumper = new PhpParser\NodeDumper; +$nodeDumper = new PhpParser\NodeDumper; -$parseFail = $ppFail = $compareFail = $count = 0; +$cloningTraverser = new PhpParser\NodeTraverser; +$cloningTraverser->addVisitor(new PhpParser\NodeVisitor\CloningVisitor); -$readTime = $parseTime = $ppTime = $reparseTime = $compareTime = 0; +$parseFail = $fpppFail = $ppFail = $compareFail = $count = 0; + +$readTime = $parseTime = $cloneTime = 0; +$fpppTime = $ppTime = $reparseTime = $compareTime = 0; $totalStartTime = microtime(true); foreach (new RecursiveIteratorIterator( @@ -132,10 +139,10 @@ foreach (new RecursiveIteratorIterator( } $startTime = microtime(true); - $code = file_get_contents($file); + $origCode = file_get_contents($file); $readTime += microtime(true) - $startTime; - if (null === $code = $codeExtractor($file, $code)) { + if (null === $origCode = $codeExtractor($file, $origCode)) { continue; } @@ -149,11 +156,30 @@ foreach (new RecursiveIteratorIterator( try { $startTime = microtime(true); - $stmts = $parser->parse($code); + $origStmts = $parser->parse($origCode); $parseTime += microtime(true) - $startTime; + $origTokens = $lexer->getTokens(); + $startTime = microtime(true); - $code = 'prettyPrint($stmts); + $stmts = $cloningTraverser->traverse($origStmts); + $cloneTime += microtime(true) - $startTime; + + $startTime = microtime(true); + $code = $prettyPrinter->printFormatPreserving($stmts, $origStmts, $origTokens); + $fpppTime += microtime(true) - $startTime; + + if ($code !== $origCode) { + echo $file, ":\n Result of format-preserving pretty-print differs\n"; + if ($verbose) { + echo "FPPP output:\n=====\n$code\n=====\n\n"; + } + + ++$fpppFail; + } + + $startTime = microtime(true); + $code = "prettyPrint($stmts); $ppTime += microtime(true) - $startTime; try { @@ -200,6 +226,9 @@ if (0 === $parseFail && 0 === $ppFail && 0 === $compareFail) { if (0 !== $ppFail) { echo ' ', $ppFail, ' pretty print failures.', "\n"; } + if (0 !== $fpppFail) { + echo ' ', $fpppFail, ' FPPP failures.', "\n"; + } if (0 !== $compareFail) { echo ' ', $compareFail, ' compare failures.', "\n"; } @@ -210,6 +239,8 @@ echo "\n", "\n", 'Reading files took: ', $readTime, "\n", 'Parsing took: ', $parseTime, "\n", + 'Cloning took: ', $cloneTime, "\n", + 'FPPP took: ', $fpppTime, "\n", 'Pretty printing took: ', $ppTime, "\n", 'Reparsing took: ', $reparseTime, "\n", 'Comparing took: ', $compareTime, "\n", diff --git a/vendor/paragonie/random_compat/composer.json b/vendor/paragonie/random_compat/composer.json index 1c5978c6..34f1381d 100644 --- a/vendor/paragonie/random_compat/composer.json +++ b/vendor/paragonie/random_compat/composer.json @@ -4,6 +4,7 @@ "keywords": [ "csprng", "random", + "polyfill", "pseudorandom" ], "license": "MIT", diff --git a/vendor/paragonie/random_compat/lib/byte_safe_strings.php b/vendor/paragonie/random_compat/lib/byte_safe_strings.php index 3de86b22..2a7335dd 100644 --- a/vendor/paragonie/random_compat/lib/byte_safe_strings.php +++ b/vendor/paragonie/random_compat/lib/byte_safe_strings.php @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/paragonie/random_compat/lib/cast_to_int.php b/vendor/paragonie/random_compat/lib/cast_to_int.php index 9a4fab99..14b4b348 100644 --- a/vendor/paragonie/random_compat/lib/cast_to_int.php +++ b/vendor/paragonie/random_compat/lib/cast_to_int.php @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/paragonie/random_compat/lib/error_polyfill.php b/vendor/paragonie/random_compat/lib/error_polyfill.php index 6a91990c..6d4a19ac 100644 --- a/vendor/paragonie/random_compat/lib/error_polyfill.php +++ b/vendor/paragonie/random_compat/lib/error_polyfill.php @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/paragonie/random_compat/lib/random.php b/vendor/paragonie/random_compat/lib/random.php index df74c8a4..d5391882 100644 --- a/vendor/paragonie/random_compat/lib/random.php +++ b/vendor/paragonie/random_compat/lib/random.php @@ -3,12 +3,12 @@ * Random_* Compatibility Library * for using the new PHP 7 random_* API in PHP 5 projects * - * @version 2.0.10 - * @released 2017-03-13 + * @version 2.0.15 + * @released 2018-06-08 * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -54,9 +54,9 @@ if (!defined('RANDOM_COMPAT_READ_BUFFER')) { $RandomCompatDIR = dirname(__FILE__); -require_once $RandomCompatDIR . '/byte_safe_strings.php'; -require_once $RandomCompatDIR . '/cast_to_int.php'; -require_once $RandomCompatDIR . '/error_polyfill.php'; +require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'byte_safe_strings.php'; +require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'cast_to_int.php'; +require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'error_polyfill.php'; if (!is_callable('random_bytes')) { /** @@ -76,9 +76,9 @@ if (!is_callable('random_bytes')) { if (extension_loaded('libsodium')) { // See random_bytes_libsodium.php if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) { - require_once $RandomCompatDIR . '/random_bytes_libsodium.php'; + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium.php'; } elseif (method_exists('Sodium', 'randombytes_buf')) { - require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.php'; + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium_legacy.php'; } } @@ -117,7 +117,7 @@ if (!is_callable('random_bytes')) { // place, that is not helpful to us here. // See random_bytes_dev_urandom.php - require_once $RandomCompatDIR . '/random_bytes_dev_urandom.php'; + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_dev_urandom.php'; } // Unset variables after use $RandomCompat_basedir = null; @@ -159,7 +159,7 @@ if (!is_callable('random_bytes')) { extension_loaded('mcrypt') ) { // See random_bytes_mcrypt.php - require_once $RandomCompatDIR . '/random_bytes_mcrypt.php'; + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_mcrypt.php'; } $RandomCompatUrandom = null; @@ -184,7 +184,7 @@ if (!is_callable('random_bytes')) { $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); if (method_exists($RandomCompatCOMtest, 'GetRandom')) { // See random_bytes_com_dotnet.php - require_once $RandomCompatDIR . '/random_bytes_com_dotnet.php'; + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_com_dotnet.php'; } } catch (com_exception $e) { // Don't try to use it. @@ -203,8 +203,10 @@ if (!is_callable('random_bytes')) { * and hope the developer won't let it fail silently. * * @param mixed $length - * @return void + * @psalm-suppress MissingReturnType + * @psalm-suppress InvalidReturnType * @throws Exception + * @return string */ function random_bytes($length) { @@ -212,12 +214,13 @@ if (!is_callable('random_bytes')) { throw new Exception( 'There is no suitable CSPRNG installed on your system' ); + return ''; } } } if (!is_callable('random_int')) { - require_once $RandomCompatDIR . '/random_int.php'; + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_int.php'; } $RandomCompatDIR = null; diff --git a/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php b/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php index fc1926e5..2b83369e 100644 --- a/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php +++ b/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php b/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php index df5b9152..ac36034a 100644 --- a/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php +++ b/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php b/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php index 4af1a242..1e017c14 100644 --- a/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php +++ b/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php b/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php index 705af526..388da4dc 100644 --- a/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php +++ b/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php b/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php index aac9c013..879450c9 100644 --- a/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php +++ b/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/paragonie/random_compat/lib/random_int.php b/vendor/paragonie/random_compat/lib/random_int.php index 5b2143a1..81bb725a 100644 --- a/vendor/paragonie/random_compat/lib/random_int.php +++ b/vendor/paragonie/random_compat/lib/random_int.php @@ -7,7 +7,7 @@ if (!is_callable('random_int')) { * * The MIT License (MIT) * - * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/paragonie/random_compat/psalm.xml b/vendor/paragonie/random_compat/psalm.xml index 1e914098..596d99dd 100644 --- a/vendor/paragonie/random_compat/psalm.xml +++ b/vendor/paragonie/random_compat/psalm.xml @@ -8,9 +8,12 @@ + + + diff --git a/vendor/phpspec/prophecy/CHANGES.md b/vendor/phpspec/prophecy/CHANGES.md index 6a3ad33a..0dadd52a 100644 --- a/vendor/phpspec/prophecy/CHANGES.md +++ b/vendor/phpspec/prophecy/CHANGES.md @@ -1,3 +1,19 @@ +1.7.5 / 2018/04/18 +================== + +* Allow sebastian/comparator ^3.0 (@sebastianbergmann) + +1.7.4 / 2018/02/11 +================== + +* Fix issues with PHP 7.2 (thanks @greg0ire) +* Support object type hints in PHP 7.2 (thanks @@jansvoboda11) + +1.7.3 / 2017/11/24 +================== + +* Fix SplInfo ClassPatch to work with Symfony 4 (Thanks @gnugat) + 1.7.2 / 2017-10-04 ================== diff --git a/vendor/phpspec/prophecy/composer.json b/vendor/phpspec/prophecy/composer.json index 5bdbdb3e..bb3d3726 100644 --- a/vendor/phpspec/prophecy/composer.json +++ b/vendor/phpspec/prophecy/composer.json @@ -20,14 +20,14 @@ "require": { "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", "doctrine/instantiator": "^1.0.2", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" }, "autoload": { diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php index fc1079c5..891faa8f 100644 --- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php +++ b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php @@ -19,6 +19,16 @@ namespace Prophecy\Doubler\Generator; */ class ClassCodeGenerator { + /** + * @var TypeHintReference + */ + private $typeHintReference; + + public function __construct(TypeHintReference $typeHintReference = null) + { + $this->typeHintReference = $typeHintReference ?: new TypeHintReference(); + } + /** * Generates PHP code for class node. * @@ -91,7 +101,8 @@ class ClassCodeGenerator private function generateArguments(array $arguments) { - return array_map(function (Node\ArgumentNode $argument) { + $typeHintReference = $this->typeHintReference; + return array_map(function (Node\ArgumentNode $argument) use ($typeHintReference) { $php = ''; if (version_compare(PHP_VERSION, '7.1', '>=')) { @@ -99,34 +110,7 @@ class ClassCodeGenerator } if ($hint = $argument->getTypeHint()) { - switch ($hint) { - case 'array': - case 'callable': - $php .= $hint; - break; - - case 'iterable': - if (version_compare(PHP_VERSION, '7.1', '>=')) { - $php .= $hint; - break; - } - - $php .= '\\'.$hint; - break; - - case 'string': - case 'int': - case 'float': - case 'bool': - if (version_compare(PHP_VERSION, '7.0', '>=')) { - $php .= $hint; - break; - } - // Fall-through to default case for PHP 5.x - - default: - $php .= '\\'.$hint; - } + $php .= $typeHintReference->isBuiltInParamTypeHint($hint) ? $hint : '\\'.$hint; } $php .= ' '.($argument->isPassedByReference() ? '&' : ''); diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/MethodNode.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/MethodNode.php index ee363ab3..c74b4831 100644 --- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/MethodNode.php +++ b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/MethodNode.php @@ -11,6 +11,7 @@ namespace Prophecy\Doubler\Generator\Node; +use Prophecy\Doubler\Generator\TypeHintReference; use Prophecy\Exception\InvalidArgumentException; /** @@ -33,14 +34,20 @@ class MethodNode */ private $arguments = array(); + /** + * @var TypeHintReference + */ + private $typeHintReference; + /** * @param string $name * @param string $code */ - public function __construct($name, $code = null) + public function __construct($name, $code = null, TypeHintReference $typeHintReference = null) { $this->name = $name; $this->code = $code; + $this->typeHintReference = $typeHintReference ?: new TypeHintReference(); } public function getVisibility() @@ -112,38 +119,22 @@ class MethodNode */ public function setReturnType($type = null) { - switch ($type) { - case '': - $this->returnType = null; - break; - - case 'string': - case 'float': - case 'int': - case 'bool': - case 'array': - case 'callable': - case 'iterable': - case 'void': - $this->returnType = $type; - break; - - case 'double': - case 'real': - $this->returnType = 'float'; - break; - - case 'boolean': - $this->returnType = 'bool'; - break; - - case 'integer': - $this->returnType = 'int'; - break; - - default: - $this->returnType = '\\' . ltrim($type, '\\'); + if ($type === '' || $type === null) { + $this->returnType = null; + return; } + $typeMap = array( + 'double' => 'float', + 'real' => 'float', + 'boolean' => 'bool', + 'integer' => 'int', + ); + if (isset($typeMap[$type])) { + $type = $typeMap[$type]; + } + $this->returnType = $this->typeHintReference->isBuiltInReturnTypeHint($type) ? + $type : + '\\' . ltrim($type, '\\'); } public function getReturnType() diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/TypeHintReference.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/TypeHintReference.php new file mode 100644 index 00000000..ce952029 --- /dev/null +++ b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/TypeHintReference.php @@ -0,0 +1,46 @@ += 50400; + + case 'bool': + case 'float': + case 'int': + case 'string': + return PHP_VERSION_ID >= 70000; + + case 'iterable': + return PHP_VERSION_ID >= 70100; + + case 'object': + return PHP_VERSION_ID >= 70200; + + default: + return false; + } + } + + public function isBuiltInReturnTypeHint($type) + { + if ($type === 'void') { + return PHP_VERSION_ID >= 70100; + } + + return $this->isBuiltInParamTypeHint($type); + } +} diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/MethodNotFoundException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/MethodNotFoundException.php index b113941f..a5383494 100644 --- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/MethodNotFoundException.php +++ b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/MethodNotFoundException.php @@ -14,7 +14,7 @@ namespace Prophecy\Exception\Doubler; class MethodNotFoundException extends DoubleException { /** - * @var string + * @var string|object */ private $classname; @@ -30,7 +30,7 @@ class MethodNotFoundException extends DoubleException /** * @param string $message - * @param string $classname + * @param string|object $classname * @param string $methodName * @param null|Argument\ArgumentsWildcard|array $arguments */ diff --git a/vendor/phpunit/php-code-coverage/ChangeLog-5.3.md b/vendor/phpunit/php-code-coverage/ChangeLog-5.3.md index 00b5fe2c..ca839b13 100644 --- a/vendor/phpunit/php-code-coverage/ChangeLog-5.3.md +++ b/vendor/phpunit/php-code-coverage/ChangeLog-5.3.md @@ -2,6 +2,22 @@ All notable changes of the PHP_CodeCoverage 5.3 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [5.3.2] - 2018-04-06 + +### Fixed + +* Fixed [#602](https://github.com/sebastianbergmann/php-code-coverage/pull/602): Regression introduced in version 5.3.1 + +## [5.3.1] - 2018-04-06 + +### Changed + +* `Clover`, `Crap4j`, and `PHP` report writers now raise an exception when their call to `file_put_contents()` fails + +### Fixed + +* Fixed [#559](https://github.com/sebastianbergmann/php-code-coverage/issues/559): Ignored classes and methods are reported as 100% covered + ## [5.3.0] - 2017-12-06 ### Added @@ -12,5 +28,7 @@ All notable changes of the PHP_CodeCoverage 5.3 release series are documented in * Fixed [#564](https://github.com/sebastianbergmann/php-code-coverage/issues/564): `setDisableIgnoredLines(true)` disables more than it should +[5.3.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/5.3.1...5.3.2 +[5.3.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/5.3.0...5.3.1 [5.3.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/5.2...5.3.0 diff --git a/vendor/phpunit/php-code-coverage/src/Report/Clover.php b/vendor/phpunit/php-code-coverage/src/Report/Clover.php index 358d0ddd..2758d905 100644 --- a/vendor/phpunit/php-code-coverage/src/Report/Clover.php +++ b/vendor/phpunit/php-code-coverage/src/Report/Clover.php @@ -12,6 +12,7 @@ namespace SebastianBergmann\CodeCoverage\Report; use SebastianBergmann\CodeCoverage\CodeCoverage; use SebastianBergmann\CodeCoverage\Node\File; +use SebastianBergmann\CodeCoverage\RuntimeException; /** * Generates a Clover XML logfile from a code coverage object. @@ -24,6 +25,8 @@ class Clover * @param string $name * * @return string + * + * @throws \SebastianBergmann\CodeCoverage\RuntimeException */ public function process(CodeCoverage $coverage, $target = null, $name = null) { @@ -243,7 +246,14 @@ class Clover \mkdir(\dirname($target), 0777, true); } - \file_put_contents($target, $buffer); + if (@\file_put_contents($target, $buffer) === false) { + throw new RuntimeException( + \sprintf( + 'Could not write to "%s', + $target + ) + ); + } } return $buffer; diff --git a/vendor/phpunit/php-code-coverage/src/Report/Crap4j.php b/vendor/phpunit/php-code-coverage/src/Report/Crap4j.php index 3851a27d..5ef11af0 100644 --- a/vendor/phpunit/php-code-coverage/src/Report/Crap4j.php +++ b/vendor/phpunit/php-code-coverage/src/Report/Crap4j.php @@ -13,6 +13,7 @@ namespace SebastianBergmann\CodeCoverage\Report; use SebastianBergmann\CodeCoverage\CodeCoverage; use SebastianBergmann\CodeCoverage\InvalidArgumentException; use SebastianBergmann\CodeCoverage\Node\File; +use SebastianBergmann\CodeCoverage\RuntimeException; class Crap4j { @@ -42,6 +43,8 @@ class Crap4j * @param string $name * * @return string + * + * @throws \SebastianBergmann\CodeCoverage\RuntimeException */ public function process(CodeCoverage $coverage, $target = null, $name = null) { @@ -135,7 +138,14 @@ class Crap4j \mkdir(\dirname($target), 0777, true); } - \file_put_contents($target, $buffer); + if (@\file_put_contents($target, $buffer) === false) { + throw new RuntimeException( + \sprintf( + 'Could not write to "%s', + $target + ) + ); + } } return $buffer; diff --git a/vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php b/vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php index 8e8bacde..d2016b36 100644 --- a/vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php +++ b/vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php @@ -131,19 +131,23 @@ class File extends Renderer */ protected function renderTraitOrClassItems(array $items, \Text_Template $template, \Text_Template $methodItemTemplate) { - if (empty($items)) { - return ''; - } - $buffer = ''; + if (empty($items)) { + return $buffer; + } + foreach ($items as $name => $item) { - $numMethods = \count($item['methods']); + $numMethods = 0; $numTestedMethods = 0; foreach ($item['methods'] as $method) { - if ($method['executedLines'] == $method['executableLines']) { - $numTestedMethods++; + if ($method['executableLines'] > 0) { + $numMethods++; + + if ($method['executedLines'] === $method['executableLines']) { + $numTestedMethods++; + } } } @@ -244,7 +248,16 @@ class File extends Renderer */ protected function renderFunctionOrMethodItem(\Text_Template $template, array $item, $indent = '') { - $numTestedItems = $item['executedLines'] == $item['executableLines'] ? 1 : 0; + $numMethods = 0; + $numTestedMethods = 0; + + if ($item['executableLines'] > 0) { + $numMethods = 1; + + if ($item['executedLines'] === $item['executableLines']) { + $numTestedMethods = 1; + } + } return $this->renderItemTemplate( $template, @@ -256,8 +269,8 @@ class File extends Renderer \htmlspecialchars($item['signature']), isset($item['functionName']) ? $item['functionName'] : $item['methodName'] ), - 'numMethods' => 1, - 'numTestedMethods' => $numTestedItems, + 'numMethods' => $numMethods, + 'numTestedMethods' => $numTestedMethods, 'linesExecutedPercent' => Util::percent( $item['executedLines'], $item['executableLines'], @@ -271,12 +284,12 @@ class File extends Renderer 'numExecutedLines' => $item['executedLines'], 'numExecutableLines' => $item['executableLines'], 'testedMethodsPercent' => Util::percent( - $numTestedItems, + $numTestedMethods, 1, false ), 'testedMethodsPercentAsString' => Util::percent( - $numTestedItems, + $numTestedMethods, 1, true ), diff --git a/vendor/phpunit/php-code-coverage/src/Report/PHP.php b/vendor/phpunit/php-code-coverage/src/Report/PHP.php index 60321b9a..6873593b 100644 --- a/vendor/phpunit/php-code-coverage/src/Report/PHP.php +++ b/vendor/phpunit/php-code-coverage/src/Report/PHP.php @@ -11,6 +11,7 @@ namespace SebastianBergmann\CodeCoverage\Report; use SebastianBergmann\CodeCoverage\CodeCoverage; +use SebastianBergmann\CodeCoverage\RuntimeException; /** * Uses var_export() to write a SebastianBergmann\CodeCoverage\CodeCoverage object to a file. @@ -27,7 +28,7 @@ class PHP { $filter = $coverage->filter(); - $output = \sprintf( + $buffer = \sprintf( 'setData(%s); @@ -43,9 +44,16 @@ return $coverage;', ); if ($target !== null) { - return \file_put_contents($target, $output); - } else { - return $output; + if (@\file_put_contents($target, $buffer) === false) { + throw new RuntimeException( + \sprintf( + 'Could not write to "%s', + $target + ) + ); + } } + + return $buffer; } } diff --git a/vendor/phpunit/php-code-coverage/src/Version.php b/vendor/phpunit/php-code-coverage/src/Version.php index eae3eb6f..50dd6b98 100644 --- a/vendor/phpunit/php-code-coverage/src/Version.php +++ b/vendor/phpunit/php-code-coverage/src/Version.php @@ -22,7 +22,7 @@ class Version public static function id() { if (self::$version === null) { - $version = new VersionId('5.3.0', \dirname(__DIR__)); + $version = new VersionId('5.3.2', \dirname(__DIR__)); self::$version = $version->getVersion(); } diff --git a/vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html b/vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html index b7d8bc24..91f62768 100644 --- a/vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html +++ b/vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html @@ -65,16 +65,11 @@ - baz -
    -
    - 100.00% covered (success) -
    -
    - -
    100.00%
    -
    1 / 1
    - 1 + baz + +
    n/a
    +
    0 / 0
    + 1
    n/a
    0 / 0
    @@ -85,31 +80,21 @@
    n/a
    0 / 0
    -
    -
    - 100.00% covered (success) -
    -
    - -
    100.00%
    -
    1 / 1
    - 1 + +
    n/a
    +
    0 / 0
    + 1
    n/a
    0 / 0
    -  bar -
    -
    - 100.00% covered (success) -
    -
    - -
    100.00%
    -
    1 / 1
    - 1 +  bar + +
    n/a
    +
    0 / 0
    + 1
    n/a
    0 / 0
    @@ -120,31 +105,21 @@
    n/a
    0 / 0
    -
    -
    - 100.00% covered (success) -
    -
    - -
    100.00%
    -
    1 / 1
    - 1 + +
    n/a
    +
    0 / 0
    + 1
    n/a
    0 / 0
    -  foo -
    -
    - 100.00% covered (success) -
    -
    - -
    100.00%
    -
    1 / 1
    - 1 +  foo + +
    n/a
    +
    0 / 0
    + 1
    n/a
    0 / 0
    diff --git a/vendor/phpunit/phpunit-mock-objects/src/Generator.php b/vendor/phpunit/phpunit-mock-objects/src/Generator.php index ce22885e..cb742ba3 100644 --- a/vendor/phpunit/phpunit-mock-objects/src/Generator.php +++ b/vendor/phpunit/phpunit-mock-objects/src/Generator.php @@ -1115,8 +1115,13 @@ class Generator if (!$parameter->isVariadic()) { if ($parameter->isDefaultValueAvailable()) { - $value = $parameter->getDefaultValue(); - $default = ' = ' . \var_export($value, true); + $value = $parameter->getDefaultValueConstantName(); + + if ($value === null) { + $value = \var_export($parameter->getDefaultValue(), true); + } + + $default = ' = ' . $value; } elseif ($parameter->isOptional()) { $default = ' = null'; } diff --git a/vendor/phpunit/phpunit-mock-objects/tests/Generator/397.phpt b/vendor/phpunit/phpunit-mock-objects/tests/Generator/397.phpt index 1259e6f8..71e32a48 100644 --- a/vendor/phpunit/phpunit-mock-objects/tests/Generator/397.phpt +++ b/vendor/phpunit/phpunit-mock-objects/tests/Generator/397.phpt @@ -1,5 +1,8 @@ --TEST-- https://github.com/sebastianbergmann/phpunit-mock-objects/issues/397 +--SKIPIF-- +=')) print 'skip: PHP >= 7.1 required'; --FILE-- generate( + 'Foo', + [], + 'MockFoo', + true, + true +); + +print $mock['code']; +?> +--EXPECT-- +class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject +{ + private $__phpunit_invocationMocker; + private $__phpunit_originalObject; + private $__phpunit_configurable = ['bar']; + + public function __clone() + { + $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker(); + } + + public function bar(int $baz = PHP_INT_MIN) + { + $arguments = array($baz); + $count = func_num_args(); + + if ($count > 1) { + $_arguments = func_get_args(); + + for ($i = 1; $i < $count; $i++) { + $arguments[] = $_arguments[$i]; + } + } + + $result = $this->__phpunit_getInvocationMocker()->invoke( + new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation( + 'Foo', 'bar', $arguments, '', $this, true + ) + ); + + return $result; + } + + public function expects(\PHPUnit\Framework\MockObject\Matcher\Invocation $matcher) + { + return $this->__phpunit_getInvocationMocker()->expects($matcher); + } + + public function method() + { + $any = new \PHPUnit\Framework\MockObject\Matcher\AnyInvokedCount; + $expects = $this->expects($any); + return call_user_func_array(array($expects, 'method'), func_get_args()); + } + + public function __phpunit_setOriginalObject($originalObject) + { + $this->__phpunit_originalObject = $originalObject; + } + + public function __phpunit_getInvocationMocker() + { + if ($this->__phpunit_invocationMocker === null) { + $this->__phpunit_invocationMocker = new \PHPUnit\Framework\MockObject\InvocationMocker($this->__phpunit_configurable); + } + + return $this->__phpunit_invocationMocker; + } + + public function __phpunit_hasMatchers() + { + return $this->__phpunit_getInvocationMocker()->hasMatchers(); + } + + public function __phpunit_verify($unsetInvocationMocker = true) + { + $this->__phpunit_getInvocationMocker()->verify(); + + if ($unsetInvocationMocker) { + $this->__phpunit_invocationMocker = null; + } + } +} diff --git a/vendor/phpunit/phpunit/.github/CONTRIBUTING.md b/vendor/phpunit/phpunit/.github/CONTRIBUTING.md index 5468deba..1a0916f7 100644 --- a/vendor/phpunit/phpunit/.github/CONTRIBUTING.md +++ b/vendor/phpunit/phpunit/.github/CONTRIBUTING.md @@ -21,12 +21,10 @@ Due to time constraints, we are not always able to respond as quickly as we woul ## Coding Guidelines -This project comes with a configuration file for [php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) (`.php_cs`) that you can use to (re)format your sourcecode for compliance with this project's coding guidelines: +This project comes with a configuration file and an executable for [php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) (`.php_cs`) that you can use to (re)format your sourcecode for compliance with this project's coding guidelines: ```bash -$ wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar -O php-cs-fixer.phar - -$ php php-cs-fixer.phar fix +$ ./build/tools/php-cs-fixer fix ``` ## Using PHPUnit from a Git checkout diff --git a/vendor/phpunit/phpunit/.stickler.yml b/vendor/phpunit/phpunit/.stickler.yml deleted file mode 100644 index f4afbc00..00000000 --- a/vendor/phpunit/phpunit/.stickler.yml +++ /dev/null @@ -1,3 +0,0 @@ -linters: - phpcs: - standard: 'build/phpcs.xml' diff --git a/vendor/phpunit/phpunit/ChangeLog-6.5.md b/vendor/phpunit/phpunit/ChangeLog-6.5.md index d40e5f44..8a703bc0 100644 --- a/vendor/phpunit/phpunit/ChangeLog-6.5.md +++ b/vendor/phpunit/phpunit/ChangeLog-6.5.md @@ -2,6 +2,18 @@ All notable changes of the PHPUnit 6.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [6.5.8] - 2018-04-10 + +### Fixed + +* Fixed [#2830](https://github.com/sebastianbergmann/phpunit/issues/2830): `@runClassInSeparateProcess` does not work for tests that use `@dataProvider` + +## [6.5.7] - 2018-02-26 + +### Fixed + +* Fixed [#2974](https://github.com/sebastianbergmann/phpunit/issues/2974): JUnit XML logfile contains invalid characters when test output contains binary data + ## [6.5.6] - 2018-02-01 ### Fixed @@ -50,6 +62,8 @@ All notable changes of the PHPUnit 6.5 release series are documented in this fil * Fixed [#2654](https://github.com/sebastianbergmann/phpunit/issues/2654): Problems with `assertJsonStringEqualsJsonString()` * Fixed [#2810](https://github.com/sebastianbergmann/phpunit/pull/2810): Code Coverage for PHPT tests does not work +[6.5.8]: https://github.com/sebastianbergmann/phpunit/compare/6.5.7...6.5.8 +[6.5.7]: https://github.com/sebastianbergmann/phpunit/compare/6.5.6...6.5.7 [6.5.6]: https://github.com/sebastianbergmann/phpunit/compare/6.5.5...6.5.6 [6.5.5]: https://github.com/sebastianbergmann/phpunit/compare/6.5.4...6.5.5 [6.5.4]: https://github.com/sebastianbergmann/phpunit/compare/6.5.3...6.5.4 diff --git a/vendor/phpunit/phpunit/build.xml b/vendor/phpunit/phpunit/build.xml index f0db7303..957e2b9b 100644 --- a/vendor/phpunit/phpunit/build.xml +++ b/vendor/phpunit/phpunit/build.xml @@ -376,7 +376,7 @@ - + @@ -390,21 +390,12 @@ - - - - - - - - - - - - - - - + + + + + + diff --git a/vendor/phpunit/phpunit/src/Framework/TestCase.php b/vendor/phpunit/phpunit/src/Framework/TestCase.php index ea1e4091..8bcd401f 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestCase.php +++ b/vendor/phpunit/phpunit/src/Framework/TestCase.php @@ -875,7 +875,8 @@ abstract class TestCase extends Assert implements Test, SelfDescribing 'isStrictAboutTodoAnnotatedTests' => $isStrictAboutTodoAnnotatedTests, 'isStrictAboutResourceUsageDuringSmallTests' => $isStrictAboutResourceUsageDuringSmallTests, 'codeCoverageFilter' => $codeCoverageFilter, - 'configurationFilePath' => $configurationFilePath + 'configurationFilePath' => $configurationFilePath, + 'name' => $this->getName(false), ]; if (!$runEntireClass) { diff --git a/vendor/phpunit/phpunit/src/Runner/Version.php b/vendor/phpunit/phpunit/src/Runner/Version.php index 2f3f2000..387fcf13 100644 --- a/vendor/phpunit/phpunit/src/Runner/Version.php +++ b/vendor/phpunit/phpunit/src/Runner/Version.php @@ -32,7 +32,7 @@ class Version } if (self::$version === null) { - $version = new VersionId('6.5.6', \dirname(\dirname(__DIR__))); + $version = new VersionId('6.5.8', \dirname(\dirname(__DIR__))); self::$version = $version->getVersion(); } diff --git a/vendor/phpunit/phpunit/src/Util/Log/JUnit.php b/vendor/phpunit/phpunit/src/Util/Log/JUnit.php index 6d46b4d1..15101878 100644 --- a/vendor/phpunit/phpunit/src/Util/Log/JUnit.php +++ b/vendor/phpunit/phpunit/src/Util/Log/JUnit.php @@ -362,10 +362,9 @@ class JUnit extends Printer implements TestListener $this->testSuiteTimes[$this->testSuiteLevel] += $time; if (\method_exists($test, 'hasOutput') && $test->hasOutput()) { - $systemOut = $this->document->createElement('system-out'); - - $systemOut->appendChild( - $this->document->createTextNode($test->getActualOutput()) + $systemOut = $this->document->createElement( + 'system-out', + Xml::prepareString($test->getActualOutput()) ); $this->currentTestCase->appendChild($systemOut); diff --git a/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseClass.tpl.dist b/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseClass.tpl.dist index 1c237969..56463740 100644 --- a/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseClass.tpl.dist +++ b/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseClass.tpl.dist @@ -47,7 +47,7 @@ function __phpunit_run_isolated_test() $result->beStrictAboutTodoAnnotatedTests({isStrictAboutTodoAnnotatedTests}); $result->beStrictAboutResourceUsageDuringSmallTests({isStrictAboutResourceUsageDuringSmallTests}); - $test = new {className}(null, unserialize('{data}'), '{dataName}'); + $test = new {className}('{name}', unserialize('{data}'), '{dataName}'); $test->setDependencyInput(unserialize('{dependencyInput}')); $test->setInIsolation(TRUE); diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2830.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/2830.phpt new file mode 100644 index 00000000..f46079da --- /dev/null +++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/2830.phpt @@ -0,0 +1,20 @@ +--TEST-- +GH-2830: @runClassInSeparateProcess fails for tests with a @dataProvider +--FILE-- + +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann and contributors. + +. 1 / 1 (100%) + +Time: %s, Memory: %s + +OK (1 test, 1 assertion) diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2830/Issue2830Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/2830/Issue2830Test.php new file mode 100644 index 00000000..4a949768 --- /dev/null +++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/2830/Issue2830Test.php @@ -0,0 +1,22 @@ +assertTrue(true); + } + + public function simpleDataProvider() + { + return [ + ['foo'], + ]; + } +} \ No newline at end of file diff --git a/vendor/psr/simple-cache/src/CacheInterface.php b/vendor/psr/simple-cache/src/CacheInterface.php index 53ef49fa..99e8d957 100644 --- a/vendor/psr/simple-cache/src/CacheInterface.php +++ b/vendor/psr/simple-cache/src/CacheInterface.php @@ -20,11 +20,11 @@ interface CacheInterface /** * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time. * - * @param string $key The key of the item to store. - * @param mixed $value The value of the item to store, must be serializable. - * @param null|int|DateInterval $ttl Optional. The TTL value of this item. If no value is sent and - * the driver supports TTL then the library may set a default value - * for it or let the driver take care of that. + * @param string $key The key of the item to store. + * @param mixed $value The value of the item to store, must be serializable. + * @param null|int|\DateInterval $ttl Optional. The TTL value of this item. If no value is sent and + * the driver supports TTL then the library may set a default value + * for it or let the driver take care of that. * * @return bool True on success and false on failure. * @@ -69,10 +69,10 @@ interface CacheInterface /** * Persists a set of key => value pairs in the cache, with an optional TTL. * - * @param iterable $values A list of key => value pairs for a multiple-set operation. - * @param null|int|DateInterval $ttl Optional. The TTL value of this item. If no value is sent and - * the driver supports TTL then the library may set a default value - * for it or let the driver take care of that. + * @param iterable $values A list of key => value pairs for a multiple-set operation. + * @param null|int|\DateInterval $ttl Optional. The TTL value of this item. If no value is sent and + * the driver supports TTL then the library may set a default value + * for it or let the driver take care of that. * * @return bool True on success and false on failure. * diff --git a/vendor/psy/psysh/.editorconfig b/vendor/psy/psysh/.editorconfig index 779f99a1..fddf9c1c 100644 --- a/vendor/psy/psysh/.editorconfig +++ b/vendor/psy/psysh/.editorconfig @@ -10,3 +10,6 @@ insert_final_newline = true [*.md] trim_trailing_whitespace = false + +[Makefile] +indent_style = tab diff --git a/vendor/psy/psysh/.github/CONTRIBUTING.md b/vendor/psy/psysh/.github/CONTRIBUTING.md new file mode 100644 index 00000000..efb87446 --- /dev/null +++ b/vendor/psy/psysh/.github/CONTRIBUTING.md @@ -0,0 +1,9 @@ +## Code style + +Please make your code look like the other code in the project. + +PsySH follows [PSR-1](http://php-fig.org/psr/psr-1/) and [PSR-2](http://php-fig.org/psr/psr-2/). The easiest way to do make sure you're following the coding standard is to [install `php-cs-fixer`](https://github.com/friendsofphp/php-cs-fixer) and run `php-cs-fixer fix` before committing. + +## Branching model + +Please branch off and send pull requests to the `develop` branch. diff --git a/vendor/psy/psysh/.gitignore b/vendor/psy/psysh/.gitignore index d4300e2b..da05f58c 100644 --- a/vendor/psy/psysh/.gitignore +++ b/vendor/psy/psysh/.gitignore @@ -1,11 +1,9 @@ -build-vendor/ -vendor/ -composer.lock -composer-compat.json -composer-compat.lock -manual/ -dist/ -__pycache__ -.php_cs.cache -psysh.phar -psysh-compat.phar +/build/ +/dist/ +/composer.lock +/manual/ +/psysh +/__pycache__ +/.php_cs.cache +/vendor/ +/vendor-bin/*/vendor/ diff --git a/vendor/psy/psysh/.php_cs b/vendor/psy/psysh/.php_cs index 94e2ce16..421c31d2 100644 --- a/vendor/psy/psysh/.php_cs +++ b/vendor/psy/psysh/.php_cs @@ -10,7 +10,7 @@ $finder = PhpCsFixer\Finder::create() $header = <<setRules(array( '@Symfony' => true, - 'array_syntax' => array('syntax' => 'long'), + 'array_syntax' => array('syntax' => 'short'), 'binary_operator_spaces' => false, 'concat_space' => array('spacing' => 'one'), 'header_comment' => array('header' => $header), diff --git a/vendor/psy/psysh/.styleci.yml b/vendor/psy/psysh/.styleci.yml index 27a247ed..96fc96bf 100644 --- a/vendor/psy/psysh/.styleci.yml +++ b/vendor/psy/psysh/.styleci.yml @@ -3,7 +3,7 @@ preset: symfony enabled: - align_double_arrow - concat_with_spaces - - long_array_syntax + - short_array_syntax - ordered_use - strict @@ -18,6 +18,8 @@ disabled: - unalign_double_arrow - unalign_equals - yoda_style + - property_separation + - const_separation finder: name: diff --git a/vendor/psy/psysh/.travis.yml b/vendor/psy/psysh/.travis.yml index 20277ef9..3a77512a 100644 --- a/vendor/psy/psysh/.travis.yml +++ b/vendor/psy/psysh/.travis.yml @@ -4,23 +4,32 @@ sudo: false matrix: include: - - php: 5.3 - dist: precise - php: 5.4 + - php: 5.4 + env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"' - php: 5.5 - php: 5.6 - php: 7.0 - php: 7.1 + - php: 7.2 - php: hhvm dist: trusty allow_failures: + - php: 5.4 + env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"' - php: hhvm + fast_finish: true -install: travis_retry composer update --no-interaction +install: travis_retry composer update --no-interaction $COMPOSER_FLAGS -script: vendor/bin/phpunit --verbose +script: + - vendor/bin/phpunit --verbose --coverage-clover=coverage.xml + - '[[ $TRAVIS_PHP_VERSION = 7.2* ]] && make build -j 4 || true' -before_deploy: bin/package -v $TRAVIS_TAG +after_success: + - bash <(curl -s https://codecov.io/bash) + +before_deploy: make dist -j 4 deploy: provider: releases @@ -32,4 +41,4 @@ deploy: on: tags: true repo: bobthecow/psysh - condition: ($TRAVIS_PHP_VERSION = 5.3* || $TRAVIS_PHP_VERSION = 7.0*) + condition: $TRAVIS_PHP_VERSION = 7.2* diff --git a/vendor/psy/psysh/CONTRIBUTING.md b/vendor/psy/psysh/CONTRIBUTING.md deleted file mode 100644 index a5c726ba..00000000 --- a/vendor/psy/psysh/CONTRIBUTING.md +++ /dev/null @@ -1,18 +0,0 @@ -## Code style - -Please make your code look like the other code in the project. PsySH follows [PSR-1](http://php-fig.org/psr/psr-1/) and [PSR-2](http://php-fig.org/psr/psr-2/). The easiest way to do make sure you're following the coding standard is to run `vendor/bin/php-cs-fixer fix` before committing. - -## Branching model - -Please branch off and send pull requests to the `develop` branch. - -## Building the manual - -```sh -svn co https://svn.php.net/repository/phpdoc/en/trunk/reference/ php_manual -bin/build_manual phpdoc_manual ~/.local/share/psysh/php_manual.sqlite -``` - -To build the manual for another language, switch out `en` above for `de`, `es`, or any of the other languages listed in the docs. - -[Partial or outdated documentation is available for other languages](http://www.php.net/manual/help-translate.php) but these translations are outdated, so their content may be completely wrong or insecure! diff --git a/vendor/psy/psysh/LICENSE b/vendor/psy/psysh/LICENSE index fdd27fb7..2c6a4513 100644 --- a/vendor/psy/psysh/LICENSE +++ b/vendor/psy/psysh/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2012-2017 Justin Hileman +Copyright (c) 2012-2018 Justin Hileman Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/psy/psysh/Makefile b/vendor/psy/psysh/Makefile new file mode 100644 index 00000000..a1fdb42e --- /dev/null +++ b/vendor/psy/psysh/Makefile @@ -0,0 +1,95 @@ +PSYSH_SRC = bin src box.json.dist composer.json build/stub +PSYSH_SRC_FILES = $(shell find src -type f -name "*.php") +VERSION = $(shell git describe --tag --always --dirty=-dev) + +COMPOSER_OPTS = --no-interaction --no-progress --verbose +COMPOSER_REQUIRE_OPTS = $(COMPOSER_OPTS) --no-update +COMPOSER_UPDATE_OPTS = $(COMPOSER_OPTS) --prefer-stable --no-dev --classmap-authoritative --prefer-dist + + +# Commands + +.PHONY: help clean build dist +.DEFAULT_GOAL := help + +help: + @echo "\033[33mUsage:\033[0m\n make TARGET\n\n\033[33mTargets:\033[0m" + @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-7s\033[0m %s\n", $$1, $$2}' + +clean: ## Clean all created artifacts + rm -rf build/* + rm -rf dist/* + rm -rf vendor-bin/*/vendor/ + +build: ## Compile PHARs +build: build/psysh/psysh build/psysh-compat/psysh build/psysh-php54/psysh build/psysh-php54-compat/psysh + +dist: ## Build tarballs for distribution +dist: dist/psysh-$(VERSION).tar.gz dist/psysh-$(VERSION)-compat.tar.gz dist/psysh-$(VERSION)-php54.tar.gz dist/psysh-$(VERSION)-php54-compat.tar.gz + + +# All the composer stuffs + +composer.lock: composer.json + composer install + touch $@ + +vendor/autoload.php: composer.lock + composer install + touch $@ + +vendor/bin/box: vendor/autoload.php + composer bin box install + touch $@ + + +# Lots of PHARs + +build/stub: bin/build-stub bin/psysh LICENSE + bin/build-stub + +build/psysh: $(PSYSH_SRC) $(PSYSH_SRC_FILES) + rm -rf $@ || true + mkdir $@ + cp -R $(PSYSH_SRC) $@/ + composer config --working-dir $@ platform.php 7.0 + composer require --working-dir $@ $(COMPOSER_REQUIRE_OPTS) php:'>=7.0.0' + composer update --working-dir $@ $(COMPOSER_UPDATE_OPTS) + +build/psysh-compat: $(PSYSH_SRC) $(PSYSH_SRC_FILES) + rm -rf $@ || true + mkdir $@ + cp -R $(PSYSH_SRC) $@/ + composer config --working-dir $@ platform.php 7.0 + composer require --working-dir $@ $(COMPOSER_REQUIRE_OPTS) php:'>=7.0.0' + composer require --working-dir $@ $(COMPOSER_REQUIRE_OPTS) symfony/polyfill-iconv symfony/polyfill-mbstring hoa/console + composer update --working-dir $@ $(COMPOSER_UPDATE_OPTS) + +build/psysh-php54: $(PSYSH_SRC) $(PSYSH_SRC_FILES) + rm -rf $@ || true + mkdir $@ + cp -R $(PSYSH_SRC) $@/ + composer config --working-dir $@ platform.php 5.4 + composer update --working-dir $@ $(COMPOSER_UPDATE_OPTS) + +build/psysh-php54-compat: $(PSYSH_SRC) $(PSYSH_SRC_FILES) + rm -rf $@ || true + mkdir $@ + cp -R $(PSYSH_SRC) $@/ + composer config --working-dir $@ platform.php 5.4 + composer require --working-dir $@ $(COMPOSER_REQUIRE_OPTS) symfony/polyfill-iconv symfony/polyfill-mbstring hoa/console:^2.15 + composer update --working-dir $@ $(COMPOSER_UPDATE_OPTS) + +build/%/psysh: vendor/bin/box build/% + vendor/bin/box compile --working-dir $(dir $@) + + +# Dist packages + +dist/psysh-$(VERSION).tar.gz: build/psysh/psysh + @mkdir -p $(@D) + tar -C $(dir $<) -czf $@ $(notdir $<) + +dist/psysh-$(VERSION)-%.tar.gz: build/psysh-%/psysh + @mkdir -p $(@D) + tar -C $(dir $<) -czf $@ $(notdir $<) diff --git a/vendor/psy/psysh/README.md b/vendor/psy/psysh/README.md index 45dd6a3b..710434ca 100644 --- a/vendor/psy/psysh/README.md +++ b/vendor/psy/psysh/README.md @@ -17,6 +17,7 @@ PsySH is a runtime developer console, interactive debugger and [REPL](https://en ### [💾 Installation](https://github.com/bobthecow/psysh/wiki/Installation) * [📕 PHP manual installation](https://github.com/bobthecow/psysh/wiki/PHP-manual) + * Windows ### [🖥 Usage](https://github.com/bobthecow/psysh/wiki/Usage) * [✨ Magic variables](https://github.com/bobthecow/psysh/wiki/Magic-variables) diff --git a/vendor/psy/psysh/bin/build b/vendor/psy/psysh/bin/build deleted file mode 100755 index 79f2192b..00000000 --- a/vendor/psy/psysh/bin/build +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -e - -cd "${BASH_SOURCE%/*}/.." - -echo "Building phar" -./bin/build-vendor -php -d 'phar.readonly=0' ./bin/build-phar - -echo "Building compat phar" -./bin/build-vendor-compat -php -d 'phar.readonly=0' ./bin/build-phar --compat diff --git a/vendor/psy/psysh/bin/build-manual b/vendor/psy/psysh/bin/build-manual deleted file mode 100755 index ece22781..00000000 --- a/vendor/psy/psysh/bin/build-manual +++ /dev/null @@ -1,312 +0,0 @@ -#!/usr/bin/env php -': - $inTag = false; - break; - } - - if ($inTag) { - $tagWidth++; - } - - $i++; - - if (!$inTag && ($i - $tagWidth > $width)) { - $lastSpace = $lastSpace ?: $width; - - $return[] = trim(substr($text, 0, $lastSpace)); - $text = substr($text, $lastSpace); - $len = strlen($text); - - $i = $tagWidth = 0; - } - } while ($i < $len); - - $return[] = trim($text); - - return implode("\n", $return); -} - -function extract_paragraphs($element) -{ - $paragraphs = array(); - foreach ($element->getElementsByTagName('para') as $p) { - $text = ''; - foreach ($p->childNodes as $child) { - // @todo figure out if there's something we can do with tables. - if ($child instanceof DOMElement && $child->tagName === 'table') { - continue; - } - - // skip references, because ugh. - if (preg_match('{^\s*&[a-z][a-z\.]+;\s*$}', $child->textContent)) { - continue; - } - - $text .= $child->ownerDocument->saveXML($child); - } - - if ($text = trim(preg_replace('{\n[ \t]+}', ' ', $text))) { - $paragraphs[] = $text; - } - } - - return implode("\n\n", $paragraphs); -} - -function format_doc($doc) -{ - $chunks = array(); - - if (!empty($doc['description'])) { - $chunks[] = 'Description:'; - $chunks[] = indent_text(htmlwrap(thunk_tags($doc['description']), WRAP_WIDTH - 2)); - $chunks[] = ''; - } - - if (!empty($doc['params'])) { - $chunks[] = 'Param:'; - - $typeMax = max(array_map(function ($param) { - return strlen($param['type']); - }, $doc['params'])); - - $max = max(array_map(function ($param) { - return strlen($param['name']); - }, $doc['params'])); - - $template = ' %-' . $typeMax . 's %-' . $max . 's %s'; - $indent = str_repeat(' ', $typeMax + $max + 6); - $wrapWidth = WRAP_WIDTH - strlen($indent); - - foreach ($doc['params'] as $param) { - $desc = indent_text(htmlwrap(thunk_tags($param['description']), $wrapWidth), $indent, false); - $chunks[] = sprintf($template, $param['type'], $param['name'], $desc); - } - $chunks[] = ''; - } - - if (isset($doc['return']) || isset($doc['return_type'])) { - $chunks[] = 'Return:'; - - $type = isset($doc['return_type']) ? $doc['return_type'] : 'unknown'; - $desc = isset($doc['return']) ? $doc['return'] : ''; - - $indent = str_repeat(' ', strlen($type) + 4); - $wrapWidth = WRAP_WIDTH - strlen($indent); - - if (!empty($desc)) { - $desc = indent_text(htmlwrap(thunk_tags($doc['return']), $wrapWidth), $indent, false); - } - - $chunks[] = sprintf(' %s %s', $type, $desc); - $chunks[] = ''; - } - - array_pop($chunks); // get rid of the trailing newline - - return implode("\n", $chunks); -} - -function thunk_tags($text) -{ - $tagMap = array( - 'parameter>' => 'strong>', - 'function>' => 'strong>', - 'literal>' => 'return>', - 'type>' => 'info>', - 'constant>' => 'info>', - ); - - $andBack = array( - '&' => '&', - '&true;' => 'true', - '&false;' => 'false', - '&null;' => 'null', - ); - - return strtr(strip_tags(strtr($text, $tagMap), ''), $andBack); -} - -function indent_text($text, $indent = ' ', $leading = true) -{ - return ($leading ? $indent : '') . str_replace("\n", "\n" . $indent, $text); -} - -function find_type($xml, $paramName) -{ - foreach ($xml->getElementsByTagName('methodparam') as $param) { - if ($type = $param->getElementsByTagName('type')->item(0)) { - if ($parameter = $param->getElementsByTagName('parameter')->item(0)) { - if ($paramName === $parameter->textContent) { - return $type->textContent; - } - } - } - } -} - -function format_function_doc($xml) -{ - $doc = array(); - $refsect1s = $xml->getElementsByTagName('refsect1'); - foreach ($refsect1s as $refsect1) { - $role = $refsect1->getAttribute('role'); - switch ($role) { - case 'description': - $doc['description'] = extract_paragraphs($refsect1); - - if ($synopsis = $refsect1->getElementsByTagName('methodsynopsis')->item(0)) { - foreach ($synopsis->childNodes as $node) { - if ($node instanceof DOMElement && $node->tagName === 'type') { - $doc['return_type'] = $node->textContent; - break; - } - } - } - break; - - case 'returnvalues': - // do nothing. - $doc['return'] = extract_paragraphs($refsect1); - break; - - case 'parameters': - $params = array(); - $vars = $refsect1->getElementsByTagName('varlistentry'); - foreach ($vars as $var) { - if ($name = $var->getElementsByTagName('parameter')->item(0)) { - $params[] = array( - 'name' => '$' . $name->textContent, - 'type' => find_type($xml, $name->textContent), - 'description' => extract_paragraphs($var), - ); - } - } - - $doc['params'] = $params; - break; - } - } - - // and the purpose - if ($purpose = $xml->getElementsByTagName('refpurpose')->item(0)) { - $desc = htmlwrap($purpose->textContent); - if (isset($doc['description'])) { - $desc .= "\n\n" . $doc['description']; - } - - $doc['description'] = trim($desc); - } - - $ids = array(); - foreach ($xml->getElementsByTagName('refname') as $ref) { - $ids[] = $ref->textContent; - } - - return array($ids, format_doc($doc)); -} - -function format_class_doc($xml) -{ - // @todo implement this - return array(array(), null); -} - -$dir = new RecursiveDirectoryIterator($argv[1]); -$filter = new RecursiveCallbackFilterIterator($dir, function ($current, $key, $iterator) { - return $current->getFilename()[0] !== '.' && - ($current->isDir() || $current->getExtension() === 'xml') && - strpos($current->getFilename(), 'entities.') !== 0 && - $current->getFilename() !== 'pdo_4d'; // Temporarily blacklist this one, the docs are weird. -}); -$iterator = new RecursiveIteratorIterator($filter); - -$docs = array(); -foreach ($iterator as $file) { - $xmlstr = str_replace('&', '&', file_get_contents($file)); - - $xml = new DOMDocument(); - $xml->preserveWhiteSpace = false; - - if (!@$xml->loadXml($xmlstr)) { - echo "XML Parse Error: $file\n"; - continue; - } - - if ($xml->getElementsByTagName('refentry')->length !== 0) { - list($ids, $doc) = format_function_doc($xml); - } elseif ($xml->getElementsByTagName('classref')->length !== 0) { - list($ids, $doc) = format_class_doc($xml); - } else { - $ids = array(); - $doc = null; - } - - foreach ($ids as $id) { - $docs[$id] = $doc; - } -} - -if (is_file($argv[2])) { - unlink($argv[2]); -} - -$db = new PDO('sqlite:' . $argv[2]); - -$db->query('CREATE TABLE php_manual (id char(256) PRIMARY KEY, doc TEXT)'); -$cmd = $db->prepare('INSERT INTO php_manual (id, doc) VALUES (?, ?)'); -foreach ($docs as $id => $doc) { - $cmd->execute(array($id, $doc)); -} diff --git a/vendor/psy/psysh/bin/build-phar b/vendor/psy/psysh/bin/build-phar deleted file mode 100755 index 43db2f6b..00000000 --- a/vendor/psy/psysh/bin/build-phar +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env php -compile('psysh-compat.phar'); -} else { - $compiler->compile(); -} diff --git a/vendor/psy/psysh/bin/build-stub b/vendor/psy/psysh/bin/build-stub new file mode 100755 index 00000000..0d26110e --- /dev/null +++ b/vendor/psy/psysh/bin/build-stub @@ -0,0 +1,22 @@ +#!/usr/bin/env php +>> \*/}sm', $autoload, $content); +$content = preg_replace('/\\(c\\) .*?with this source code./sm', $license, $content); + +$content .= '__HALT_COMPILER();'; + +@mkdir(dirname(__DIR__) . '/build'); + +file_put_contents(dirname(__DIR__) . '/build/stub', $content); diff --git a/vendor/psy/psysh/bin/build-vendor b/vendor/psy/psysh/bin/build-vendor deleted file mode 100755 index f0057d52..00000000 --- a/vendor/psy/psysh/bin/build-vendor +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -e - -cd "${BASH_SOURCE%/*}/.." - -rm -rf build-vendor - -COMPOSER_VENDOR_DIR=build-vendor composer update \ - --prefer-stable --no-dev --no-progress --classmap-authoritative --no-interaction --verbose diff --git a/vendor/psy/psysh/bin/build-vendor-compat b/vendor/psy/psysh/bin/build-vendor-compat deleted file mode 100755 index a3cedb59..00000000 --- a/vendor/psy/psysh/bin/build-vendor-compat +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -e - -cd "${BASH_SOURCE%/*}/.." - -rm -rf build-vendor -rm composer*.lock - -cp composer.json composer-compat.json - -if [[ $(php --version) = PHP\ 5.3* ]]; then - HOA_VERSION=^1.14 -fi - -COMPOSER=composer-compat.json COMPOSER_VENDOR_DIR=build-vendor \ - composer require symfony/intl hoa/console $HOA_VERSION --no-progress --no-update --no-interaction --verbose - -COMPOSER=composer-compat.json COMPOSER_VENDOR_DIR=build-vendor \ - composer update --prefer-stable --no-dev --no-progress --classmap-authoritative --no-interaction --verbose - diff --git a/vendor/psy/psysh/bin/package b/vendor/psy/psysh/bin/package deleted file mode 100755 index 2bb6e411..00000000 --- a/vendor/psy/psysh/bin/package +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -set -e - -cd "${BASH_SOURCE%/*}/.." - -USAGE="usage: bin/package [-v PACKAGE_VERSION]" - -while getopts ":v:h" opt; do - case $opt in - v) - PKG_VERSION=$OPTARG - ;; - h) - echo $USAGE >&2 - exit - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - echo $USAGE >&2 - exit 1 - ;; - :) - echo "Option -$OPTARG requires an argument" >&2 - echo $USAGE >&2 - exit 1 - ;; - esac -done - -if [ -z "$PKG_VERSION" ]; then - PKG_VERSION=$(git describe --tag --exact-match) -fi - -if [[ $(php --version) = PHP\ 5.3* ]]; then - PKG_VERSION=${PKG_VERSION}-php53 -fi - -echo "Packaging $PKG_VERSION" - -mkdir -p dist || exit 1 - -./bin/build || exit 1 -chmod +x *.phar - -echo "Creating tarballs" - -# Support BSD tar because OS X :( -if [[ $(tar --version) = bsdtar* ]]; then - tar -s "/.*/psysh/" -czf dist/psysh-${PKG_VERSION}.tar.gz psysh.phar - tar -s "/.*/psysh/" -czf dist/psysh-${PKG_VERSION}-compat.tar.gz psysh-compat.phar -else - tar --transform "s/.*/psysh/" -czf dist/psysh-${PKG_VERSION}.tar.gz psysh.phar - tar --transform "s/.*/psysh/" -czf dist/psysh-${PKG_VERSION}-compat.tar.gz psysh-compat.phar -fi diff --git a/vendor/psy/psysh/bin/psysh b/vendor/psy/psysh/bin/psysh index e1d6350c..7dbd203e 100755 --- a/vendor/psy/psysh/bin/psysh +++ b/vendor/psy/psysh/bin/psysh @@ -98,6 +98,9 @@ if (!class_exists('Psy\Shell')) { // If the psysh binary was included directly, assume they just wanted an // autoloader and bail early. +// +// Keep this PHP 5.3 code around for a while in case someone is using a globally +// installed psysh as a bin launcher for older local versions. if (version_compare(PHP_VERSION, '5.3.6', '<')) { $trace = debug_backtrace(); } elseif (version_compare(PHP_VERSION, '5.4.0', '<')) { diff --git a/vendor/psy/psysh/box.json.dist b/vendor/psy/psysh/box.json.dist new file mode 100644 index 00000000..32305a52 --- /dev/null +++ b/vendor/psy/psysh/box.json.dist @@ -0,0 +1,13 @@ +{ + "stub": "stub", + "output": "psysh", + "compactors": [ + "KevinGH\\Box\\Compactor\\Php" + ], + "chmod": "0755", + "blacklist": [ + "grammar", + "test_old", + "Documentation" + ] +} diff --git a/vendor/psy/psysh/composer.json b/vendor/psy/psysh/composer.json index 69c226cb..3e169be9 100644 --- a/vendor/psy/psysh/composer.json +++ b/vendor/psy/psysh/composer.json @@ -13,17 +13,17 @@ } ], "require": { - "php": ">=5.3.9", + "php": ">=5.4.0", "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", "symfony/var-dumper": "~2.7|~3.0|~4.0", - "nikic/php-parser": "~1.3|~2.0|~3.0", + "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0", "dnoegel/php-xdg-base-dir": "0.1", "jakub-onderka/php-console-highlighter": "0.3.*" }, "require-dev": { - "phpunit/phpunit": "^4.8.35|^5.4.3", - "symfony/finder": "~2.1|~3.0|~4.0", - "hoa/console": "~3.16|~1.14" + "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0", + "hoa/console": "~2.15|~3.16", + "bamarni/composer-bin-plugin": "^1.2" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", @@ -33,20 +33,20 @@ "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." }, "autoload": { - "files": ["src/Psy/functions.php"], + "files": ["src/functions.php"], "psr-4": { - "Psy\\": "src/Psy/" + "Psy\\": "src/" } }, "autoload-dev": { "psr-4": { - "Psy\\Test\\": "test/Psy/Test/" + "Psy\\Test\\": "test/" } }, "bin": ["bin/psysh"], "extra": { "branch-alias": { - "dev-develop": "0.8.x-dev" + "dev-develop": "0.9.x-dev" } } } diff --git a/vendor/psy/psysh/phpunit.xml.dist b/vendor/psy/psysh/phpunit.xml.dist index 78b2b330..3534fca2 100644 --- a/vendor/psy/psysh/phpunit.xml.dist +++ b/vendor/psy/psysh/phpunit.xml.dist @@ -6,7 +6,7 @@ - ./src/Psy + ./src diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner.php b/vendor/psy/psysh/src/CodeCleaner.php similarity index 71% rename from vendor/psy/psysh/src/Psy/CodeCleaner.php rename to vendor/psy/psysh/src/CodeCleaner.php index fa3a8785..0f0d378f 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner.php +++ b/vendor/psy/psysh/src/CodeCleaner.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,16 +26,17 @@ use Psy\CodeCleaner\ImplicitReturnPass; use Psy\CodeCleaner\InstanceOfPass; use Psy\CodeCleaner\LeavePsyshAlonePass; use Psy\CodeCleaner\LegacyEmptyPass; +use Psy\CodeCleaner\ListPass; use Psy\CodeCleaner\LoopContextPass; use Psy\CodeCleaner\MagicConstantsPass; use Psy\CodeCleaner\NamespacePass; use Psy\CodeCleaner\PassableByReferencePass; use Psy\CodeCleaner\RequirePass; -use Psy\CodeCleaner\StaticConstructorPass; use Psy\CodeCleaner\StrictTypesPass; use Psy\CodeCleaner\UseStatementPass; use Psy\CodeCleaner\ValidClassNamePass; use Psy\CodeCleaner\ValidConstantPass; +use Psy\CodeCleaner\ValidConstructorPass; use Psy\CodeCleaner\ValidFunctionNamePass; use Psy\Exception\ParseErrorException; @@ -80,7 +81,14 @@ class CodeCleaner */ private function getDefaultPasses() { - return array( + $useStatementPass = new UseStatementPass(); + $namespacePass = new NamespacePass($this); + + // Try to add implicit `use` statements and an implicit namespace, + // based on the file in which the `debug` call was made. + $this->addImplicitDebugContext([$useStatementPass, $namespacePass]); + + return [ // Validation passes new AbstractClassPass(), new AssignThisVariablePass(), @@ -92,16 +100,17 @@ class CodeCleaner new InstanceOfPass(), new LeavePsyshAlonePass(), new LegacyEmptyPass(), + new ListPass(), new LoopContextPass(), new PassableByReferencePass(), - new StaticConstructorPass(), + new ValidConstructorPass(), // Rewriting shenanigans - new UseStatementPass(), // must run before the namespace pass + $useStatementPass, // must run before the namespace pass new ExitPass(), new ImplicitReturnPass(), new MagicConstantsPass(), - new NamespacePass($this), // must run after the implicit return pass + $namespacePass, // must run after the implicit return pass new RequirePass(), new StrictTypesPass(), @@ -109,7 +118,88 @@ class CodeCleaner new ValidClassNamePass(), new ValidConstantPass(), new ValidFunctionNamePass(), - ); + ]; + } + + /** + * "Warm up" code cleaner passes when we're coming from a debug call. + * + * This is useful, for example, for `UseStatementPass` and `NamespacePass` + * which keep track of state between calls, to maintain the current + * namespace and a map of use statements. + * + * @param array $passes + */ + private function addImplicitDebugContext(array $passes) + { + $file = $this->getDebugFile(); + if ($file === null) { + return; + } + + try { + $code = @file_get_contents($file); + if (!$code) { + return; + } + + $stmts = $this->parse($code, true); + if ($stmts === false) { + return; + } + + // Set up a clean traverser for just these code cleaner passes + $traverser = new NodeTraverser(); + foreach ($passes as $pass) { + $traverser->addVisitor($pass); + } + + $traverser->traverse($stmts); + } catch (\Throwable $e) { + // Don't care. + } catch (\Exception $e) { + // Still don't care. + } + } + + /** + * Search the stack trace for a file in which the user called Psy\debug. + * + * @return string|null + */ + private static function getDebugFile() + { + $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); + + foreach (array_reverse($trace) as $stackFrame) { + if (!self::isDebugCall($stackFrame)) { + continue; + } + + if (preg_match('/eval\(/', $stackFrame['file'])) { + preg_match_all('/([^\(]+)\((\d+)/', $stackFrame['file'], $matches); + + return $matches[1][0]; + } + + return $stackFrame['file']; + } + } + + /** + * Check whether a given backtrace frame is a call to Psy\debug. + * + * @param array $stackFrame + * + * @return bool + */ + private static function isDebugCall(array $stackFrame) + { + $class = isset($stackFrame['class']) ? $stackFrame['class'] : null; + $function = isset($stackFrame['function']) ? $stackFrame['function'] : null; + + return ($class === null && $function === 'Psy\debug') || + ($class === 'Psy\Shell' && $function === 'debug'); } /** diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/AbstractClassPass.php b/vendor/psy/psysh/src/CodeCleaner/AbstractClassPass.php similarity index 96% rename from vendor/psy/psysh/src/Psy/CodeCleaner/AbstractClassPass.php rename to vendor/psy/psysh/src/CodeCleaner/AbstractClassPass.php index fad6d8f5..66eaf42c 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/AbstractClassPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/AbstractClassPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -33,7 +33,7 @@ class AbstractClassPass extends CodeCleanerPass { if ($node instanceof Class_) { $this->class = $node; - $this->abstractMethods = array(); + $this->abstractMethods = []; } elseif ($node instanceof ClassMethod) { if ($node->isAbstract()) { $name = sprintf('%s::%s', $this->class->name, $node->name); diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/AssignThisVariablePass.php b/vendor/psy/psysh/src/CodeCleaner/AssignThisVariablePass.php similarity index 96% rename from vendor/psy/psysh/src/Psy/CodeCleaner/AssignThisVariablePass.php rename to vendor/psy/psysh/src/CodeCleaner/AssignThisVariablePass.php index b1b3eaf1..4c42d97f 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/AssignThisVariablePass.php +++ b/vendor/psy/psysh/src/CodeCleaner/AssignThisVariablePass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/CallTimePassByReferencePass.php b/vendor/psy/psysh/src/CodeCleaner/CallTimePassByReferencePass.php similarity index 90% rename from vendor/psy/psysh/src/Psy/CodeCleaner/CallTimePassByReferencePass.php rename to vendor/psy/psysh/src/CodeCleaner/CallTimePassByReferencePass.php index 5a5eeba1..cff2c519 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/CallTimePassByReferencePass.php +++ b/vendor/psy/psysh/src/CodeCleaner/CallTimePassByReferencePass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -31,16 +31,12 @@ class CallTimePassByReferencePass extends CodeCleanerPass /** * Validate of use call-time pass-by-reference. * - * @throws RuntimeException if the user used call-time pass-by-reference in PHP >= 5.4.0 + * @throws RuntimeException if the user used call-time pass-by-reference * * @param Node $node */ public function enterNode(Node $node) { - if (version_compare(PHP_VERSION, '5.4', '<')) { - return; - } - if (!$node instanceof FuncCall && !$node instanceof MethodCall && !$node instanceof StaticCall) { return; } diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/CalledClassPass.php b/vendor/psy/psysh/src/CodeCleaner/CalledClassPass.php similarity index 95% rename from vendor/psy/psysh/src/Psy/CodeCleaner/CalledClassPass.php rename to vendor/psy/psysh/src/CodeCleaner/CalledClassPass.php index 4a0f7ea8..280be3b7 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/CalledClassPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/CalledClassPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -59,7 +59,7 @@ class CalledClassPass extends CodeCleanerPass } $name = strtolower($node->name); - if (in_array($name, array('get_class', 'get_called_class'))) { + if (in_array($name, ['get_class', 'get_called_class'])) { $msg = sprintf('%s() called without object from outside a class', $name); throw new ErrorException($msg, 0, E_USER_WARNING, null, $node->getLine()); } diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/CodeCleanerPass.php b/vendor/psy/psysh/src/CodeCleaner/CodeCleanerPass.php similarity index 92% rename from vendor/psy/psysh/src/Psy/CodeCleaner/CodeCleanerPass.php rename to vendor/psy/psysh/src/CodeCleaner/CodeCleanerPass.php index 4c61b8b5..58e5d05e 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/CodeCleanerPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/CodeCleanerPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/ExitPass.php b/vendor/psy/psysh/src/CodeCleaner/ExitPass.php similarity index 95% rename from vendor/psy/psysh/src/Psy/CodeCleaner/ExitPass.php rename to vendor/psy/psysh/src/CodeCleaner/ExitPass.php index bdd132a7..349a5c57 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/ExitPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/ExitPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/FinalClassPass.php b/vendor/psy/psysh/src/CodeCleaner/FinalClassPass.php similarity index 95% rename from vendor/psy/psysh/src/Psy/CodeCleaner/FinalClassPass.php rename to vendor/psy/psysh/src/CodeCleaner/FinalClassPass.php index c509bef5..bf1063fd 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/FinalClassPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/FinalClassPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -27,7 +27,7 @@ class FinalClassPass extends CodeCleanerPass */ public function beforeTraverse(array $nodes) { - $this->finalClasses = array(); + $this->finalClasses = []; } /** diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/FunctionContextPass.php b/vendor/psy/psysh/src/CodeCleaner/FunctionContextPass.php similarity index 97% rename from vendor/psy/psysh/src/Psy/CodeCleaner/FunctionContextPass.php rename to vendor/psy/psysh/src/CodeCleaner/FunctionContextPass.php index 16ee9fc2..adff5ca1 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/FunctionContextPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/FunctionContextPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/FunctionReturnInWriteContextPass.php b/vendor/psy/psysh/src/CodeCleaner/FunctionReturnInWriteContextPass.php similarity index 86% rename from vendor/psy/psysh/src/Psy/CodeCleaner/FunctionReturnInWriteContextPass.php rename to vendor/psy/psysh/src/CodeCleaner/FunctionReturnInWriteContextPass.php index 42aae5ec..c3aad342 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/FunctionReturnInWriteContextPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/FunctionReturnInWriteContextPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -32,11 +32,11 @@ class FunctionReturnInWriteContextPass extends CodeCleanerPass const PHP55_MESSAGE = 'Cannot use isset() on the result of a function call (you can use "null !== func()" instead)'; const EXCEPTION_MESSAGE = "Can't use function return value in write context"; - private $isPhp55; + private $atLeastPhp55; public function __construct() { - $this->isPhp55 = version_compare(PHP_VERSION, '5.5', '>='); + $this->atLeastPhp55 = version_compare(PHP_VERSION, '5.5', '>='); } /** @@ -64,11 +64,11 @@ class FunctionReturnInWriteContextPass extends CodeCleanerPass continue; } - $msg = ($node instanceof Isset_ && $this->isPhp55) ? self::PHP55_MESSAGE : self::EXCEPTION_MESSAGE; + $msg = ($node instanceof Isset_ && $this->atLeastPhp55) ? self::PHP55_MESSAGE : self::EXCEPTION_MESSAGE; throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine()); } - } elseif ($node instanceof Empty_ && !$this->isPhp55 && $this->isCallNode($node->expr)) { - throw new FatalErrorException(self::EXCEPTION_MESSAGE, 0, E_ERROR, null, $node->getLine()); + } elseif ($node instanceof Empty_ && !$this->atLeastPhp55 && $this->isCallNode($node->expr)) { + throw new FatalErrorException(self::EXCEPTION_MESSAGE, 0, E_ERROR, null, $node->getLine()); // @codeCoverageIgnore } elseif ($node instanceof Assign && $this->isCallNode($node->var)) { throw new FatalErrorException(self::EXCEPTION_MESSAGE, 0, E_ERROR, null, $node->getLine()); } diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/ImplicitReturnPass.php b/vendor/psy/psysh/src/CodeCleaner/ImplicitReturnPass.php similarity index 71% rename from vendor/psy/psysh/src/Psy/CodeCleaner/ImplicitReturnPass.php rename to vendor/psy/psysh/src/CodeCleaner/ImplicitReturnPass.php index c738bdc1..971a9804 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/ImplicitReturnPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/ImplicitReturnPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,12 +11,12 @@ namespace Psy\CodeCleaner; +use PhpParser\Node; use PhpParser\Node\Expr; use PhpParser\Node\Expr\Exit_; -use PhpParser\Node\Expr\New_; -use PhpParser\Node\Name\FullyQualified as FullyQualifiedName; use PhpParser\Node\Stmt; use PhpParser\Node\Stmt\Break_; +use PhpParser\Node\Stmt\Expression; use PhpParser\Node\Stmt\If_; use PhpParser\Node\Stmt\Namespace_; use PhpParser\Node\Stmt\Return_; @@ -46,7 +46,7 @@ class ImplicitReturnPass extends CodeCleanerPass { // If nodes is empty, it can't have a return value. if (empty($nodes)) { - return array(new Return_(new New_(new FullyQualifiedName('Psy\CodeCleaner\NoReturnValue')))); + return [new Return_(NoReturnValue::create())]; } $last = end($nodes); @@ -75,10 +75,18 @@ class ImplicitReturnPass extends CodeCleanerPass } } } elseif ($last instanceof Expr && !($last instanceof Exit_)) { - $nodes[count($nodes) - 1] = new Return_($last, array( + // @codeCoverageIgnoreStart + $nodes[count($nodes) - 1] = new Return_($last, [ 'startLine' => $last->getLine(), 'endLine' => $last->getLine(), - )); + ]); + // @codeCoverageIgnoreEnd + } elseif ($last instanceof Expression && !($last->expr instanceof Exit_)) { + // For PHP Parser 4.x + $nodes[count($nodes) - 1] = new Return_($last->expr, [ + 'startLine' => $last->getLine(), + 'endLine' => $last->getLine(), + ]); } elseif ($last instanceof Namespace_) { $last->stmts = $this->addImplicitReturn($last->stmts); } @@ -93,10 +101,28 @@ class ImplicitReturnPass extends CodeCleanerPass // We're not adding a fallback return after namespace statements, // because code outside namespace statements doesn't really work, and // there's already an implicit return in the namespace statement anyway. - if ($last instanceof Stmt && !$last instanceof Return_ && !$last instanceof Namespace_) { - $nodes[] = new Return_(new New_(new FullyQualifiedName('Psy\CodeCleaner\NoReturnValue'))); + if (self::isNonExpressionStmt($last)) { + $nodes[] = new Return_(NoReturnValue::create()); } return $nodes; } + + /** + * Check whether a given node is a non-expression statement. + * + * As of PHP Parser 4.x, Expressions are now instances of Stmt as well, so + * we'll exclude them here. + * + * @param Node $node + * + * @return bool + */ + private static function isNonExpressionStmt(Node $node) + { + return $node instanceof Stmt && + !$node instanceof Expression && + !$node instanceof Return_ && + !$node instanceof Namespace_; + } } diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php b/vendor/psy/psysh/src/CodeCleaner/InstanceOfPass.php similarity index 97% rename from vendor/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php rename to vendor/psy/psysh/src/CodeCleaner/InstanceOfPass.php index 78ce98e9..44e24cae 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/InstanceOfPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/LeavePsyshAlonePass.php b/vendor/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php similarity index 92% rename from vendor/psy/psysh/src/Psy/CodeCleaner/LeavePsyshAlonePass.php rename to vendor/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php index e6a3bbde..08f6fbee 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/LeavePsyshAlonePass.php +++ b/vendor/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -30,7 +30,7 @@ class LeavePsyshAlonePass extends CodeCleanerPass public function enterNode(Node $node) { if ($node instanceof Variable && $node->name === '__psysh__') { - throw new RuntimeException('Don\'t mess with $__psysh__. Bad things will happen.'); + throw new RuntimeException('Don\'t mess with $__psysh__; bad things will happen'); } } } diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/LegacyEmptyPass.php b/vendor/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php similarity index 86% rename from vendor/psy/psysh/src/Psy/CodeCleaner/LegacyEmptyPass.php rename to vendor/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php index dc5a01ed..a298c849 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/LegacyEmptyPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -19,9 +19,18 @@ use Psy\Exception\ParseErrorException; /** * Validate that the user did not call the language construct `empty()` on a * statement in PHP < 5.5. + * + * @codeCoverageIgnore */ class LegacyEmptyPass extends CodeCleanerPass { + private $atLeastPhp55; + + public function __construct() + { + $this->atLeastPhp55 = version_compare(PHP_VERSION, '5.5', '>='); + } + /** * Validate use of empty in PHP < 5.5. * @@ -31,7 +40,7 @@ class LegacyEmptyPass extends CodeCleanerPass */ public function enterNode(Node $node) { - if (version_compare(PHP_VERSION, '5.5', '>=')) { + if ($this->atLeastPhp55) { return; } diff --git a/vendor/psy/psysh/src/CodeCleaner/ListPass.php b/vendor/psy/psysh/src/CodeCleaner/ListPass.php new file mode 100644 index 00000000..04d32e9f --- /dev/null +++ b/vendor/psy/psysh/src/CodeCleaner/ListPass.php @@ -0,0 +1,89 @@ +atLeastPhp71 = version_compare(PHP_VERSION, '7.1', '>='); + } + + /** + * Validate use of list assignment. + * + * @throws ParseErrorException if the user used empty with anything but a variable + * + * @param Node $node + */ + public function enterNode(Node $node) + { + if (!$node instanceof Assign) { + return; + } + + if (!$node->var instanceof Array_ && !$node->var instanceof List_) { + return; + } + + if (!$this->atLeastPhp71 && $node->var instanceof Array_) { + $msg = "syntax error, unexpected '='"; + throw new ParseErrorException($msg, $node->expr->getLine()); + } + + // Polyfill for PHP-Parser 2.x + $items = isset($node->var->items) ? $node->var->items : $node->var->vars; + + if ($items === [] || $items === [null]) { + throw new ParseErrorException('Cannot use empty list', $node->var->getLine()); + } + + $itemFound = false; + foreach ($items as $item) { + if ($item === null) { + continue; + } + + $itemFound = true; + + // List_->$vars in PHP-Parser 2.x is Variable instead of ArrayItem. + if (!$this->atLeastPhp71 && $item instanceof ArrayItem && $item->key !== null) { + $msg = 'Syntax error, unexpected T_CONSTANT_ENCAPSED_STRING, expecting \',\' or \')\''; + throw new ParseErrorException($msg, $item->key->getLine()); + } + + $value = ($item instanceof ArrayItem) ? $item->value : $item; + + if (!$value instanceof Variable) { + $msg = 'Assignments can only happen to writable values'; + throw new ParseErrorException($msg, $item->getLine()); + } + } + + if (!$itemFound) { + throw new ParseErrorException('Cannot use empty list'); + } + } +} diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/LoopContextPass.php b/vendor/psy/psysh/src/CodeCleaner/LoopContextPass.php similarity index 91% rename from vendor/psy/psysh/src/Psy/CodeCleaner/LoopContextPass.php rename to vendor/psy/psysh/src/CodeCleaner/LoopContextPass.php index e8f65bb9..9744fcb6 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/LoopContextPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/LoopContextPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -28,14 +28,8 @@ use Psy\Exception\FatalErrorException; */ class LoopContextPass extends CodeCleanerPass { - private $isPHP54; private $loopDepth; - public function __construct() - { - $this->isPHP54 = version_compare(PHP_VERSION, '5.4.0', '>='); - } - /** * {@inheritdoc} */ @@ -74,7 +68,7 @@ class LoopContextPass extends CodeCleanerPass if ($node->num instanceof LNumber || $node->num instanceof DNumber) { $num = $node->num->value; - if ($this->isPHP54 && ($node->num instanceof DNumber || $num < 1)) { + if ($node->num instanceof DNumber || $num < 1) { $msg = sprintf("'%s' operator accepts only positive numbers", $operator); throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine()); } @@ -83,7 +77,7 @@ class LoopContextPass extends CodeCleanerPass $msg = sprintf("Cannot '%s' %d levels", $operator, $num); throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine()); } - } elseif ($node->num && $this->isPHP54) { + } elseif ($node->num) { $msg = sprintf("'%s' operator with non-constant operand is no longer supported", $operator); throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine()); } diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/MagicConstantsPass.php b/vendor/psy/psysh/src/CodeCleaner/MagicConstantsPass.php similarity index 89% rename from vendor/psy/psysh/src/Psy/CodeCleaner/MagicConstantsPass.php rename to vendor/psy/psysh/src/CodeCleaner/MagicConstantsPass.php index 328eb256..50936b2c 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/MagicConstantsPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/MagicConstantsPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -34,7 +34,7 @@ class MagicConstantsPass extends CodeCleanerPass public function enterNode(Node $node) { if ($node instanceof Dir) { - return new FuncCall(new Name('getcwd'), array(), $node->getAttributes()); + return new FuncCall(new Name('getcwd'), [], $node->getAttributes()); } elseif ($node instanceof File) { return new String_('', $node->getAttributes()); } diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/NamespaceAwarePass.php b/vendor/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php similarity index 91% rename from vendor/psy/psysh/src/Psy/CodeCleaner/NamespaceAwarePass.php rename to vendor/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php index 4a76d0f6..9b404450 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/NamespaceAwarePass.php +++ b/vendor/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -32,8 +32,8 @@ abstract class NamespaceAwarePass extends CodeCleanerPass */ public function beforeTraverse(array $nodes) { - $this->namespace = array(); - $this->currentScope = array(); + $this->namespace = []; + $this->currentScope = []; } /** @@ -45,7 +45,7 @@ abstract class NamespaceAwarePass extends CodeCleanerPass public function enterNode(Node $node) { if ($node instanceof Namespace_) { - $this->namespace = isset($node->name) ? $node->name->parts : array(); + $this->namespace = isset($node->name) ? $node->name->parts : []; } } @@ -63,7 +63,7 @@ abstract class NamespaceAwarePass extends CodeCleanerPass } elseif ($name instanceof Name) { $name = $name->parts; } elseif (!is_array($name)) { - $name = array($name); + $name = [$name]; } return implode('\\', array_merge($this->namespace, $name)); diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/NamespacePass.php b/vendor/psy/psysh/src/CodeCleaner/NamespacePass.php similarity index 70% rename from vendor/psy/psysh/src/Psy/CodeCleaner/NamespacePass.php rename to vendor/psy/psysh/src/CodeCleaner/NamespacePass.php index 37ef9f24..af825376 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/NamespacePass.php +++ b/vendor/psy/psysh/src/CodeCleaner/NamespacePass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -54,13 +54,24 @@ class NamespacePass extends CodeCleanerPass } $last = end($nodes); - if (!$last instanceof Namespace_) { - return $this->namespace ? array(new Namespace_($this->namespace, $nodes)) : $nodes; + + if ($last instanceof Namespace_) { + $kind = $last->getAttribute('kind'); + + // Treat all namespace statements pre-PHP-Parser v3.1.2 as "open", + // even though we really have no way of knowing. + if ($kind === null || $kind === Namespace_::KIND_SEMICOLON) { + // Save the current namespace for open namespaces + $this->setNamespace($last->name); + } else { + // Clear the current namespace after a braced namespace + $this->setNamespace(null); + } + + return $nodes; } - $this->setNamespace($last->name); - - return $nodes; + return $this->namespace ? [new Namespace_($this->namespace, $nodes)] : $nodes; } /** diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/NoReturnValue.php b/vendor/psy/psysh/src/CodeCleaner/NoReturnValue.php similarity index 56% rename from vendor/psy/psysh/src/Psy/CodeCleaner/NoReturnValue.php rename to vendor/psy/psysh/src/CodeCleaner/NoReturnValue.php index 3784f4b3..90325701 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/NoReturnValue.php +++ b/vendor/psy/psysh/src/CodeCleaner/NoReturnValue.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,6 +11,9 @@ namespace Psy\CodeCleaner; +use PhpParser\Node\Expr\New_; +use PhpParser\Node\Name\FullyQualified as FullyQualifiedName; + /** * A class used internally by CodeCleaner to represent input, such as * non-expression statements, with no return value. @@ -20,5 +23,13 @@ namespace Psy\CodeCleaner; */ class NoReturnValue { - // this space intentionally left blank + /** + * Get PhpParser AST expression for creating a new NoReturnValue. + * + * @return PhpParser\Node\Expr\New_ + */ + public static function create() + { + return new New_(new FullyQualifiedName('Psy\CodeCleaner\NoReturnValue')); + } } diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/PassableByReferencePass.php b/vendor/psy/psysh/src/CodeCleaner/PassableByReferencePass.php similarity index 99% rename from vendor/psy/psysh/src/Psy/CodeCleaner/PassableByReferencePass.php rename to vendor/psy/psysh/src/CodeCleaner/PassableByReferencePass.php index 5d9936c7..4380eef2 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/PassableByReferencePass.php +++ b/vendor/psy/psysh/src/CodeCleaner/PassableByReferencePass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/RequirePass.php b/vendor/psy/psysh/src/CodeCleaner/RequirePass.php similarity index 93% rename from vendor/psy/psysh/src/Psy/CodeCleaner/RequirePass.php rename to vendor/psy/psysh/src/CodeCleaner/RequirePass.php index 00b50608..0e805611 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/RequirePass.php +++ b/vendor/psy/psysh/src/CodeCleaner/RequirePass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,7 +26,7 @@ use Psy\Shell; */ class RequirePass extends CodeCleanerPass { - private static $requireTypes = array(Include_::TYPE_REQUIRE, Include_::TYPE_REQUIRE_ONCE); + private static $requireTypes = [Include_::TYPE_REQUIRE, Include_::TYPE_REQUIRE_ONCE]; /** * {@inheritdoc} @@ -51,7 +51,7 @@ class RequirePass extends CodeCleanerPass $node->expr = new StaticCall( new FullyQualifiedName('Psy\CodeCleaner\RequirePass'), 'resolve', - array(new Arg($origNode->expr), new Arg(new LNumber($origNode->getLine()))), + [new Arg($origNode->expr), new Arg(new LNumber($origNode->getLine()))], $origNode->getAttributes() ); diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php b/vendor/psy/psysh/src/CodeCleaner/StrictTypesPass.php similarity index 77% rename from vendor/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php rename to vendor/psy/psysh/src/CodeCleaner/StrictTypesPass.php index 5966f0c5..a63fe75e 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/StrictTypesPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,6 +11,7 @@ namespace Psy\CodeCleaner; +use PhpParser\Node\Identifier; use PhpParser\Node\Scalar\LNumber; use PhpParser\Node\Stmt\Declare_; use PhpParser\Node\Stmt\DeclareDeclare; @@ -31,6 +32,12 @@ class StrictTypesPass extends CodeCleanerPass const EXCEPTION_MESSAGE = 'strict_types declaration must have 0 or 1 as its value'; private $strictTypes = false; + private $atLeastPhp7; + + public function __construct() + { + $this->atLeastPhp7 = version_compare(PHP_VERSION, '7.0', '>='); + } /** * If this is a standalone strict types declaration, remember it for later. @@ -44,8 +51,8 @@ class StrictTypesPass extends CodeCleanerPass */ public function beforeTraverse(array $nodes) { - if (version_compare(PHP_VERSION, '7.0', '<')) { - return; + if (!$this->atLeastPhp7) { + return; // @codeCoverageIgnore } $prependStrictTypes = $this->strictTypes; @@ -53,7 +60,9 @@ class StrictTypesPass extends CodeCleanerPass foreach ($nodes as $key => $node) { if ($node instanceof Declare_) { foreach ($node->declares as $declare) { - if ($declare->key === 'strict_types') { + // For PHP Parser 4.x + $declareKey = $declare->key instanceof Identifier ? $declare->key->toString() : $declare->key; + if ($declareKey === 'strict_types') { $value = $declare->value; if (!$value instanceof LNumber || ($value->value !== 0 && $value->value !== 1)) { throw new FatalErrorException(self::EXCEPTION_MESSAGE, 0, E_ERROR, null, $node->getLine()); @@ -68,7 +77,7 @@ class StrictTypesPass extends CodeCleanerPass if ($prependStrictTypes) { $first = reset($nodes); if (!$first instanceof Declare_) { - $declare = new Declare_(array(new DeclareDeclare('strict_types', new LNumber(1)))); + $declare = new Declare_([new DeclareDeclare('strict_types', new LNumber(1))]); array_unshift($nodes, $declare); } } diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/UseStatementPass.php b/vendor/psy/psysh/src/CodeCleaner/UseStatementPass.php similarity index 86% rename from vendor/psy/psysh/src/Psy/CodeCleaner/UseStatementPass.php rename to vendor/psy/psysh/src/CodeCleaner/UseStatementPass.php index c1ce64d3..d6ca878c 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/UseStatementPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/UseStatementPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -17,6 +17,7 @@ use PhpParser\Node\Name\FullyQualified as FullyQualifiedName; use PhpParser\Node\Stmt\GroupUse; use PhpParser\Node\Stmt\Namespace_; use PhpParser\Node\Stmt\Use_; +use PhpParser\NodeTraverser; /** * Provide implicit use statements for subsequent execution. @@ -30,8 +31,8 @@ use PhpParser\Node\Stmt\Use_; */ class UseStatementPass extends CodeCleanerPass { - private $aliases = array(); - private $lastAliases = array(); + private $aliases = []; + private $lastAliases = []; private $lastNamespace = null; /** @@ -68,26 +69,28 @@ class UseStatementPass extends CodeCleanerPass // Store a reference to every "use" statement, because we'll need // them in a bit. foreach ($node->uses as $use) { - $this->aliases[strtolower($use->alias)] = $use->name; + $alias = $use->alias ?: end($use->name->parts); + $this->aliases[strtolower($alias)] = $use->name; } - return false; + return NodeTraverser::REMOVE_NODE; } elseif ($node instanceof GroupUse) { // Expand every "use" statement in the group into a full, standalone // "use" and store 'em with the others. foreach ($node->uses as $use) { - $this->aliases[strtolower($use->alias)] = Name::concat($node->prefix, $use->name, array( + $alias = $use->alias ?: end($use->name->parts); + $this->aliases[strtolower($alias)] = Name::concat($node->prefix, $use->name, [ 'startLine' => $node->prefix->getAttribute('startLine'), 'endLine' => $use->name->getAttribute('endLine'), - )); + ]); } - return false; + return NodeTraverser::REMOVE_NODE; } elseif ($node instanceof Namespace_) { // Start fresh, since we're done with this namespace. $this->lastNamespace = $node->name; $this->lastAliases = $this->aliases; - $this->aliases = array(); + $this->aliases = []; } else { foreach ($node as $name => $subNode) { if ($subNode instanceof Name) { diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/ValidClassNamePass.php b/vendor/psy/psysh/src/CodeCleaner/ValidClassNamePass.php similarity index 91% rename from vendor/psy/psysh/src/Psy/CodeCleaner/ValidClassNamePass.php rename to vendor/psy/psysh/src/CodeCleaner/ValidClassNamePass.php index c91471ef..682399bf 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/ValidClassNamePass.php +++ b/vendor/psy/psysh/src/CodeCleaner/ValidClassNamePass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -38,12 +38,12 @@ class ValidClassNamePass extends NamespaceAwarePass const INTERFACE_TYPE = 'interface'; const TRAIT_TYPE = 'trait'; - protected $checkTraits; private $conditionalScopes = 0; + private $atLeastPhp55; public function __construct() { - $this->checkTraits = function_exists('trait_exists'); + $this->atLeastPhp55 = version_compare(PHP_VERSION, '5.5', '>='); } /** @@ -53,7 +53,7 @@ class ValidClassNamePass extends NamespaceAwarePass * presence and can validate constant fetches and static calls in class or * trait methods. * - * @param Node + * @param Node $node */ public function enterNode(Node $node) { @@ -115,7 +115,7 @@ class ValidClassNamePass extends NamespaceAwarePass */ protected function validateClassStatement(Class_ $stmt) { - $this->ensureCanDefine($stmt); + $this->ensureCanDefine($stmt, self::CLASS_TYPE); if (isset($stmt->extends)) { $this->ensureClassExists($this->getFullyQualifiedName($stmt->extends), $stmt); } @@ -129,7 +129,7 @@ class ValidClassNamePass extends NamespaceAwarePass */ protected function validateInterfaceStatement(Interface_ $stmt) { - $this->ensureCanDefine($stmt); + $this->ensureCanDefine($stmt, self::INTERFACE_TYPE); $this->ensureInterfacesExist($stmt->extends, $stmt); } @@ -140,7 +140,7 @@ class ValidClassNamePass extends NamespaceAwarePass */ protected function validateTraitStatement(Trait_ $stmt) { - $this->ensureCanDefine($stmt); + $this->ensureCanDefine($stmt, self::TRAIT_TYPE); } /** @@ -164,8 +164,7 @@ class ValidClassNamePass extends NamespaceAwarePass protected function validateClassConstFetchExpression(ClassConstFetch $stmt) { // there is no need to check exists for ::class const for php 5.5 or newer - if (strtolower($stmt->name) === 'class' - && version_compare(PHP_VERSION, '5.5', '>=')) { + if (strtolower($stmt->name) === 'class' && $this->atLeastPhp55) { return; } @@ -193,9 +192,10 @@ class ValidClassNamePass extends NamespaceAwarePass * * @throws FatalErrorException * - * @param Stmt $stmt + * @param Stmt $stmt + * @param string $scopeType */ - protected function ensureCanDefine(Stmt $stmt) + protected function ensureCanDefine(Stmt $stmt, $scopeType = self::CLASS_TYPE) { $name = $this->getFullyQualifiedName($stmt->name); @@ -215,7 +215,7 @@ class ValidClassNamePass extends NamespaceAwarePass // Store creation for the rest of this code snippet so we can find local // issue too - $this->currentScope[strtolower($name)] = $this->getScopeType($stmt); + $this->currentScope[strtolower($name)] = $scopeType; } /** @@ -262,7 +262,7 @@ class ValidClassNamePass extends NamespaceAwarePass $this->ensureClassExists($class, $stmt); // let's pretend all calls to self, parent and static are valid - if (in_array(strtolower($class), array('self', 'parent', 'static'))) { + if (in_array(strtolower($class), ['self', 'parent', 'static'])) { return; } @@ -286,8 +286,8 @@ class ValidClassNamePass extends NamespaceAwarePass * * @throws FatalErrorException * - * @param $interfaces - * @param Stmt $stmt + * @param Interface_[] $interfaces + * @param Stmt $stmt */ protected function ensureInterfacesExist($interfaces, $stmt) { @@ -303,6 +303,9 @@ class ValidClassNamePass extends NamespaceAwarePass /** * Get a symbol type key for storing in the scope name cache. * + * @deprecated No longer used. Scope type should be passed into ensureCanDefine directly. + * @codeCoverageIgnore + * * @param Stmt $stmt * * @return string @@ -332,7 +335,7 @@ class ValidClassNamePass extends NamespaceAwarePass // Give `self`, `static` and `parent` a pass. This will actually let // some errors through, since we're not checking whether the keyword is // being used in a class scope. - if (in_array(strtolower($name), array('self', 'static', 'parent'))) { + if (in_array(strtolower($name), ['self', 'static', 'parent'])) { return true; } @@ -360,7 +363,7 @@ class ValidClassNamePass extends NamespaceAwarePass */ protected function traitExists($name) { - return $this->checkTraits && (trait_exists($name) || $this->findInScope($name) === self::TRAIT_TYPE); + return trait_exists($name) || $this->findInScope($name) === self::TRAIT_TYPE; } /** diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/ValidConstantPass.php b/vendor/psy/psysh/src/CodeCleaner/ValidConstantPass.php similarity index 89% rename from vendor/psy/psysh/src/Psy/CodeCleaner/ValidConstantPass.php rename to vendor/psy/psysh/src/CodeCleaner/ValidConstantPass.php index e84f3de6..7134bb28 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/ValidConstantPass.php +++ b/vendor/psy/psysh/src/CodeCleaner/ValidConstantPass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -15,6 +15,7 @@ use PhpParser\Node; use PhpParser\Node\Expr; use PhpParser\Node\Expr\ClassConstFetch; use PhpParser\Node\Expr\ConstFetch; +use PhpParser\Node\Identifier; use Psy\Exception\FatalErrorException; /** @@ -62,8 +63,11 @@ class ValidConstantPass extends NamespaceAwarePass */ protected function validateClassConstFetchExpression(ClassConstFetch $stmt) { + // For PHP Parser 4.x + $constName = $stmt->name instanceof Identifier ? $stmt->name->toString() : $stmt->name; + // give the `class` pseudo-constant a pass - if ($stmt->name === 'class') { + if ($constName === 'class') { return; } @@ -75,9 +79,9 @@ class ValidConstantPass extends NamespaceAwarePass // defined in the same line it's used or something stupid like that. if (class_exists($className) || interface_exists($className)) { $refl = new \ReflectionClass($className); - if (!$refl->hasConstant($stmt->name)) { + if (!$refl->hasConstant($constName)) { $constType = class_exists($className) ? 'Class' : 'Interface'; - $msg = sprintf('%s constant \'%s::%s\' not found', $constType, $className, $stmt->name); + $msg = sprintf('%s constant \'%s::%s\' not found', $constType, $className, $constName); throw new FatalErrorException($msg, 0, E_ERROR, null, $stmt->getLine()); } } diff --git a/vendor/psy/psysh/src/CodeCleaner/ValidConstructorPass.php b/vendor/psy/psysh/src/CodeCleaner/ValidConstructorPass.php new file mode 100644 index 00000000..b049dbc0 --- /dev/null +++ b/vendor/psy/psysh/src/CodeCleaner/ValidConstructorPass.php @@ -0,0 +1,112 @@ + + */ +class ValidConstructorPass extends CodeCleanerPass +{ + private $namespace; + + public function beforeTraverse(array $nodes) + { + $this->namespace = []; + } + + /** + * Validate that the constructor is not static and does not have a return type. + * + * @throws FatalErrorException the constructor function is static + * @throws FatalErrorException the constructor function has a return type + * + * @param Node $node + */ + public function enterNode(Node $node) + { + if ($node instanceof Namespace_) { + $this->namespace = isset($node->name) ? $node->name->parts : []; + } elseif ($node instanceof Class_) { + $constructor = null; + foreach ($node->stmts as $stmt) { + if ($stmt instanceof ClassMethod) { + // If we find a new-style constructor, no need to look for the old-style + if ('__construct' === strtolower($stmt->name)) { + $this->validateConstructor($stmt, $node); + + return; + } + + // We found a possible old-style constructor (unless there is also a __construct method) + if (empty($this->namespace) && strtolower($node->name) === strtolower($stmt->name)) { + $constructor = $stmt; + } + } + } + + if ($constructor) { + $this->validateConstructor($constructor, $node); + } + } + } + + /** + * @throws FatalErrorException the constructor function is static + * @throws FatalErrorException the constructor function has a return type + * + * @param Node $constructor + * @param Node $classNode + */ + private function validateConstructor(Node $constructor, Node $classNode) + { + if ($constructor->isStatic()) { + // For PHP Parser 4.x + $className = $classNode->name instanceof Identifier ? $classNode->name->toString() : $classNode->name; + + $msg = sprintf( + 'Constructor %s::%s() cannot be static', + implode('\\', array_merge($this->namespace, (array) $className)), + $constructor->name + ); + throw new FatalErrorException($msg, 0, E_ERROR, null, $classNode->getLine()); + } + + if (method_exists($constructor, 'getReturnType') && $constructor->getReturnType()) { + // For PHP Parser 4.x + $className = $classNode->name instanceof Identifier ? $classNode->name->toString() : $classNode->name; + + $msg = sprintf( + 'Constructor %s::%s() cannot declare a return type', + implode('\\', array_merge($this->namespace, (array) $className)), + $constructor->name + ); + throw new FatalErrorException($msg, 0, E_ERROR, null, $classNode->getLine()); + } + } +} diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/ValidFunctionNamePass.php b/vendor/psy/psysh/src/CodeCleaner/ValidFunctionNamePass.php similarity index 99% rename from vendor/psy/psysh/src/Psy/CodeCleaner/ValidFunctionNamePass.php rename to vendor/psy/psysh/src/CodeCleaner/ValidFunctionNamePass.php index 0da5138f..a6bf01e7 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/ValidFunctionNamePass.php +++ b/vendor/psy/psysh/src/CodeCleaner/ValidFunctionNamePass.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Command/BufferCommand.php b/vendor/psy/psysh/src/Command/BufferCommand.php similarity index 94% rename from vendor/psy/psysh/src/Psy/Command/BufferCommand.php rename to vendor/psy/psysh/src/Command/BufferCommand.php index 3a8abcb1..6319ccf8 100644 --- a/vendor/psy/psysh/src/Psy/Command/BufferCommand.php +++ b/vendor/psy/psysh/src/Command/BufferCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -30,10 +30,10 @@ class BufferCommand extends Command { $this ->setName('buffer') - ->setAliases(array('buf')) - ->setDefinition(array( + ->setAliases(['buf']) + ->setDefinition([ new InputOption('clear', '', InputOption::VALUE_NONE, 'Clear the current buffer.'), - )) + ]) ->setDescription('Show (or clear) the contents of the code input buffer.') ->setHelp( <<<'HELP' diff --git a/vendor/psy/psysh/src/Psy/Command/ClearCommand.php b/vendor/psy/psysh/src/Command/ClearCommand.php similarity index 93% rename from vendor/psy/psysh/src/Psy/Command/ClearCommand.php rename to vendor/psy/psysh/src/Command/ClearCommand.php index 470f61de..1a5b845d 100644 --- a/vendor/psy/psysh/src/Psy/Command/ClearCommand.php +++ b/vendor/psy/psysh/src/Command/ClearCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -28,7 +28,7 @@ class ClearCommand extends Command { $this ->setName('clear') - ->setDefinition(array()) + ->setDefinition([]) ->setDescription('Clear the Psy Shell screen.') ->setHelp( <<<'HELP' diff --git a/vendor/psy/psysh/src/Psy/Command/Command.php b/vendor/psy/psysh/src/Command/Command.php similarity index 96% rename from vendor/psy/psysh/src/Psy/Command/Command.php rename to vendor/psy/psysh/src/Command/Command.php index c8aaedee..83e1dcea 100644 --- a/vendor/psy/psysh/src/Psy/Command/Command.php +++ b/vendor/psy/psysh/src/Command/Command.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -34,7 +34,7 @@ abstract class Command extends BaseCommand public function setApplication(Application $application = null) { if ($application !== null && !$application instanceof Shell) { - throw new \InvalidArgumentException('PsySH Commands require an instance of Psy\Shell.'); + throw new \InvalidArgumentException('PsySH Commands require an instance of Psy\Shell'); } return parent::setApplication($application); @@ -45,11 +45,11 @@ abstract class Command extends BaseCommand */ public function asText() { - $messages = array( + $messages = [ 'Usage:', ' ' . $this->getSynopsis(), '', - ); + ]; if ($this->getAliases()) { $messages[] = $this->aliasesAsText(); @@ -90,7 +90,7 @@ abstract class Command extends BaseCommand */ protected function getHiddenArguments() { - return array('command'); + return ['command']; } /** @@ -112,7 +112,7 @@ abstract class Command extends BaseCommand */ protected function getHiddenOptions() { - return array('verbose'); + return ['verbose']; } /** @@ -133,7 +133,7 @@ abstract class Command extends BaseCommand private function argumentsAsText() { $max = $this->getMaxWidth(); - $messages = array(); + $messages = []; $arguments = $this->getArguments(); if (!empty($arguments)) { @@ -164,7 +164,7 @@ abstract class Command extends BaseCommand private function optionsAsText() { $max = $this->getMaxWidth(); - $messages = array(); + $messages = []; $options = $this->getOptions(); if ($options) { @@ -260,7 +260,7 @@ abstract class Command extends BaseCommand $table = new Table($output); return $table - ->setRows(array()) + ->setRows([]) ->setStyle($style); } @@ -274,7 +274,7 @@ abstract class Command extends BaseCommand $table = $this->getApplication()->getHelperSet()->get('table'); return $table - ->setRows(array()) + ->setRows([]) ->setLayout(TableHelper::LAYOUT_BORDERLESS) ->setHorizontalBorderChar('') ->setCrossingChar(''); diff --git a/vendor/psy/psysh/src/Psy/Command/DocCommand.php b/vendor/psy/psysh/src/Command/DocCommand.php similarity index 79% rename from vendor/psy/psysh/src/Psy/Command/DocCommand.php rename to vendor/psy/psysh/src/Command/DocCommand.php index 9f5fb5b9..fe202869 100644 --- a/vendor/psy/psysh/src/Psy/Command/DocCommand.php +++ b/vendor/psy/psysh/src/Command/DocCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,8 +13,9 @@ namespace Psy\Command; use Psy\Formatter\DocblockFormatter; use Psy\Formatter\SignatureFormatter; +use Psy\Input\CodeArgument; +use Psy\Reflection\ReflectionClassConstant; use Psy\Reflection\ReflectionLanguageConstruct; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -30,10 +31,10 @@ class DocCommand extends ReflectingCommand { $this ->setName('doc') - ->setAliases(array('rtfm', 'man')) - ->setDefinition(array( - new InputArgument('value', InputArgument::REQUIRED, 'Function, class, instance, constant, method or property to document.'), - )) + ->setAliases(['rtfm', 'man']) + ->setDefinition([ + new CodeArgument('target', CodeArgument::REQUIRED, 'Function, class, instance, constant, method or property to document.'), + ]) ->setDescription('Read the documentation for an object, class, constant, method or property.') ->setHelp( <<getArgument('value'); + $value = $input->getArgument('target'); if (ReflectionLanguageConstruct::isLanguageConstruct($value)) { $reflector = new ReflectionLanguageConstruct($value); $doc = $this->getManualDocById($value); @@ -101,6 +102,18 @@ HELP $id = $reflector->class . '::$' . $reflector->name; break; + case 'ReflectionClassConstant': + case 'Psy\Reflection\ReflectionClassConstant': + // @todo this is going to collide with ReflectionMethod ids + // someday... start running the query by id + type if the DB + // supports it. + $id = $reflector->class . '::' . $reflector->name; + break; + + case 'Psy\Reflection\ReflectionConstant_': + $id = $reflector->name; + break; + default: return false; } diff --git a/vendor/psy/psysh/src/Psy/Command/DumpCommand.php b/vendor/psy/psysh/src/Command/DumpCommand.php similarity index 63% rename from vendor/psy/psysh/src/Psy/Command/DumpCommand.php rename to vendor/psy/psysh/src/Command/DumpCommand.php index abb9b88a..77bd0e2d 100644 --- a/vendor/psy/psysh/src/Psy/Command/DumpCommand.php +++ b/vendor/psy/psysh/src/Command/DumpCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,10 +11,9 @@ namespace Psy\Command; -use Psy\Exception\RuntimeException; +use Psy\Input\CodeArgument; use Psy\VarDumper\Presenter; use Psy\VarDumper\PresenterAware; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -45,11 +44,11 @@ class DumpCommand extends ReflectingCommand implements PresenterAware { $this ->setName('dump') - ->setDefinition(array( - new InputArgument('target', InputArgument::REQUIRED, 'A target object or primitive to dump.', null), - new InputOption('depth', '', InputOption::VALUE_REQUIRED, 'Depth to parse', 10), + ->setDefinition([ + new CodeArgument('target', CodeArgument::REQUIRED, 'A target object or primitive to dump.'), + new InputOption('depth', '', InputOption::VALUE_REQUIRED, 'Depth to parse.', 10), new InputOption('all', 'a', InputOption::VALUE_NONE, 'Include private and protected methods and properties.'), - )) + ]) ->setDescription('Dump an object or primitive.') ->setHelp( <<<'HELP' @@ -60,6 +59,7 @@ This is like var_dump but way awesomer. e.g. >>> dump $_ >>> dump $someVar +>>> dump $stuff->getAll() HELP ); } @@ -70,7 +70,7 @@ HELP protected function execute(InputInterface $input, OutputInterface $output) { $depth = $input->getOption('depth'); - $target = $this->resolveTarget($input->getArgument('target')); + $target = $this->resolveCode($input->getArgument('target')); $output->page($this->presenter->present($target, $depth, $input->getOption('all') ? Presenter::VERBOSE : 0)); if (is_object($target)) { @@ -79,27 +79,16 @@ HELP } /** - * Resolve dump target name. + * @deprecated Use `resolveCode` instead * - * @throws RuntimeException if target name does not exist in the current scope - * - * @param string $target + * @param string $name * * @return mixed */ - protected function resolveTarget($target) + protected function resolveTarget($name) { - $matches = array(); - if (preg_match(self::SUPERGLOBAL, $target, $matches)) { - if (!array_key_exists($matches[1], $GLOBALS)) { - throw new RuntimeException('Unknown target: ' . $target); - } + @trigger_error('`resolveTarget` is deprecated; use `resolveCode` instead.', E_USER_DEPRECATED); - return $GLOBALS[$matches[1]]; - } elseif (preg_match(self::INSTANCE, $target, $matches)) { - return $this->getScopeVariable($matches[1]); - } else { - throw new RuntimeException('Unknown target: ' . $target); - } + return $this->resolveCode($name); } } diff --git a/vendor/psy/psysh/src/Psy/Command/EditCommand.php b/vendor/psy/psysh/src/Command/EditCommand.php similarity index 96% rename from vendor/psy/psysh/src/Psy/Command/EditCommand.php rename to vendor/psy/psysh/src/Command/EditCommand.php index a1c6ee43..7d955692 100644 --- a/vendor/psy/psysh/src/Psy/Command/EditCommand.php +++ b/vendor/psy/psysh/src/Command/EditCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -49,7 +49,7 @@ class EditCommand extends Command implements ContextAware { $this ->setName('edit') - ->setDefinition(array( + ->setDefinition([ new InputArgument('file', InputArgument::OPTIONAL, 'The file to open for editing. If this is not given, edits a temporary file.', null), new InputOption( 'exec', @@ -65,7 +65,7 @@ class EditCommand extends Command implements ContextAware 'Do not execute the file content after editing. This is the default when a file name argument is given.', null ), - )) + ]) ->setDescription('Open an external editor. Afterwards, get produced code in input buffer.') ->setHelp('Set the EDITOR environment variable to something you\'d like to use.'); } @@ -81,7 +81,7 @@ class EditCommand extends Command implements ContextAware { if ($input->getOption('exec') && $input->getOption('no-exec')) { - throw new \InvalidArgumentException('The --exec and --no-exec flags are mutually exclusive.'); + throw new \InvalidArgumentException('The --exec and --no-exec flags are mutually exclusive'); } $filePath = $this->extractFilePath($input->getArgument('file')); @@ -158,8 +158,8 @@ class EditCommand extends Command implements ContextAware { $escapedFilePath = escapeshellarg($filePath); - $pipes = array(); - $proc = proc_open((getenv('EDITOR') ?: 'nano') . " {$escapedFilePath}", array(STDIN, STDOUT, STDERR), $pipes); + $pipes = []; + $proc = proc_open((getenv('EDITOR') ?: 'nano') . " {$escapedFilePath}", [STDIN, STDOUT, STDERR], $pipes); proc_close($proc); $editedContent = @file_get_contents($filePath); diff --git a/vendor/psy/psysh/src/Psy/Command/ExitCommand.php b/vendor/psy/psysh/src/Command/ExitCommand.php similarity index 85% rename from vendor/psy/psysh/src/Psy/Command/ExitCommand.php rename to vendor/psy/psysh/src/Command/ExitCommand.php index 10c64b47..43398861 100644 --- a/vendor/psy/psysh/src/Psy/Command/ExitCommand.php +++ b/vendor/psy/psysh/src/Command/ExitCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -29,8 +29,8 @@ class ExitCommand extends Command { $this ->setName('exit') - ->setAliases(array('quit', 'q')) - ->setDefinition(array()) + ->setAliases(['quit', 'q']) + ->setDefinition([]) ->setDescription('End the current session and return to caller.') ->setHelp( <<<'HELP' @@ -47,6 +47,6 @@ HELP */ protected function execute(InputInterface $input, OutputInterface $output) { - throw new BreakException('Goodbye.'); + throw new BreakException('Goodbye'); } } diff --git a/vendor/psy/psysh/src/Psy/Command/HelpCommand.php b/vendor/psy/psysh/src/Command/HelpCommand.php similarity index 92% rename from vendor/psy/psysh/src/Psy/Command/HelpCommand.php rename to vendor/psy/psysh/src/Command/HelpCommand.php index fd32ddef..a50f2562 100644 --- a/vendor/psy/psysh/src/Psy/Command/HelpCommand.php +++ b/vendor/psy/psysh/src/Command/HelpCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -32,10 +32,10 @@ class HelpCommand extends Command { $this ->setName('help') - ->setAliases(array('?')) - ->setDefinition(array( - new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', null), - )) + ->setAliases(['?']) + ->setDefinition([ + new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name.', null), + ]) ->setDescription('Show a list of commands. Type `help [foo]` for information about [foo].') ->setHelp('My. How meta.'); } @@ -79,11 +79,11 @@ class HelpCommand extends Command $aliases = ''; } - $table->addRow(array( + $table->addRow([ sprintf('%s', $name), $command->getDescription(), $aliases, - )); + ]); } $output->startPaging(); diff --git a/vendor/psy/psysh/src/Psy/Command/HistoryCommand.php b/vendor/psy/psysh/src/Command/HistoryCommand.php similarity index 90% rename from vendor/psy/psysh/src/Psy/Command/HistoryCommand.php rename to vendor/psy/psysh/src/Command/HistoryCommand.php index da2d3274..eef8ef9d 100644 --- a/vendor/psy/psysh/src/Psy/Command/HistoryCommand.php +++ b/vendor/psy/psysh/src/Command/HistoryCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -27,6 +27,7 @@ use Symfony\Component\Console\Output\OutputInterface; class HistoryCommand extends Command { private $filter; + private $readline; /** * {@inheritdoc} @@ -57,9 +58,9 @@ class HistoryCommand extends Command $this ->setName('history') - ->setAliases(array('hist')) - ->setDefinition(array( - new InputOption('show', 's', InputOption::VALUE_REQUIRED, 'Show the given range of lines'), + ->setAliases(['hist']) + ->setDefinition([ + new InputOption('show', 's', InputOption::VALUE_REQUIRED, 'Show the given range of lines.'), new InputOption('head', 'H', InputOption::VALUE_REQUIRED, 'Display the first N items.'), new InputOption('tail', 'T', InputOption::VALUE_REQUIRED, 'Display the last N items.'), @@ -70,9 +71,9 @@ class HistoryCommand extends Command new InputOption('no-numbers', 'N', InputOption::VALUE_NONE, 'Omit line numbers.'), new InputOption('save', '', InputOption::VALUE_REQUIRED, 'Save history to a file.'), - new InputOption('replay', '', InputOption::VALUE_NONE, 'Replay'), + new InputOption('replay', '', InputOption::VALUE_NONE, 'Replay.'), new InputOption('clear', '', InputOption::VALUE_NONE, 'Clear the history.'), - )) + ]) ->setDescription('Show the Psy Shell history.') ->setHelp( <<<'HELP' @@ -92,8 +93,8 @@ HELP */ protected function execute(InputInterface $input, OutputInterface $output) { - $this->validateOnlyOne($input, array('show', 'head', 'tail')); - $this->validateOnlyOne($input, array('save', 'replay', 'clear')); + $this->validateOnlyOne($input, ['show', 'head', 'tail']); + $this->validateOnlyOne($input, ['save', 'replay', 'clear']); $history = $this->getHistorySlice( $input->getOption('show'), @@ -104,13 +105,13 @@ HELP $this->filter->bind($input); if ($this->filter->hasFilter()) { - $matches = array(); - $highlighted = array(); + $matches = []; + $highlighted = []; foreach ($history as $i => $line) { if ($this->filter->match($line, $matches)) { if (isset($matches[0])) { $chunks = explode($matches[0], $history[$i]); - $chunks = array_map(array(__CLASS__, 'escape'), $chunks); + $chunks = array_map([__CLASS__, 'escape'], $chunks); $glue = sprintf('%s', self::escape($matches[0])); $highlighted[$i] = implode($glue, $chunks); @@ -127,7 +128,7 @@ HELP $output->writeln('History saved.'); } elseif ($input->getOption('replay')) { if (!($input->getOption('show') || $input->getOption('head') || $input->getOption('tail'))) { - throw new \InvalidArgumentException('You must limit history via --head, --tail or --show before replaying.'); + throw new \InvalidArgumentException('You must limit history via --head, --tail or --show before replaying'); } $count = count($history); @@ -156,15 +157,15 @@ HELP private function extractRange($range) { if (preg_match('/^\d+$/', $range)) { - return array($range, $range + 1); + return [$range, $range + 1]; } - $matches = array(); + $matches = []; if ($range !== '..' && preg_match('/^(\d*)\.\.(\d*)$/', $range, $matches)) { $start = $matches[1] ? intval($matches[1]) : 0; $end = $matches[2] ? intval($matches[2]) + 1 : PHP_INT_MAX; - return array($start, $end); + return [$start, $end]; } throw new \InvalidArgumentException('Unexpected range: ' . $range); @@ -191,14 +192,14 @@ HELP $length = $end - $start; } elseif ($head) { if (!preg_match('/^\d+$/', $head)) { - throw new \InvalidArgumentException('Please specify an integer argument for --head.'); + throw new \InvalidArgumentException('Please specify an integer argument for --head'); } $start = 0; $length = intval($head); } elseif ($tail) { if (!preg_match('/^\d+$/', $tail)) { - throw new \InvalidArgumentException('Please specify an integer argument for --tail.'); + throw new \InvalidArgumentException('Please specify an integer argument for --tail'); } $start = count($history) - $tail; diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand.php b/vendor/psy/psysh/src/Command/ListCommand.php similarity index 89% rename from vendor/psy/psysh/src/Psy/Command/ListCommand.php rename to vendor/psy/psysh/src/Command/ListCommand.php index 8ce02275..2e65895e 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand.php +++ b/vendor/psy/psysh/src/Command/ListCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -20,12 +20,12 @@ use Psy\Command\ListCommand\MethodEnumerator; use Psy\Command\ListCommand\PropertyEnumerator; use Psy\Command\ListCommand\VariableEnumerator; use Psy\Exception\RuntimeException; +use Psy\Input\CodeArgument; use Psy\Input\FilterOptions; use Psy\VarDumper\Presenter; use Psy\VarDumper\PresenterAware; use Symfony\Component\Console\Formatter\OutputFormatter; use Symfony\Component\Console\Helper\TableHelper; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -41,7 +41,7 @@ class ListCommand extends ReflectingCommand implements PresenterAware /** * PresenterAware interface. * - * @param Presenter $manager + * @param Presenter $presenter */ public function setPresenter(Presenter $presenter) { @@ -57,9 +57,9 @@ class ListCommand extends ReflectingCommand implements PresenterAware $this ->setName('ls') - ->setAliases(array('list', 'dir')) - ->setDefinition(array( - new InputArgument('target', InputArgument::OPTIONAL, 'A target class or object to list.', null), + ->setAliases(['list', 'dir']) + ->setDefinition([ + new CodeArgument('target', CodeArgument::OPTIONAL, 'A target class or object to list.'), new InputOption('vars', '', InputOption::VALUE_NONE, 'Display variables.'), new InputOption('constants', 'c', InputOption::VALUE_NONE, 'Display defined constants.'), @@ -84,7 +84,7 @@ class ListCommand extends ReflectingCommand implements PresenterAware new InputOption('all', 'a', InputOption::VALUE_NONE, 'Include private and protected methods and properties.'), new InputOption('long', 'l', InputOption::VALUE_NONE, 'List in long format: includes class names and method signatures.'), - )) + ]) ->setDescription('List local, instance or class variables, methods and constants.') ->setHelp( <<<'HELP' @@ -104,6 +104,7 @@ e.g. >>> ls -al ReflectionClass >>> ls --constants --category date >>> ls -l --functions --grep /^array_.*/ +>>> ls -l --properties new DateTime() HELP ); } @@ -119,7 +120,7 @@ HELP $method = $input->getOption('long') ? 'writeLong' : 'write'; if ($target = $input->getArgument('target')) { - list($target, $reflector) = $this->getTargetAndReflector($target, true); + list($target, $reflector) = $this->getTargetAndReflector($target); } else { $reflector = null; } @@ -151,7 +152,7 @@ HELP if (!isset($this->enumerators)) { $mgr = $this->presenter; - $this->enumerators = array( + $this->enumerators = [ new ClassConstantEnumerator($mgr), new ClassEnumerator($mgr), new ConstantEnumerator($mgr), @@ -160,7 +161,7 @@ HELP new PropertyEnumerator($mgr), new MethodEnumerator($mgr), new VariableEnumerator($mgr, $this->context), - ); + ]; } } @@ -177,7 +178,7 @@ HELP } foreach ($result as $label => $items) { - $names = array_map(array($this, 'formatItemName'), $items); + $names = array_map([$this, 'formatItemName'], $items); $output->writeln(sprintf('%s: %s', $label, implode(', ', $names))); } } @@ -202,9 +203,9 @@ HELP $output->writeln(''); $output->writeln(sprintf('%s:', $label)); - $table->setRows(array()); + $table->setRows([]); foreach ($items as $item) { - $table->addRow(array($this->formatItemName($item), $item['value'])); + $table->addRow([$this->formatItemName($item), $item['value']]); } if ($table instanceof TableHelper) { @@ -238,13 +239,13 @@ HELP { if (!$input->getArgument('target')) { // if no target is passed, there can be no properties or methods - foreach (array('properties', 'methods', 'no-inherit') as $option) { + foreach (['properties', 'methods', 'no-inherit'] as $option) { if ($input->getOption($option)) { - throw new RuntimeException('--' . $option . ' does not make sense without a specified target.'); + throw new RuntimeException('--' . $option . ' does not make sense without a specified target'); } } - foreach (array('globals', 'vars', 'constants', 'functions', 'classes', 'interfaces', 'traits') as $option) { + foreach (['globals', 'vars', 'constants', 'functions', 'classes', 'interfaces', 'traits'] as $option) { if ($input->getOption($option)) { return; } @@ -254,13 +255,13 @@ HELP $input->setOption('vars', true); } else { // if a target is passed, classes, functions, etc don't make sense - foreach (array('vars', 'globals', 'functions', 'classes', 'interfaces', 'traits') as $option) { + foreach (['vars', 'globals', 'functions', 'classes', 'interfaces', 'traits'] as $option) { if ($input->getOption($option)) { - throw new RuntimeException('--' . $option . ' does not make sense with a specified target.'); + throw new RuntimeException('--' . $option . ' does not make sense with a specified target'); } } - foreach (array('constants', 'properties', 'methods') as $option) { + foreach (['constants', 'properties', 'methods'] as $option) { if ($input->getOption($option)) { return; } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/ClassConstantEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/ClassConstantEnumerator.php similarity index 86% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/ClassConstantEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/ClassConstantEnumerator.php index fc974b2d..0b099270 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/ClassConstantEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/ClassConstantEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,7 +11,7 @@ namespace Psy\Command\ListCommand; -use Psy\Reflection\ReflectionConstant; +use Psy\Reflection\ReflectionClassConstant; use Symfony\Component\Console\Input\InputInterface; /** @@ -48,7 +48,7 @@ class ClassConstantEnumerator extends Enumerator return; } - $ret = array(); + $ret = []; $ret[$this->getKindLabel($reflector)] = $constants; return $ret; @@ -66,9 +66,9 @@ class ClassConstantEnumerator extends Enumerator { $className = $reflector->getName(); - $constants = array(); + $constants = []; foreach ($reflector->getConstants() as $name => $constant) { - $constReflector = new ReflectionConstant($reflector, $name); + $constReflector = ReflectionClassConstant::create($reflector, $name); if ($noInherit && $constReflector->getDeclaringClass()->getName() !== $className) { continue; @@ -77,9 +77,7 @@ class ClassConstantEnumerator extends Enumerator $constants[$name] = $constReflector; } - // @todo switch to ksort after we drop support for 5.3: - // ksort($constants, SORT_NATURAL | SORT_FLAG_CASE); - uksort($constants, 'strnatcasecmp'); + ksort($constants, SORT_NATURAL | SORT_FLAG_CASE); return $constants; } @@ -94,15 +92,15 @@ class ClassConstantEnumerator extends Enumerator protected function prepareConstants(array $constants) { // My kingdom for a generator. - $ret = array(); + $ret = []; foreach ($constants as $name => $constant) { if ($this->showItem($name)) { - $ret[$name] = array( + $ret[$name] = [ 'name' => $name, 'style' => self::IS_CONSTANT, 'value' => $this->presentRef($constant->getValue()), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/ClassEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/ClassEnumerator.php similarity index 89% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/ClassEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/ClassEnumerator.php index 6dcabe28..858f5a2e 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/ClassEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/ClassEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -38,7 +38,7 @@ class ClassEnumerator extends Enumerator $user = $input->getOption('user'); $internal = $input->getOption('internal'); - $ret = array(); + $ret = []; // only list classes, interfaces and traits if we are specifically asked @@ -50,11 +50,11 @@ class ClassEnumerator extends Enumerator $ret = array_merge($ret, $this->filterClasses('Interfaces', get_declared_interfaces(), $internal, $user)); } - if (function_exists('get_declared_traits') && $input->getOption('traits')) { + if ($input->getOption('traits')) { $ret = array_merge($ret, $this->filterClasses('Traits', get_declared_traits(), $internal, $user)); } - return array_map(array($this, 'prepareClasses'), array_filter($ret)); + return array_map([$this, 'prepareClasses'], array_filter($ret)); } /** @@ -72,7 +72,7 @@ class ClassEnumerator extends Enumerator */ protected function filterClasses($key, $classes, $internal, $user) { - $ret = array(); + $ret = []; if ($internal) { $ret['Internal ' . $key] = array_filter($classes, function ($class) { @@ -100,7 +100,7 @@ class ClassEnumerator extends Enumerator /** * Prepare formatted class array. * - * @param array $class + * @param array $classes * * @return array */ @@ -109,15 +109,15 @@ class ClassEnumerator extends Enumerator natcasesort($classes); // My kingdom for a generator. - $ret = array(); + $ret = []; foreach ($classes as $name) { if ($this->showItem($name)) { - $ret[$name] = array( + $ret[$name] = [ 'name' => $name, 'style' => self::IS_CLASS, 'value' => $this->presentSignature($name), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/ConstantEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/ConstantEnumerator.php similarity index 92% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/ConstantEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/ConstantEnumerator.php index 88d348d0..e17d42a0 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/ConstantEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/ConstantEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -43,7 +43,7 @@ class ConstantEnumerator extends Enumerator $internal = $input->getOption('internal'); $category = $input->getOption('category'); - $ret = array(); + $ret = []; if ($user) { $ret['User Constants'] = $this->getConstants('user'); @@ -62,7 +62,7 @@ class ConstantEnumerator extends Enumerator $ret['Constants'] = $this->getConstants(); } - return array_map(array($this, 'prepareConstants'), array_filter($ret)); + return array_map([$this, 'prepareConstants'], array_filter($ret)); } /** @@ -89,7 +89,7 @@ class ConstantEnumerator extends Enumerator return call_user_func_array('array_merge', $consts); } - return isset($consts[$category]) ? $consts[$category] : array(); + return isset($consts[$category]) ? $consts[$category] : []; } /** @@ -102,18 +102,18 @@ class ConstantEnumerator extends Enumerator protected function prepareConstants(array $constants) { // My kingdom for a generator. - $ret = array(); + $ret = []; $names = array_keys($constants); natcasesort($names); foreach ($names as $name) { if ($this->showItem($name)) { - $ret[$name] = array( + $ret[$name] = [ 'name' => $name, 'style' => self::IS_CONSTANT, 'value' => $this->presentRef($constants[$name]), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/Enumerator.php b/vendor/psy/psysh/src/Command/ListCommand/Enumerator.php similarity index 95% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/Enumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/Enumerator.php index 2508f96f..616543d0 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/Enumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/Enumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -49,7 +49,7 @@ abstract class Enumerator * Return a list of categorized things with the given input options and target. * * @param InputInterface $input - * @param Reflector $reflector + * @param \Reflector $reflector * @param mixed $target * * @return array @@ -77,7 +77,7 @@ abstract class Enumerator * ] * * @param InputInterface $input - * @param Reflector $reflector + * @param \Reflector $reflector * @param mixed $target * * @return array diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/FunctionEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/FunctionEnumerator.php similarity index 95% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/FunctionEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/FunctionEnumerator.php index 40ba71c9..733055a6 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/FunctionEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/FunctionEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -57,7 +57,7 @@ class FunctionEnumerator extends Enumerator return; } - $ret = array(); + $ret = []; $ret[$label] = $functions; return $ret; @@ -95,15 +95,15 @@ class FunctionEnumerator extends Enumerator natcasesort($functions); // My kingdom for a generator. - $ret = array(); + $ret = []; foreach ($functions as $name) { if ($this->showItem($name)) { - $ret[$name] = array( + $ret[$name] = [ 'name' => $name, 'style' => self::IS_FUNCTION, 'value' => $this->presentSignature($name), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/GlobalVariableEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/GlobalVariableEnumerator.php similarity index 91% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/GlobalVariableEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/GlobalVariableEnumerator.php index d957e9f5..8e58af8b 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/GlobalVariableEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/GlobalVariableEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -39,9 +39,9 @@ class GlobalVariableEnumerator extends Enumerator return; } - return array( + return [ 'Global Variables' => $globals, - ); + ]; } /** @@ -56,7 +56,7 @@ class GlobalVariableEnumerator extends Enumerator $names = array_keys($GLOBALS); natcasesort($names); - $ret = array(); + $ret = []; foreach ($names as $name) { $ret[$name] = $GLOBALS[$name]; } @@ -74,16 +74,16 @@ class GlobalVariableEnumerator extends Enumerator protected function prepareGlobals($globals) { // My kingdom for a generator. - $ret = array(); + $ret = []; foreach ($globals as $name => $value) { if ($this->showItem($name)) { $fname = '$' . $name; - $ret[$fname] = array( + $ret[$fname] = [ 'name' => $fname, 'style' => self::IS_GLOBAL, 'value' => $this->presentRef($value), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/InterfaceEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/InterfaceEnumerator.php similarity index 92% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/InterfaceEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/InterfaceEnumerator.php index 91ba985d..dae0dace 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/InterfaceEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/InterfaceEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -24,6 +24,7 @@ class InterfaceEnumerator extends Enumerator public function __construct(Presenter $presenter) { @trigger_error('InterfaceEnumerator is no longer used', E_USER_DEPRECATED); + parent::__construct($presenter); } /** @@ -54,9 +55,9 @@ class InterfaceEnumerator extends Enumerator return; } - return array( + return [ 'Interfaces' => $interfaces, - ); + ]; } /** @@ -71,15 +72,15 @@ class InterfaceEnumerator extends Enumerator natcasesort($interfaces); // My kingdom for a generator. - $ret = array(); + $ret = []; foreach ($interfaces as $name) { if ($this->showItem($name)) { - $ret[$name] = array( + $ret[$name] = [ 'name' => $name, 'style' => self::IS_CLASS, 'value' => $this->presentSignature($name), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/MethodEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/MethodEnumerator.php similarity index 91% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/MethodEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/MethodEnumerator.php index 963761cf..ebe43afa 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/MethodEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/MethodEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -47,7 +47,7 @@ class MethodEnumerator extends Enumerator return; } - $ret = array(); + $ret = []; $ret[$this->getKindLabel($reflector)] = $methods; return $ret; @@ -66,7 +66,7 @@ class MethodEnumerator extends Enumerator { $className = $reflector->getName(); - $methods = array(); + $methods = []; foreach ($reflector->getMethods() as $name => $method) { if ($noInherit && $method->getDeclaringClass()->getName() !== $className) { continue; @@ -77,9 +77,7 @@ class MethodEnumerator extends Enumerator } } - // @todo switch to ksort after we drop support for 5.3: - // ksort($methods, SORT_NATURAL | SORT_FLAG_CASE); - uksort($methods, 'strnatcasecmp'); + ksort($methods, SORT_NATURAL | SORT_FLAG_CASE); return $methods; } @@ -94,15 +92,15 @@ class MethodEnumerator extends Enumerator protected function prepareMethods(array $methods) { // My kingdom for a generator. - $ret = array(); + $ret = []; foreach ($methods as $name => $method) { if ($this->showItem($name)) { - $ret[$name] = array( + $ret[$name] = [ 'name' => $name, 'style' => $this->getVisibilityStyle($method), 'value' => $this->presentSignature($method), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/PropertyEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/PropertyEnumerator.php similarity index 93% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/PropertyEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/PropertyEnumerator.php index db18d2ba..15ce45db 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/PropertyEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/PropertyEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -47,7 +47,7 @@ class PropertyEnumerator extends Enumerator return; } - $ret = array(); + $ret = []; $ret[$this->getKindLabel($reflector)] = $properties; return $ret; @@ -66,7 +66,7 @@ class PropertyEnumerator extends Enumerator { $className = $reflector->getName(); - $properties = array(); + $properties = []; foreach ($reflector->getProperties() as $property) { if ($noInherit && $property->getDeclaringClass()->getName() !== $className) { continue; @@ -77,9 +77,7 @@ class PropertyEnumerator extends Enumerator } } - // @todo switch to ksort after we drop support for 5.3: - // ksort($properties, SORT_NATURAL | SORT_FLAG_CASE); - uksort($properties, 'strnatcasecmp'); + ksort($properties, SORT_NATURAL | SORT_FLAG_CASE); return $properties; } @@ -94,16 +92,16 @@ class PropertyEnumerator extends Enumerator protected function prepareProperties(array $properties, $target = null) { // My kingdom for a generator. - $ret = array(); + $ret = []; foreach ($properties as $name => $property) { if ($this->showItem($name)) { $fname = '$' . $name; - $ret[$fname] = array( + $ret[$fname] = [ 'name' => $fname, 'style' => $this->getVisibilityStyle($property), 'value' => $this->presentValue($property, $target), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/TraitEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/TraitEnumerator.php similarity index 86% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/TraitEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/TraitEnumerator.php index 12941f4f..c4c74da7 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/TraitEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/TraitEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -24,6 +24,7 @@ class TraitEnumerator extends Enumerator public function __construct(Presenter $presenter) { @trigger_error('TraitEnumerator is no longer used', E_USER_DEPRECATED); + parent::__construct($presenter); } /** @@ -31,11 +32,6 @@ class TraitEnumerator extends Enumerator */ protected function listItems(InputInterface $input, \Reflector $reflector = null, $target = null) { - // bail early if current PHP doesn't know about traits. - if (!function_exists('trait_exists')) { - return; - } - // only list traits when no Reflector is present. // // @todo make a NamespaceReflector and pass that in for commands like: @@ -59,9 +55,9 @@ class TraitEnumerator extends Enumerator return; } - return array( + return [ 'Traits' => $traits, - ); + ]; } /** @@ -76,15 +72,15 @@ class TraitEnumerator extends Enumerator natcasesort($traits); // My kingdom for a generator. - $ret = array(); + $ret = []; foreach ($traits as $name) { if ($this->showItem($name)) { - $ret[$name] = array( + $ret[$name] = [ 'name' => $name, 'style' => self::IS_CLASS, 'value' => $this->presentSignature($name), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ListCommand/VariableEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/VariableEnumerator.php similarity index 86% rename from vendor/psy/psysh/src/Psy/Command/ListCommand/VariableEnumerator.php rename to vendor/psy/psysh/src/Command/ListCommand/VariableEnumerator.php index 55b5afcd..257ceac5 100644 --- a/vendor/psy/psysh/src/Psy/Command/ListCommand/VariableEnumerator.php +++ b/vendor/psy/psysh/src/Command/ListCommand/VariableEnumerator.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -21,9 +21,9 @@ use Symfony\Component\Console\Input\InputInterface; class VariableEnumerator extends Enumerator { // n.b. this array is the order in which special variables will be listed - private static $specialNames = array( + private static $specialNames = [ '_', '_e', '__out', '__function', '__method', '__class', '__namespace', '__file', '__line', '__dir', - ); + ]; private $context; @@ -64,9 +64,9 @@ class VariableEnumerator extends Enumerator return; } - return array( + return [ 'Variables' => $variables, - ); + ]; } /** @@ -78,13 +78,10 @@ class VariableEnumerator extends Enumerator */ protected function getVariables($showAll) { - // self:: doesn't work inside closures in PHP 5.3 :-/ - $specialNames = self::$specialNames; - $scopeVars = $this->context->getAll(); - uksort($scopeVars, function ($a, $b) use ($specialNames) { - $aIndex = array_search($a, $specialNames); - $bIndex = array_search($b, $specialNames); + uksort($scopeVars, function ($a, $b) { + $aIndex = array_search($a, self::$specialNames); + $bIndex = array_search($b, self::$specialNames); if ($aIndex !== false) { if ($bIndex !== false) { @@ -101,7 +98,7 @@ class VariableEnumerator extends Enumerator return strnatcasecmp($a, $b); }); - $ret = array(); + $ret = []; foreach ($scopeVars as $name => $val) { if (!$showAll && in_array($name, self::$specialNames)) { continue; @@ -123,15 +120,15 @@ class VariableEnumerator extends Enumerator protected function prepareVariables(array $variables) { // My kingdom for a generator. - $ret = array(); + $ret = []; foreach ($variables as $name => $val) { if ($this->showItem($name)) { $fname = '$' . $name; - $ret[$fname] = array( + $ret[$fname] = [ 'name' => $fname, 'style' => in_array($name, self::$specialNames) ? self::IS_PRIVATE : self::IS_PUBLIC, 'value' => $this->presentRef($val), - ); + ]; } } diff --git a/vendor/psy/psysh/src/Psy/Command/ParseCommand.php b/vendor/psy/psysh/src/Command/ParseCommand.php similarity index 84% rename from vendor/psy/psysh/src/Psy/Command/ParseCommand.php rename to vendor/psy/psysh/src/Command/ParseCommand.php index 301bb614..5fe36d12 100644 --- a/vendor/psy/psysh/src/Psy/Command/ParseCommand.php +++ b/vendor/psy/psysh/src/Command/ParseCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,11 +13,12 @@ namespace Psy\Command; use PhpParser\Node; use PhpParser\Parser; +use Psy\Context; +use Psy\ContextAware; use Psy\Input\CodeArgument; use Psy\ParserFactory; use Psy\VarDumper\Presenter; use Psy\VarDumper\PresenterAware; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -26,8 +27,15 @@ use Symfony\Component\VarDumper\Caster\Caster; /** * Parse PHP code and show the abstract syntax tree. */ -class ParseCommand extends Command implements PresenterAware +class ParseCommand extends Command implements ContextAware, PresenterAware { + /** + * Context instance (for ContextAware interface). + * + * @var Context + */ + protected $context; + private $presenter; private $parserFactory; private $parsers; @@ -38,11 +46,21 @@ class ParseCommand extends Command implements PresenterAware public function __construct($name = null) { $this->parserFactory = new ParserFactory(); - $this->parsers = array(); + $this->parsers = []; parent::__construct($name); } + /** + * ContextAware interface. + * + * @param Context $context + */ + public function setContext(Context $context) + { + $this->context = $context; + } + /** * PresenterAware interface. * @@ -51,12 +69,12 @@ class ParseCommand extends Command implements PresenterAware public function setPresenter(Presenter $presenter) { $this->presenter = clone $presenter; - $this->presenter->addCasters(array( + $this->presenter->addCasters([ 'PhpParser\Node' => function (Node $node, array $a) { - $a = array( + $a = [ Caster::PREFIX_VIRTUAL . 'type' => $node->getType(), Caster::PREFIX_VIRTUAL . 'attributes' => $node->getAttributes(), - ); + ]; foreach ($node->getSubNodeNames() as $name) { $a[Caster::PREFIX_VIRTUAL . $name] = $node->$name; @@ -64,7 +82,7 @@ class ParseCommand extends Command implements PresenterAware return $a; }, - )); + ]); } /** @@ -72,15 +90,15 @@ class ParseCommand extends Command implements PresenterAware */ protected function configure() { - $definition = array( - new CodeArgument('code', InputArgument::REQUIRED, 'PHP code to parse.'), - new InputOption('depth', '', InputOption::VALUE_REQUIRED, 'Depth to parse', 10), - ); + $definition = [ + new CodeArgument('code', CodeArgument::REQUIRED, 'PHP code to parse.'), + new InputOption('depth', '', InputOption::VALUE_REQUIRED, 'Depth to parse.', 10), + ]; if ($this->parserFactory->hasKindsSupport()) { $msg = 'One of PhpParser\\ParserFactory constants: ' . implode(', ', ParserFactory::getPossibleKinds()) - . " (default is based on current interpreter's version)"; + . " (default is based on current interpreter's version)."; $defaultKind = $this->parserFactory->getDefaultKind(); $definition[] = new InputOption('kind', '', InputOption::VALUE_REQUIRED, $msg, $defaultKind); @@ -118,6 +136,8 @@ HELP $depth = $input->getOption('depth'); $nodes = $this->parse($this->getParser($parserKind), $code); $output->page($this->presenter->present($nodes, $depth)); + + $this->context->setReturnValue($nodes); } /** diff --git a/vendor/psy/psysh/src/Psy/Command/PsyVersionCommand.php b/vendor/psy/psysh/src/Command/PsyVersionCommand.php similarity index 92% rename from vendor/psy/psysh/src/Psy/Command/PsyVersionCommand.php rename to vendor/psy/psysh/src/Command/PsyVersionCommand.php index c245e0c5..7d0846c1 100644 --- a/vendor/psy/psysh/src/Psy/Command/PsyVersionCommand.php +++ b/vendor/psy/psysh/src/Command/PsyVersionCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,7 +26,7 @@ class PsyVersionCommand extends Command { $this ->setName('version') - ->setDefinition(array()) + ->setDefinition([]) ->setDescription('Show Psy Shell version.') ->setHelp('Show Psy Shell version.'); } diff --git a/vendor/psy/psysh/src/Psy/Command/ReflectingCommand.php b/vendor/psy/psysh/src/Command/ReflectingCommand.php similarity index 66% rename from vendor/psy/psysh/src/Psy/Command/ReflectingCommand.php rename to vendor/psy/psysh/src/Command/ReflectingCommand.php index ad142d07..8bc56f6f 100644 --- a/vendor/psy/psysh/src/Psy/Command/ReflectingCommand.php +++ b/vendor/psy/psysh/src/Command/ReflectingCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,8 +11,10 @@ namespace Psy\Command; +use Psy\CodeCleaner\NoReturnValue; use Psy\Context; use Psy\ContextAware; +use Psy\Exception\ErrorException; use Psy\Exception\RuntimeException; use Psy\Util\Mirror; @@ -22,12 +24,9 @@ use Psy\Util\Mirror; abstract class ReflectingCommand extends Command implements ContextAware { const CLASS_OR_FUNC = '/^[\\\\\w]+$/'; - const INSTANCE = '/^\$(\w+)$/'; const CLASS_MEMBER = '/^([\\\\\w]+)::(\w+)$/'; const CLASS_STATIC = '/^([\\\\\w]+)::\$(\w+)$/'; - const INSTANCE_MEMBER = '/^\$(\w+)(::|->)(\w+)$/'; - const INSTANCE_STATIC = '/^\$(\w+)::\$(\w+)$/'; - const SUPERGLOBAL = '/^\$(GLOBALS|_(?:SERVER|ENV|FILES|COOKIE|POST|GET|SESSION))$/'; + const INSTANCE_MEMBER = '/^(\$\w+)(::|->)(\w+)$/'; /** * Context instance (for ContextAware interface). @@ -52,54 +51,42 @@ abstract class ReflectingCommand extends Command implements ContextAware * @throws \InvalidArgumentException when the value specified can't be resolved * * @param string $valueName Function, class, variable, constant, method or property name - * @param bool $classOnly True if the name should only refer to a class, function or instance * * @return array (class or instance name, member name, kind) */ - protected function getTarget($valueName, $classOnly = false) + protected function getTarget($valueName) { $valueName = trim($valueName); - $matches = array(); + $matches = []; switch (true) { - case preg_match(self::SUPERGLOBAL, $valueName, $matches): - // @todo maybe do something interesting with these at some point? - if (array_key_exists($matches[1], $GLOBALS)) { - throw new RuntimeException('Unable to inspect a non-object'); - } - - throw new RuntimeException('Unknown target: ' . $valueName); case preg_match(self::CLASS_OR_FUNC, $valueName, $matches): - return array($this->resolveName($matches[0], true), null, 0); + return [$this->resolveName($matches[0], true), null, 0]; - case preg_match(self::INSTANCE, $valueName, $matches): - return array($this->resolveInstance($matches[1]), null, 0); + case preg_match(self::CLASS_MEMBER, $valueName, $matches): + return [$this->resolveName($matches[1]), $matches[2], Mirror::CONSTANT | Mirror::METHOD]; - case !$classOnly && preg_match(self::CLASS_MEMBER, $valueName, $matches): - return array($this->resolveName($matches[1]), $matches[2], Mirror::CONSTANT | Mirror::METHOD); + case preg_match(self::CLASS_STATIC, $valueName, $matches): + return [$this->resolveName($matches[1]), $matches[2], Mirror::STATIC_PROPERTY | Mirror::PROPERTY]; - case !$classOnly && preg_match(self::CLASS_STATIC, $valueName, $matches): - return array($this->resolveName($matches[1]), $matches[2], Mirror::STATIC_PROPERTY | Mirror::PROPERTY); - - case !$classOnly && preg_match(self::INSTANCE_MEMBER, $valueName, $matches): + case preg_match(self::INSTANCE_MEMBER, $valueName, $matches): if ($matches[2] === '->') { $kind = Mirror::METHOD | Mirror::PROPERTY; } else { $kind = Mirror::CONSTANT | Mirror::METHOD; } - return array($this->resolveInstance($matches[1]), $matches[3], $kind); - - case !$classOnly && preg_match(self::INSTANCE_STATIC, $valueName, $matches): - return array($this->resolveInstance($matches[1]), $matches[2], Mirror::STATIC_PROPERTY); + return [$this->resolveObject($matches[1]), $matches[3], $kind]; default: - throw new RuntimeException('Unknown target: ' . $valueName); + return [$this->resolveObject($valueName), null, 0]; } } /** * Resolve a class or function name (with the current shell namespace). * + * @throws ErrorException when `self` or `static` is used in a non-class scope + * * @param string $name * @param bool $includeFunctions (default: false) * @@ -107,11 +94,27 @@ abstract class ReflectingCommand extends Command implements ContextAware */ protected function resolveName($name, $includeFunctions = false) { + $shell = $this->getApplication(); + + // While not *technically* 100% accurate, let's treat `self` and `static` as equivalent. + if (in_array(strtolower($name), ['self', 'static'])) { + if ($boundClass = $shell->getBoundClass()) { + return $boundClass; + } + + if ($boundObject = $shell->getBoundObject()) { + return get_class($boundObject); + } + + $msg = sprintf('Cannot use "%s" when no class scope is active', strtolower($name)); + throw new ErrorException($msg, 0, E_USER_ERROR, "eval()'d code", 1); + } + if (substr($name, 0, 1) === '\\') { return $name; } - if ($namespace = $this->getApplication()->getNamespace()) { + if ($namespace = $shell->getNamespace()) { $fullName = $namespace . '\\' . $name; if (class_exists($fullName) || interface_exists($fullName) || ($includeFunctions && function_exists($fullName))) { @@ -126,21 +129,62 @@ abstract class ReflectingCommand extends Command implements ContextAware * Get a Reflector and documentation for a function, class or instance, constant, method or property. * * @param string $valueName Function, class, variable, constant, method or property name - * @param bool $classOnly True if the name should only refer to a class, function or instance * * @return array (value, Reflector) */ - protected function getTargetAndReflector($valueName, $classOnly = false) + protected function getTargetAndReflector($valueName) { - list($value, $member, $kind) = $this->getTarget($valueName, $classOnly); + list($value, $member, $kind) = $this->getTarget($valueName); - return array($value, Mirror::get($value, $member, $kind)); + return [$value, Mirror::get($value, $member, $kind)]; } /** - * Return a variable instance from the current scope. + * Resolve code to a value in the current scope. * - * @throws \InvalidArgumentException when the requested variable does not exist in the current scope + * @throws RuntimeException when the code does not return a value in the current scope + * + * @param string $code + * + * @return mixed Variable value + */ + protected function resolveCode($code) + { + try { + $value = $this->getApplication()->execute($code, true); + } catch (\Exception $e) { + // Swallow all exceptions? + } + + if (!isset($value) || $value instanceof NoReturnValue) { + throw new RuntimeException('Unknown target: ' . $code); + } + + return $value; + } + + /** + * Resolve code to an object in the current scope. + * + * @throws RuntimeException when the code resolves to a non-object value + * + * @param string $code + * + * @return object Variable instance + */ + private function resolveObject($code) + { + $value = $this->resolveCode($code); + + if (!is_object($value)) { + throw new RuntimeException('Unable to inspect a non-object'); + } + + return $value; + } + + /** + * @deprecated Use `resolveCode` instead * * @param string $name * @@ -148,12 +192,9 @@ abstract class ReflectingCommand extends Command implements ContextAware */ protected function resolveInstance($name) { - $value = $this->getScopeVariable($name); - if (!is_object($value)) { - throw new RuntimeException('Unable to inspect a non-object'); - } + @trigger_error('`resolveInstance` is deprecated; use `resolveCode` instead.', E_USER_DEPRECATED); - return $value; + return $this->resolveCode($name); } /** @@ -187,7 +228,7 @@ abstract class ReflectingCommand extends Command implements ContextAware */ protected function setCommandScopeVariables(\Reflector $reflector) { - $vars = array(); + $vars = []; switch (get_class($reflector)) { case 'ReflectionClass': @@ -228,7 +269,8 @@ abstract class ReflectingCommand extends Command implements ContextAware break; case 'ReflectionProperty': - case 'Psy\Reflection\ReflectionConstant': + case 'ReflectionClassConstant': + case 'Psy\Reflection\ReflectionClassConstant': $classReflector = $reflector->getDeclaringClass(); $vars['__class'] = $classReflector->name; if ($classReflector->inNamespace()) { @@ -240,6 +282,12 @@ abstract class ReflectingCommand extends Command implements ContextAware $vars['__dir'] = dirname($fileName); } break; + + case 'Psy\Reflection\ReflectionConstant_': + if ($reflector->inNamespace()) { + $vars['__namespace'] = $reflector->getNamespaceName(); + } + break; } if ($reflector instanceof \ReflectionClass || $reflector instanceof \ReflectionFunctionAbstract) { diff --git a/vendor/psy/psysh/src/Psy/Command/ShowCommand.php b/vendor/psy/psysh/src/Command/ShowCommand.php similarity index 86% rename from vendor/psy/psysh/src/Psy/Command/ShowCommand.php rename to vendor/psy/psysh/src/Command/ShowCommand.php index c4dab43d..cae86e59 100644 --- a/vendor/psy/psysh/src/Psy/Command/ShowCommand.php +++ b/vendor/psy/psysh/src/Command/ShowCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -17,9 +17,9 @@ use Psy\ConsoleColorFactory; use Psy\Exception\RuntimeException; use Psy\Formatter\CodeFormatter; use Psy\Formatter\SignatureFormatter; +use Psy\Input\CodeArgument; use Psy\Output\ShellOutput; use Symfony\Component\Console\Formatter\OutputFormatter; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -41,7 +41,7 @@ class ShowCommand extends ReflectingCommand { $this->colorMode = $colorMode ?: Configuration::COLOR_MODE_AUTO; - return parent::__construct(); + parent::__construct(); } /** @@ -51,10 +51,10 @@ class ShowCommand extends ReflectingCommand { $this ->setName('show') - ->setDefinition(array( - new InputArgument('value', InputArgument::OPTIONAL, 'Function, class, instance, constant, method or property to show.'), + ->setDefinition([ + new CodeArgument('target', CodeArgument::OPTIONAL, 'Function, class, instance, constant, method or property to show.'), new InputOption('ex', null, InputOption::VALUE_OPTIONAL, 'Show last exception context. Optionally specify a stack index.', 1), - )) + ]) ->setDescription('Show the code for an object, class, constant, method or property.') ->setHelp( <<getArgument('value')) { - throw new \InvalidArgumentException('Too many arguments (supply either "value" or "--ex")'); + if ($input->getArgument('target')) { + throw new \InvalidArgumentException('Too many arguments (supply either "target" or "--ex")'); } return $this->writeExceptionContext($input, $output); } - if ($input->getArgument('value')) { + if ($input->getArgument('target')) { return $this->writeCodeContext($input, $output); } - throw new RuntimeException('Not enough arguments (missing: "value").'); + throw new RuntimeException('Not enough arguments (missing: "target")'); } private function writeCodeContext(InputInterface $input, OutputInterface $output) { - list($value, $reflector) = $this->getTargetAndReflector($input->getArgument('value')); + list($target, $reflector) = $this->getTargetAndReflector($input->getArgument('target')); // Set some magic local variables $this->setCommandScopeVariables($reflector); @@ -144,10 +144,10 @@ HELP } $trace = $exception->getTrace(); - array_unshift($trace, array( + array_unshift($trace, [ 'file' => $exception->getFile(), 'line' => $exception->getLine(), - )); + ]); if ($index >= count($trace)) { $index = 0; @@ -231,16 +231,33 @@ HELP private function setCommandScopeVariablesFromContext(array $context) { - $vars = array(); + $vars = []; - // @todo __namespace? if (isset($context['class'])) { $vars['__class'] = $context['class']; if (isset($context['function'])) { $vars['__method'] = $context['function']; } + + try { + $refl = new \ReflectionClass($context['class']); + if ($namespace = $refl->getNamespaceName()) { + $vars['__namespace'] = $namespace; + } + } catch (\Exception $e) { + // oh well + } } elseif (isset($context['function'])) { $vars['__function'] = $context['function']; + + try { + $refl = new \ReflectionFunction($context['function']); + if ($namespace = $refl->getNamespaceName()) { + $vars['__namespace'] = $namespace; + } + } catch (\Exception $e) { + // oh well + } } if (isset($context['file'])) { @@ -266,7 +283,7 @@ HELP private function extractEvalFileAndLine($file) { if (preg_match('/(.*)\\((\\d+)\\) : eval\\(\\)\'d code$/', $file, $matches)) { - return array($matches[1], $matches[2]); + return [$matches[1], $matches[2]]; } } } diff --git a/vendor/psy/psysh/src/Psy/Command/SudoCommand.php b/vendor/psy/psysh/src/Command/SudoCommand.php similarity index 92% rename from vendor/psy/psysh/src/Psy/Command/SudoCommand.php rename to vendor/psy/psysh/src/Command/SudoCommand.php index 1a0a6552..44cc2c0e 100644 --- a/vendor/psy/psysh/src/Psy/Command/SudoCommand.php +++ b/vendor/psy/psysh/src/Command/SudoCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -17,7 +17,6 @@ use Psy\Input\CodeArgument; use Psy\ParserFactory; use Psy\Readline\Readline; use Psy\Sudo\SudoVisitor; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -64,9 +63,9 @@ class SudoCommand extends Command { $this ->setName('sudo') - ->setDefinition(array( - new CodeArgument('code', InputArgument::REQUIRED, 'Code to execute.'), - )) + ->setDefinition([ + new CodeArgument('code', CodeArgument::REQUIRED, 'Code to execute.'), + ]) ->setDescription('Evaluate PHP code, bypassing visibility restrictions.') ->setHelp( <<<'HELP' @@ -117,7 +116,8 @@ HELP $nodes = $this->traverser->traverse($this->parse($code)); $sudoCode = $this->printer->prettyPrint($nodes); - $this->getApplication()->addInput($sudoCode, true); + $shell = $this->getApplication(); + $shell->addCode($sudoCode, !$shell->hasCode()); } /** diff --git a/vendor/psy/psysh/src/Command/ThrowUpCommand.php b/vendor/psy/psysh/src/Command/ThrowUpCommand.php new file mode 100644 index 00000000..99af9a8a --- /dev/null +++ b/vendor/psy/psysh/src/Command/ThrowUpCommand.php @@ -0,0 +1,172 @@ +parser = $parserFactory->createParser(); + $this->printer = new Printer(); + + parent::__construct($name); + } + + /** + * ContextAware interface. + * + * @param Context $context + */ + public function setContext(Context $context) + { + $this->context = $context; + } + + /** + * {@inheritdoc} + */ + protected function configure() + { + $this + ->setName('throw-up') + ->setDefinition([ + new CodeArgument('exception', CodeArgument::OPTIONAL, 'Exception or Error to throw.'), + ]) + ->setDescription('Throw an exception or error out of the Psy Shell.') + ->setHelp( + <<<'HELP' +Throws an exception or error out of the current the Psy Shell instance. + +By default it throws the most recent exception. + +e.g. +>>> throw-up +>>> throw-up $e +>>> throw-up new Exception('WHEEEEEE!') +>>> throw-up "bye!" +HELP + ); + } + + /** + * {@inheritdoc} + * + * @throws InvalidArgumentException if there is no exception to throw + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $args = $this->prepareArgs($input->getArgument('exception')); + $throwStmt = new Throw_(new StaticCall(new FullyQualifiedName(self::THROW_CLASS), 'fromThrowable', $args)); + $throwCode = $this->printer->prettyPrint([$throwStmt]); + + $shell = $this->getApplication(); + $shell->addCode($throwCode, !$shell->hasCode()); + } + + /** + * Parse the supplied command argument. + * + * If no argument was given, this falls back to `$_e` + * + * @throws InvalidArgumentException if there is no exception to throw + * + * @param string $code + * + * @return Arg[] + */ + private function prepareArgs($code = null) + { + if (!$code) { + // Default to last exception if nothing else was supplied + return [new Arg(new Variable('_e'))]; + } + + if (strpos('parse($code); + if (count($nodes) !== 1) { + throw new \InvalidArgumentException('No idea how to throw this'); + } + + $node = $nodes[0]; + + // Make this work for PHP Parser v3.x + $expr = isset($node->expr) ? $node->expr : $node; + + $args = [new Arg($expr, false, false, $node->getAttributes())]; + + // Allow throwing via a string, e.g. `throw-up "SUP"` + if ($expr instanceof String_) { + return [new New_(new FullyQualifiedName('Exception'), $args)]; + } + + return $args; + } + + /** + * Lex and parse a string of code into statements. + * + * @param string $code + * + * @return array Statements + */ + private function parse($code) + { + try { + return $this->parser->parse($code); + } catch (\PhpParser\Error $e) { + if (strpos($e->getMessage(), 'unexpected EOF') === false) { + throw $e; + } + + // If we got an unexpected EOF, let's try it again with a semicolon. + return $this->parser->parse($code . ';'); + } + } +} diff --git a/vendor/psy/psysh/src/Command/TimeitCommand.php b/vendor/psy/psysh/src/Command/TimeitCommand.php new file mode 100644 index 00000000..70d70c0e --- /dev/null +++ b/vendor/psy/psysh/src/Command/TimeitCommand.php @@ -0,0 +1,196 @@ +Command took %.6f seconds to complete.'; + const AVG_RESULT_MSG = 'Command took %.6f seconds on average (%.6f median; %.6f total) to complete.'; + + private static $start = null; + private static $times = []; + + private $parser; + private $traverser; + private $printer; + + /** + * {@inheritdoc} + */ + public function __construct($name = null) + { + $parserFactory = new ParserFactory(); + $this->parser = $parserFactory->createParser(); + + $this->traverser = new NodeTraverser(); + $this->traverser->addVisitor(new TimeitVisitor()); + + $this->printer = new Printer(); + + parent::__construct($name); + } + + /** + * {@inheritdoc} + */ + protected function configure() + { + $this + ->setName('timeit') + ->setDefinition([ + new InputOption('num', 'n', InputOption::VALUE_REQUIRED, 'Number of iterations.'), + new CodeArgument('code', CodeArgument::REQUIRED, 'Code to execute.'), + ]) + ->setDescription('Profiles with a timer.') + ->setHelp( + <<<'HELP' +Time profiling for functions and commands. + +e.g. +>>> timeit sleep(1) +>>> timeit -n1000 $closure() +HELP + ); + } + + /** + * {@inheritdoc} + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $code = $input->getArgument('code'); + $num = $input->getOption('num') ?: 1; + $shell = $this->getApplication(); + + $instrumentedCode = $this->instrumentCode($code); + + self::$times = []; + + for ($i = 0; $i < $num; $i++) { + $_ = $shell->execute($instrumentedCode); + $this->ensureEndMarked(); + } + + $shell->writeReturnValue($_); + + $times = self::$times; + self::$times = []; + + if ($num === 1) { + $output->writeln(sprintf(self::RESULT_MSG, $times[0])); + } else { + $total = array_sum($times); + rsort($times); + $median = $times[round($num / 2)]; + + $output->writeln(sprintf(self::AVG_RESULT_MSG, $total / $num, $median, $total)); + } + } + + /** + * Internal method for marking the start of timeit execution. + * + * A static call to this method will be injected at the start of the timeit + * input code to instrument the call. We will use the saved start time to + * more accurately calculate time elapsed during execution. + */ + public static function markStart() + { + self::$start = microtime(true); + } + + /** + * Internal method for marking the end of timeit execution. + * + * A static call to this method is injected by TimeitVisitor at the end + * of the timeit input code to instrument the call. + * + * Note that this accepts an optional $ret parameter, which is used to pass + * the return value of the last statement back out of timeit. This saves us + * a bunch of code rewriting shenanigans. + * + * @param mixed $ret + * + * @return mixed it just passes $ret right back + */ + public static function markEnd($ret = null) + { + self::$times[] = microtime(true) - self::$start; + self::$start = null; + + return $ret; + } + + /** + * Ensure that the end of code execution was marked. + * + * The end *should* be marked in the instrumented code, but just in case + * we'll add a fallback here. + */ + private function ensureEndMarked() + { + if (self::$start !== null) { + self::markEnd(); + } + } + + /** + * Instrument code for timeit execution. + * + * This inserts `markStart` and `markEnd` calls to ensure that (reasonably) + * accurate times are recorded for just the code being executed. + * + * @param string $code + * + * @return string + */ + private function instrumentCode($code) + { + return $this->printer->prettyPrint($this->traverser->traverse($this->parse($code))); + } + + /** + * Lex and parse a string of code into statements. + * + * @param string $code + * + * @return array Statements + */ + private function parse($code) + { + $code = 'parser->parse($code); + } catch (\PhpParser\Error $e) { + if (strpos($e->getMessage(), 'unexpected EOF') === false) { + throw $e; + } + + // If we got an unexpected EOF, let's try it again with a semicolon. + return $this->parser->parse($code . ';'); + } + } +} diff --git a/vendor/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php b/vendor/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php new file mode 100644 index 00000000..6ee66994 --- /dev/null +++ b/vendor/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php @@ -0,0 +1,139 @@ +functionDepth = 0; + } + + /** + * {@inheritdoc} + */ + public function enterNode(Node $node) + { + // keep track of nested function-like nodes, because they can have + // returns statements... and we don't want to call markEnd for those. + if ($node instanceof FunctionLike) { + $this->functionDepth++; + + return; + } + + // replace any top-level `return` statements with a `markEnd` call + if ($this->functionDepth === 0 && $node instanceof Return_) { + return new Return_($this->getEndCall($node->expr), $node->getAttributes()); + } + } + + /** + * {@inheritdoc} + */ + public function leaveNode(Node $node) + { + if ($node instanceof FunctionLike) { + $this->functionDepth--; + } + } + + /** + * {@inheritdoc} + */ + public function afterTraverse(array $nodes) + { + // prepend a `markStart` call + array_unshift($nodes, $this->maybeExpression($this->getStartCall())); + + // append a `markEnd` call (wrapping the final node, if it's an expression) + $last = $nodes[count($nodes) - 1]; + if ($last instanceof Expr) { + array_pop($nodes); + $nodes[] = $this->getEndCall($last); + } elseif ($last instanceof Expression) { + array_pop($nodes); + $nodes[] = new Expression($this->getEndCall($last->expr), $last->getAttributes()); + } elseif ($last instanceof Return_) { + // nothing to do here, we're already ending with a return call + } else { + $nodes[] = $this->maybeExpression($this->getEndCall()); + } + + return $nodes; + } + + /** + * Get PhpParser AST nodes for a `markStart` call. + * + * @return PhpParser\Node\Expr\StaticCall + */ + private function getStartCall() + { + return new StaticCall(new FullyQualifiedName('Psy\Command\TimeitCommand'), 'markStart'); + } + + /** + * Get PhpParser AST nodes for a `markEnd` call. + * + * Optionally pass in a return value. + * + * @param Expr|null $arg + * + * @return PhpParser\Node\Expr\StaticCall + */ + private function getEndCall(Expr $arg = null) + { + if ($arg === null) { + $arg = NoReturnValue::create(); + } + + return new StaticCall(new FullyQualifiedName('Psy\Command\TimeitCommand'), 'markEnd', [new Arg($arg)]); + } + + /** + * Compatibility shim for PHP Parser 3.x. + * + * Wrap $expr in a PhpParser\Node\Stmt\Expression if the class exists. + * + * @param PhpParser\Node $expr + * @param array $attrs + * + * @return PhpParser\Node\Expr|PhpParser\Node\Stmt\Expression + */ + private function maybeExpression($expr, $attrs = []) + { + return class_exists('PhpParser\Node\Stmt\Expression') ? new Expression($expr, $attrs) : $expr; + } +} diff --git a/vendor/psy/psysh/src/Psy/Command/TraceCommand.php b/vendor/psy/psysh/src/Command/TraceCommand.php similarity index 94% rename from vendor/psy/psysh/src/Psy/Command/TraceCommand.php rename to vendor/psy/psysh/src/Command/TraceCommand.php index 00e5903f..becc5831 100644 --- a/vendor/psy/psysh/src/Psy/Command/TraceCommand.php +++ b/vendor/psy/psysh/src/Command/TraceCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -44,14 +44,14 @@ class TraceCommand extends Command $this ->setName('trace') - ->setDefinition(array( + ->setDefinition([ new InputOption('include-psy', 'p', InputOption::VALUE_NONE, 'Include Psy in the call stack.'), new InputOption('num', 'n', InputOption::VALUE_REQUIRED, 'Only include NUM lines.'), $grep, $insensitive, $invert, - )) + ]) ->setDescription('Show the current call stack.') ->setHelp( <<<'HELP' @@ -98,15 +98,15 @@ HELP $count = PHP_INT_MAX; } - $lines = array(); + $lines = []; $trace = $e->getTrace(); - array_unshift($trace, array( + array_unshift($trace, [ 'function' => '', 'file' => $e->getFile() !== null ? $e->getFile() : 'n/a', 'line' => $e->getLine() !== null ? $e->getLine() : 'n/a', - 'args' => array(), - )); + 'args' => [], + ]); if (!$includePsy) { for ($i = count($trace) - 1; $i >= 0; $i--) { @@ -126,7 +126,7 @@ HELP $line = isset($trace[$i]['line']) ? $trace[$i]['line'] : 'n/a'; // Leave execution loop out of the `eval()'d code` lines - if (preg_match("#/Psy/ExecutionLoop/Loop.php\(\d+\) : eval\(\)'d code$#", $file)) { + if (preg_match("#/src/Execution(?:Loop)?Closure.php\(\d+\) : eval\(\)'d code$#", str_replace('\\', '/', $file))) { $file = "eval()'d code"; } diff --git a/vendor/psy/psysh/src/Psy/Command/WhereamiCommand.php b/vendor/psy/psysh/src/Command/WhereamiCommand.php similarity index 90% rename from vendor/psy/psysh/src/Psy/Command/WhereamiCommand.php rename to vendor/psy/psysh/src/Command/WhereamiCommand.php index 065399bb..c2b27843 100644 --- a/vendor/psy/psysh/src/Psy/Command/WhereamiCommand.php +++ b/vendor/psy/psysh/src/Command/WhereamiCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -25,6 +25,7 @@ use Symfony\Component\Console\Output\OutputInterface; class WhereamiCommand extends Command { private $colorMode; + private $backtrace; /** * @param null|string $colorMode (default: null) @@ -32,14 +33,9 @@ class WhereamiCommand extends Command public function __construct($colorMode = null) { $this->colorMode = $colorMode ?: Configuration::COLOR_MODE_AUTO; + $this->backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - if (version_compare(PHP_VERSION, '5.3.6', '>=')) { - $this->backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - } else { - $this->backtrace = debug_backtrace(); - } - - return parent::__construct(); + parent::__construct(); } /** @@ -49,9 +45,9 @@ class WhereamiCommand extends Command { $this ->setName('whereami') - ->setDefinition(array( + ->setDefinition([ new InputOption('num', 'n', InputOption::VALUE_OPTIONAL, 'Number of lines before and after.', '5'), - )) + ]) ->setDescription('Show where you are in the code.') ->setHelp( <<<'HELP' @@ -88,7 +84,7 @@ HELP $function = isset($stackFrame['function']) ? $stackFrame['function'] : null; return ($class === null && $function === 'Psy\debug') || - ($class === 'Psy\Shell' && in_array($function, array('__construct', 'debug'))); + ($class === 'Psy\Shell' && in_array($function, ['__construct', 'debug'])); } /** diff --git a/vendor/psy/psysh/src/Psy/Command/WtfCommand.php b/vendor/psy/psysh/src/Command/WtfCommand.php similarity index 92% rename from vendor/psy/psysh/src/Psy/Command/WtfCommand.php rename to vendor/psy/psysh/src/Command/WtfCommand.php index af3bcd14..68ba0f3f 100644 --- a/vendor/psy/psysh/src/Psy/Command/WtfCommand.php +++ b/vendor/psy/psysh/src/Command/WtfCommand.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -51,15 +51,15 @@ class WtfCommand extends TraceCommand implements ContextAware $this ->setName('wtf') - ->setAliases(array('last-exception', 'wtf?')) - ->setDefinition(array( - new InputArgument('incredulity', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Number of lines to show'), + ->setAliases(['last-exception', 'wtf?']) + ->setDefinition([ + new InputArgument('incredulity', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Number of lines to show.'), new InputOption('all', 'a', InputOption::VALUE_NONE, 'Show entire backtrace.'), $grep, $insensitive, $invert, - )) + ]) ->setDescription('Show the backtrace of the most recent exception.') ->setHelp( <<<'HELP' @@ -74,7 +74,7 @@ e.g. To see the entire backtrace, pass the -a/--all flag: e.g. ->>> wtf -v +>>> wtf -a HELP ); } @@ -88,7 +88,7 @@ HELP $incredulity = implode('', $input->getArgument('incredulity')); if (strlen(preg_replace('/[\\?!]/', '', $incredulity))) { - throw new \InvalidArgumentException('Incredulity must include only "?" and "!".'); + throw new \InvalidArgumentException('Incredulity must include only "?" and "!"'); } $exception = $this->context->getLastException(); diff --git a/vendor/psy/psysh/src/Psy/ConfigPaths.php b/vendor/psy/psysh/src/ConfigPaths.php similarity index 95% rename from vendor/psy/psysh/src/Psy/ConfigPaths.php rename to vendor/psy/psysh/src/ConfigPaths.php index 66724919..0c9c78a4 100644 --- a/vendor/psy/psysh/src/Psy/ConfigPaths.php +++ b/vendor/psy/psysh/src/ConfigPaths.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -49,7 +49,7 @@ class ConfigPaths { $xdg = new Xdg(); - return self::getDirNames(array($xdg->getHomeConfigDir())); + return self::getDirNames([$xdg->getHomeConfigDir()]); } /** @@ -86,7 +86,7 @@ class ConfigPaths */ public static function getConfigFiles(array $names, $configDir = null) { - $dirs = ($configDir === null) ? self::getConfigDirs() : array($configDir); + $dirs = ($configDir === null) ? self::getConfigDirs() : [$configDir]; return self::getRealFiles($dirs, $names); } @@ -120,7 +120,7 @@ class ConfigPaths */ public static function getDataFiles(array $names, $dataDir = null) { - $dirs = ($dataDir === null) ? self::getDataDirs() : array($dataDir); + $dirs = ($dataDir === null) ? self::getDataDirs() : [$dataDir]; return self::getRealFiles($dirs, $names); } @@ -136,7 +136,7 @@ class ConfigPaths { $xdg = new Xdg(); - set_error_handler(array('Psy\Exception\ErrorException', 'throwException')); + set_error_handler(['Psy\Exception\ErrorException', 'throwException']); try { // XDG doesn't really work on Windows, sometimes complains about @@ -183,7 +183,7 @@ class ConfigPaths private static function getRealFiles(array $dirNames, array $fileNames) { - $files = array(); + $files = []; foreach ($dirNames as $dir) { foreach ($fileNames as $name) { $file = $dir . '/' . $name; diff --git a/vendor/psy/psysh/src/Psy/Configuration.php b/vendor/psy/psysh/src/Configuration.php similarity index 89% rename from vendor/psy/psysh/src/Psy/Configuration.php rename to vendor/psy/psysh/src/Configuration.php index b0953fab..b37f2e57 100644 --- a/vendor/psy/psysh/src/Psy/Configuration.php +++ b/vendor/psy/psysh/src/Configuration.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,8 +13,6 @@ namespace Psy; use Psy\Exception\DeprecatedException; use Psy\Exception\RuntimeException; -use Psy\ExecutionLoop\ForkingLoop; -use Psy\ExecutionLoop\Loop; use Psy\Output\OutputPager; use Psy\Output\ShellOutput; use Psy\Readline\GNUReadline; @@ -28,7 +26,6 @@ use Psy\VersionUpdater\Checker; use Psy\VersionUpdater\GitHubChecker; use Psy\VersionUpdater\IntervalChecker; use Psy\VersionUpdater\NoopChecker; -use XdgBaseDir\Xdg; /** * The Psy Shell configuration. @@ -39,7 +36,7 @@ class Configuration const COLOR_MODE_FORCED = 'forced'; const COLOR_MODE_DISABLED = 'disabled'; - private static $AVAILABLE_OPTIONS = array( + private static $AVAILABLE_OPTIONS = [ 'codeCleaner', 'colorMode', 'configDir', @@ -49,21 +46,20 @@ class Configuration 'errorLoggingLevel', 'forceArrayIndexes', 'historySize', - 'loop', 'manualDbFile', 'pager', 'prompt', 'requireSemicolons', 'runtimeDir', 'startupMessage', - 'tabCompletion', 'updateCheck', 'useBracketedPaste', 'usePcntl', 'useReadline', + 'useTabCompletion', 'useUnicode', 'warnOnMultipleConfigs', - ); + ]; private $defaultIncludes; private $configDir; @@ -80,12 +76,12 @@ class Configuration private $useBracketedPaste; private $hasPcntl; private $usePcntl; - private $newCommands = array(); + private $newCommands = []; private $requireSemicolons = false; private $useUnicode; - private $tabCompletion; - private $tabCompletionMatchers = array(); - private $errorLoggingLevel = E_ALL; + private $useTabCompletion; + private $newMatchers = []; + private $errorLoggingLevel = E_ALL; private $warnOnMultipleConfigs = false; private $colorMode; private $updateCheck; @@ -98,10 +94,9 @@ class Configuration private $shell; private $cleaner; private $pager; - private $loop; private $manualDb; private $presenter; - private $completer; + private $autoCompleter; private $checker; private $prompt; @@ -112,7 +107,7 @@ class Configuration * * @param array $config Optional array of configuration values */ - public function __construct(array $config = array()) + public function __construct(array $config = []) { $this->setColorMode(self::COLOR_MODE_AUTO); @@ -125,8 +120,8 @@ class Configuration // legacy baseDir option if (isset($config['baseDir'])) { - $msg = "The 'baseDir' configuration option is deprecated. " . - "Please specify 'configDir' and 'dataDir' options instead."; + $msg = "The 'baseDir' configuration option is deprecated; " . + "please specify 'configDir' and 'dataDir' options instead"; throw new DeprecatedException($msg); } @@ -182,7 +177,7 @@ class Configuration return $this->configFile; } - $files = ConfigPaths::getConfigFiles(array('config.php', 'rc.php'), $this->configDir); + $files = ConfigPaths::getConfigFiles(['config.php', 'rc.php'], $this->configDir); if (!empty($files)) { if ($this->warnOnMultipleConfigs && count($files) > 1) { @@ -225,12 +220,28 @@ class Configuration } } - foreach (array('commands', 'tabCompletionMatchers', 'casters') as $option) { + // legacy `tabCompletion` option + if (isset($options['tabCompletion'])) { + $msg = '`tabCompletion` is deprecated; use `useTabCompletion` instead.'; + @trigger_error($msg, E_USER_DEPRECATED); + + $this->setUseTabCompletion($options['tabCompletion']); + } + + foreach (['commands', 'matchers', 'casters'] as $option) { if (isset($options[$option])) { $method = 'add' . ucfirst($option); $this->$method($options[$option]); } } + + // legacy `tabCompletionMatchers` option + if (isset($options['tabCompletionMatchers'])) { + $msg = '`tabCompletionMatchers` is deprecated; use `matchers` instead.'; + @trigger_error($msg, E_USER_DEPRECATED); + + $this->addMatchers($options['tabCompletionMatchers']); + } } /** @@ -269,7 +280,7 @@ class Configuration * * @param array $includes */ - public function setDefaultIncludes(array $includes = array()) + public function setDefaultIncludes(array $includes = []) { $this->defaultIncludes = $includes; } @@ -281,7 +292,7 @@ class Configuration */ public function getDefaultIncludes() { - return $this->defaultIncludes ?: array(); + return $this->defaultIncludes ?: []; } /** @@ -379,26 +390,7 @@ class Configuration return $this->historyFile; } - // Deprecation warning for incorrect psysh_history path. - // @todo remove this before v0.9.0 - $xdg = new Xdg(); - $oldHistory = $xdg->getHomeConfigDir() . '/psysh_history'; - if (@is_file($oldHistory)) { - $dir = $this->configDir ?: ConfigPaths::getCurrentConfigDir(); - $newHistory = $dir . '/psysh_history'; - - $msg = sprintf( - "PsySH history file found at '%s'. Please delete it or move it to '%s'.", - strtr($oldHistory, '\\', '/'), - $newHistory - ); - @trigger_error($msg, E_USER_DEPRECATED); - $this->setHistoryFile($oldHistory); - - return $this->historyFile; - } - - $files = ConfigPaths::getConfigFiles(array('psysh_history', 'history'), $this->configDir); + $files = ConfigPaths::getConfigFiles(['psysh_history', 'history'], $this->configDir); if (!empty($files)) { if ($this->warnOnMultipleConfigs && count($files) > 1) { @@ -767,24 +759,44 @@ class Configuration /** * Enable or disable tab completion. * - * @param bool $tabCompletion + * @param bool $useTabCompletion */ - public function setTabCompletion($tabCompletion) + public function setUseTabCompletion($useTabCompletion) { - $this->tabCompletion = (bool) $tabCompletion; + $this->useTabCompletion = (bool) $useTabCompletion; + } + + /** + * @deprecated Call `setUseTabCompletion` instead + * + * @param bool $useTabCompletion + */ + public function setTabCompletion($useTabCompletion) + { + $this->setUseTabCompletion($useTabCompletion); } /** * Check whether to use tab completion. * - * If `setTabCompletion` has been set to true, but readline is not actually - * available, this will return false. + * If `setUseTabCompletion` has been set to true, but readline is not + * actually available, this will return false. * * @return bool True if the current Shell should use tab completion */ + public function useTabCompletion() + { + return isset($this->useTabCompletion) ? ($this->hasReadline && $this->useTabCompletion) : $this->hasReadline; + } + + /** + * @deprecated Call `useTabCompletion` instead + * + * @return bool + */ public function getTabCompletion() { - return isset($this->tabCompletion) ? ($this->hasReadline && $this->tabCompletion) : $this->hasReadline; + return $this->useTabCompletion(); } /** @@ -850,7 +862,7 @@ class Configuration public function setPager($pager) { if ($pager && !is_string($pager) && !$pager instanceof OutputPager) { - throw new \InvalidArgumentException('Unexpected pager instance.'); + throw new \InvalidArgumentException('Unexpected pager instance'); } $this->pager = $pager; @@ -868,7 +880,7 @@ class Configuration { if (!isset($this->pager) && $this->usePcntl()) { if ($pager = ini_get('cli.pager')) { - // use the default pager (5.4+) + // use the default pager $this->pager = $pager; } elseif ($less = exec('which less 2>/dev/null')) { // check for the presence of less... @@ -880,44 +892,13 @@ class Configuration } /** - * Set the Shell evaluation Loop service. + * Set the Shell AutoCompleter service. * - * @param Loop $loop + * @param AutoCompleter $autoCompleter */ - public function setLoop(Loop $loop) + public function setAutoCompleter(AutoCompleter $autoCompleter) { - $this->loop = $loop; - } - - /** - * Get a Shell evaluation Loop service instance. - * - * If none has been explicitly defined, this will create a new instance. - * If Pcntl is available and enabled, the new instance will be a ForkingLoop. - * - * @return Loop - */ - public function getLoop() - { - if (!isset($this->loop)) { - if ($this->usePcntl()) { - $this->loop = new ForkingLoop($this); - } else { - $this->loop = new Loop($this); - } - } - - return $this->loop; - } - - /** - * Set the Shell autocompleter service. - * - * @param AutoCompleter $completer - */ - public function setAutoCompleter(AutoCompleter $completer) - { - $this->completer = $completer; + $this->autoCompleter = $autoCompleter; } /** @@ -927,34 +908,61 @@ class Configuration */ public function getAutoCompleter() { - if (!isset($this->completer)) { - $this->completer = new AutoCompleter(); + if (!isset($this->autoCompleter)) { + $this->autoCompleter = new AutoCompleter(); } - return $this->completer; + return $this->autoCompleter; } /** - * Get user specified tab completion matchers for the AutoCompleter. + * @deprecated Nothing should be using this anymore * * @return array */ public function getTabCompletionMatchers() { - return $this->tabCompletionMatchers; + return []; } /** - * Add additional tab completion matchers to the AutoCompleter. + * Add tab completion matchers to the AutoCompleter. + * + * This will buffer new matchers in the event that the Shell has not yet + * been instantiated. This allows the user to specify matchers in their + * config rc file, despite the fact that their file is needed in the Shell + * constructor. + * + * @param array $matchers + */ + public function addMatchers(array $matchers) + { + $this->newMatchers = array_merge($this->newMatchers, $matchers); + if (isset($this->shell)) { + $this->doAddMatchers(); + } + } + + /** + * Internal method for adding tab completion matchers. This will set any new + * matchers once a Shell is available. + */ + private function doAddMatchers() + { + if (!empty($this->newMatchers)) { + $this->shell->addMatchers($this->newMatchers); + $this->newMatchers = []; + } + } + + /** + * @deprecated Use `addMatchers` instead * * @param array $matchers */ public function addTabCompletionMatchers(array $matchers) { - $this->tabCompletionMatchers = array_merge($this->tabCompletionMatchers, $matchers); - if (isset($this->shell)) { - $this->shell->addTabCompletionMatchers($this->tabCompletionMatchers); - } + $this->addMatchers($matchers); } /** @@ -983,7 +991,7 @@ class Configuration { if (!empty($this->newCommands)) { $this->shell->addCommands($this->newCommands); - $this->newCommands = array(); + $this->newCommands = []; } } @@ -996,6 +1004,7 @@ class Configuration { $this->shell = $shell; $this->doAddCommands(); + $this->doAddMatchers(); } /** @@ -1022,7 +1031,7 @@ class Configuration return $this->manualDbFile; } - $files = ConfigPaths::getDataFiles(array('php_manual.sqlite'), $this->dataDir); + $files = ConfigPaths::getDataFiles(['php_manual.sqlite'], $this->dataDir); if (!empty($files)) { if ($this->warnOnMultipleConfigs && count($files) > 1) { $msg = sprintf('Multiple manual database files found: %s. Using %s', implode($files, ', '), $files[0]); @@ -1118,11 +1127,11 @@ class Configuration */ public function setColorMode($colorMode) { - $validColorModes = array( + $validColorModes = [ self::COLOR_MODE_AUTO, self::COLOR_MODE_FORCED, self::COLOR_MODE_DISABLED, - ); + ]; if (in_array($colorMode, $validColorModes)) { $this->colorMode = $colorMode; @@ -1209,13 +1218,13 @@ class Configuration */ public function setUpdateCheck($interval) { - $validIntervals = array( + $validIntervals = [ Checker::ALWAYS, Checker::DAILY, Checker::WEEKLY, Checker::MONTHLY, Checker::NEVER, - ); + ]; if (!in_array($interval, $validIntervals)) { throw new \InvalidArgumentException('invalid update check interval: ' . $interval); diff --git a/vendor/psy/psysh/src/Psy/ConsoleColorFactory.php b/vendor/psy/psysh/src/ConsoleColorFactory.php similarity index 66% rename from vendor/psy/psysh/src/Psy/ConsoleColorFactory.php rename to vendor/psy/psysh/src/ConsoleColorFactory.php index b3bcb53d..76ad3b51 100644 --- a/vendor/psy/psysh/src/Psy/ConsoleColorFactory.php +++ b/vendor/psy/psysh/src/ConsoleColorFactory.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -49,10 +49,10 @@ class ConsoleColorFactory private function getDefaultConsoleColor() { $color = new ConsoleColor(); - $color->addTheme(Highlighter::LINE_NUMBER, array('blue')); - $color->addTheme(Highlighter::TOKEN_KEYWORD, array('yellow')); - $color->addTheme(Highlighter::TOKEN_STRING, array('green')); - $color->addTheme(Highlighter::TOKEN_COMMENT, array('dark_gray')); + $color->addTheme(Highlighter::LINE_NUMBER, ['blue']); + $color->addTheme(Highlighter::TOKEN_KEYWORD, ['yellow']); + $color->addTheme(Highlighter::TOKEN_STRING, ['green']); + $color->addTheme(Highlighter::TOKEN_COMMENT, ['dark_gray']); return $color; } @@ -69,13 +69,13 @@ class ConsoleColorFactory { $color = new ConsoleColor(); - $color->addTheme(Highlighter::TOKEN_STRING, array('none')); - $color->addTheme(Highlighter::TOKEN_COMMENT, array('none')); - $color->addTheme(Highlighter::TOKEN_KEYWORD, array('none')); - $color->addTheme(Highlighter::TOKEN_DEFAULT, array('none')); - $color->addTheme(Highlighter::TOKEN_HTML, array('none')); - $color->addTheme(Highlighter::ACTUAL_LINE_MARK, array('none')); - $color->addTheme(Highlighter::LINE_NUMBER, array('none')); + $color->addTheme(Highlighter::TOKEN_STRING, ['none']); + $color->addTheme(Highlighter::TOKEN_COMMENT, ['none']); + $color->addTheme(Highlighter::TOKEN_KEYWORD, ['none']); + $color->addTheme(Highlighter::TOKEN_DEFAULT, ['none']); + $color->addTheme(Highlighter::TOKEN_HTML, ['none']); + $color->addTheme(Highlighter::ACTUAL_LINE_MARK, ['none']); + $color->addTheme(Highlighter::LINE_NUMBER, ['none']); return $color; } diff --git a/vendor/psy/psysh/src/Psy/Context.php b/vendor/psy/psysh/src/Context.php similarity index 85% rename from vendor/psy/psysh/src/Psy/Context.php rename to vendor/psy/psysh/src/Context.php index 663f986b..c0e58e89 100644 --- a/vendor/psy/psysh/src/Psy/Context.php +++ b/vendor/psy/psysh/src/Context.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -19,20 +19,21 @@ namespace Psy; */ class Context { - private static $specialNames = array('_', '_e', '__out', '__psysh__', 'this'); + private static $specialNames = ['_', '_e', '__out', '__psysh__', 'this']; // Whitelist a very limited number of command-scope magic variable names. // This might be a bad idea, but future me can sort it out. - private static $commandScopeNames = array( + private static $commandScopeNames = [ '__function', '__method', '__class', '__namespace', '__file', '__line', '__dir', - ); + ]; - private $scopeVariables = array(); - private $commandScopeVariables = array(); + private $scopeVariables = []; + private $commandScopeVariables = []; private $returnValue; private $lastException; private $lastStdout; private $boundObject; + private $boundClass; /** * Get a context variable. @@ -106,9 +107,9 @@ class Context */ public function getSpecialVariables() { - $vars = array( + $vars = [ '_' => $this->returnValue, - ); + ]; if (isset($this->lastException)) { $vars['_e'] = $this->lastException; @@ -179,9 +180,9 @@ class Context /** * Get the most recent Exception. * - * @throws InvalidArgumentException If no Exception has been caught + * @throws \InvalidArgumentException If no Exception has been caught * - * @return null|Exception + * @return null|\Exception */ public function getLastException() { @@ -205,7 +206,7 @@ class Context /** * Get the most recent output from evaluated code. * - * @throws InvalidArgumentException If no output has happened yet + * @throws \InvalidArgumentException If no output has happened yet * * @return null|string */ @@ -221,11 +222,14 @@ class Context /** * Set the bound object ($this variable) for the interactive shell. * + * Note that this unsets the bound class, if any exists. + * * @param object|null $boundObject */ public function setBoundObject($boundObject) { $this->boundObject = is_object($boundObject) ? $boundObject : null; + $this->boundClass = null; } /** @@ -238,6 +242,29 @@ class Context return $this->boundObject; } + /** + * Set the bound class (self) for the interactive shell. + * + * Note that this unsets the bound object, if any exists. + * + * @param string|null $boundClass + */ + public function setBoundClass($boundClass) + { + $this->boundClass = (is_string($boundClass) && $boundClass !== '') ? $boundClass : null; + $this->boundObject = null; + } + + /** + * Get the bound class (self) for the interactive shell. + * + * @return string|null + */ + public function getBoundClass() + { + return $this->boundClass; + } + /** * Set command-scope magic variables: $__class, $__file, etc. * @@ -245,7 +272,7 @@ class Context */ public function setCommandScopeVariables(array $commandScopeVariables) { - $vars = array(); + $vars = []; foreach ($commandScopeVariables as $key => $value) { // kind of type check if (is_scalar($value) && in_array($key, self::$commandScopeNames)) { diff --git a/vendor/psy/psysh/src/Psy/ContextAware.php b/vendor/psy/psysh/src/ContextAware.php similarity index 94% rename from vendor/psy/psysh/src/Psy/ContextAware.php rename to vendor/psy/psysh/src/ContextAware.php index d68caba6..748f13aa 100644 --- a/vendor/psy/psysh/src/Psy/ContextAware.php +++ b/vendor/psy/psysh/src/ContextAware.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Exception/BreakException.php b/vendor/psy/psysh/src/Exception/BreakException.php similarity index 97% rename from vendor/psy/psysh/src/Psy/Exception/BreakException.php rename to vendor/psy/psysh/src/Exception/BreakException.php index 4592c51f..1436d56a 100644 --- a/vendor/psy/psysh/src/Psy/Exception/BreakException.php +++ b/vendor/psy/psysh/src/Exception/BreakException.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Exception/DeprecatedException.php b/vendor/psy/psysh/src/Exception/DeprecatedException.php similarity index 91% rename from vendor/psy/psysh/src/Psy/Exception/DeprecatedException.php rename to vendor/psy/psysh/src/Exception/DeprecatedException.php index cd0185f1..8ac0104b 100644 --- a/vendor/psy/psysh/src/Psy/Exception/DeprecatedException.php +++ b/vendor/psy/psysh/src/Exception/DeprecatedException.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Exception/ErrorException.php b/vendor/psy/psysh/src/Exception/ErrorException.php similarity index 98% rename from vendor/psy/psysh/src/Psy/Exception/ErrorException.php rename to vendor/psy/psysh/src/Exception/ErrorException.php index 85820ac8..2cd7e95f 100644 --- a/vendor/psy/psysh/src/Psy/Exception/ErrorException.php +++ b/vendor/psy/psysh/src/Exception/ErrorException.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Exception/Exception.php b/vendor/psy/psysh/src/Exception/Exception.php similarity index 93% rename from vendor/psy/psysh/src/Psy/Exception/Exception.php rename to vendor/psy/psysh/src/Exception/Exception.php index 80206f6f..de689547 100644 --- a/vendor/psy/psysh/src/Psy/Exception/Exception.php +++ b/vendor/psy/psysh/src/Exception/Exception.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Exception/FatalErrorException.php b/vendor/psy/psysh/src/Exception/FatalErrorException.php similarity index 97% rename from vendor/psy/psysh/src/Psy/Exception/FatalErrorException.php rename to vendor/psy/psysh/src/Exception/FatalErrorException.php index 5fe7fc61..08b56c0b 100644 --- a/vendor/psy/psysh/src/Psy/Exception/FatalErrorException.php +++ b/vendor/psy/psysh/src/Exception/FatalErrorException.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Exception/ParseErrorException.php b/vendor/psy/psysh/src/Exception/ParseErrorException.php similarity index 96% rename from vendor/psy/psysh/src/Psy/Exception/ParseErrorException.php rename to vendor/psy/psysh/src/Exception/ParseErrorException.php index 0fb397dc..93d0d3c9 100644 --- a/vendor/psy/psysh/src/Psy/Exception/ParseErrorException.php +++ b/vendor/psy/psysh/src/Exception/ParseErrorException.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Exception/RuntimeException.php b/vendor/psy/psysh/src/Exception/RuntimeException.php similarity index 96% rename from vendor/psy/psysh/src/Psy/Exception/RuntimeException.php rename to vendor/psy/psysh/src/Exception/RuntimeException.php index 1e767af0..09e68483 100644 --- a/vendor/psy/psysh/src/Psy/Exception/RuntimeException.php +++ b/vendor/psy/psysh/src/Exception/RuntimeException.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Exception/ThrowUpException.php b/vendor/psy/psysh/src/Exception/ThrowUpException.php similarity index 60% rename from vendor/psy/psysh/src/Psy/Exception/ThrowUpException.php rename to vendor/psy/psysh/src/Exception/ThrowUpException.php index acc87c23..8c3eb06c 100644 --- a/vendor/psy/psysh/src/Psy/Exception/ThrowUpException.php +++ b/vendor/psy/psysh/src/Exception/ThrowUpException.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -34,4 +34,24 @@ class ThrowUpException extends \Exception implements Exception { return $this->getPrevious()->getMessage(); } + + /** + * Create a ThrowUpException from a Throwable. + * + * @param \Throwable $throwable + * + * @return ThrowUpException + */ + public static function fromThrowable($throwable) + { + if ($throwable instanceof \Error) { + $throwable = ErrorException::fromError($throwable); + } + + if (!$throwable instanceof \Exception) { + throw new \InvalidArgumentException('throw-up can only throw Exceptions and Errors'); + } + + return new self($throwable); + } } diff --git a/vendor/psy/psysh/src/Psy/Exception/TypeErrorException.php b/vendor/psy/psysh/src/Exception/TypeErrorException.php similarity index 92% rename from vendor/psy/psysh/src/Psy/Exception/TypeErrorException.php rename to vendor/psy/psysh/src/Exception/TypeErrorException.php index 756b06a9..9dbdb936 100644 --- a/vendor/psy/psysh/src/Psy/Exception/TypeErrorException.php +++ b/vendor/psy/psysh/src/Exception/TypeErrorException.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -50,6 +50,6 @@ class TypeErrorException extends \Exception implements Exception */ public static function fromTypeError(\TypeError $e) { - return new self($e->getMessage(), $e->getLine()); + return new self($e->getMessage(), $e->getCode()); } } diff --git a/vendor/psy/psysh/src/ExecutionClosure.php b/vendor/psy/psysh/src/ExecutionClosure.php new file mode 100644 index 00000000..29a3bcc6 --- /dev/null +++ b/vendor/psy/psysh/src/ExecutionClosure.php @@ -0,0 +1,119 @@ +setClosure($__psysh__, function () use ($__psysh__) { + try { + // Restore execution scope variables + extract($__psysh__->getScopeVariables(false)); + + // Buffer stdout; we'll need it later + ob_start([$__psysh__, 'writeStdout'], 1); + + // Convert all errors to exceptions + set_error_handler([$__psysh__, 'handleError']); + + // Evaluate the current code buffer + $_ = eval($__psysh__->onExecute($__psysh__->flushCode() ?: ExecutionClosure::NOOP_INPUT)); + } catch (\Throwable $_e) { + // Clean up on our way out. + restore_error_handler(); + if (ob_get_level() > 0) { + ob_end_clean(); + } + + throw $_e; + } catch (\Exception $_e) { + // Clean up on our way out. + restore_error_handler(); + if (ob_get_level() > 0) { + ob_end_clean(); + } + + throw $_e; + } + + // Won't be needing this anymore + restore_error_handler(); + + // Flush stdout (write to shell output, plus save to magic variable) + ob_end_flush(); + + // Save execution scope variables for next time + $__psysh__->setScopeVariables(get_defined_vars()); + + return $_; + }); + } + + /** + * Set the closure instance. + * + * @param Shell $psysh + * @param \Closure $closure + */ + protected function setClosure(Shell $shell, \Closure $closure) + { + if (self::shouldBindClosure()) { + $that = $shell->getBoundObject(); + if (is_object($that)) { + $closure = $closure->bindTo($that, get_class($that)); + } else { + $closure = $closure->bindTo(null, $shell->getBoundClass()); + } + } + + $this->closure = $closure; + } + + /** + * Go go gadget closure. + * + * @return mixed + */ + public function execute() + { + $closure = $this->closure; + + return $closure(); + } + + /** + * Decide whether to bind the execution closure. + * + * @return bool + */ + protected static function shouldBindClosure() + { + // skip binding on HHVM < 3.5.0 + // see https://github.com/facebook/hhvm/issues/1203 + if (defined('HHVM_VERSION')) { + return version_compare(HHVM_VERSION, '3.5.0', '>='); + } + + return true; + } +} diff --git a/vendor/psy/psysh/src/ExecutionLoop.php b/vendor/psy/psysh/src/ExecutionLoop.php new file mode 100644 index 00000000..eacd1d3c --- /dev/null +++ b/vendor/psy/psysh/src/ExecutionLoop.php @@ -0,0 +1,67 @@ +loadIncludes($shell); + + $closure = new ExecutionLoopClosure($shell); + $closure->execute(); + } + + /** + * Load user-defined includes. + * + * @param Shell $shell + */ + protected function loadIncludes(Shell $shell) + { + // Load user-defined includes + $load = function (Shell $__psysh__) { + set_error_handler([$__psysh__, 'handleError']); + foreach ($__psysh__->getIncludes() as $__psysh_include__) { + try { + include $__psysh_include__; + } catch (\Error $_e) { + $__psysh__->writeException(ErrorException::fromError($_e)); + } catch (\Exception $_e) { + $__psysh__->writeException($_e); + } + } + restore_error_handler(); + unset($__psysh_include__); + + // Override any new local variables with pre-defined scope variables + extract($__psysh__->getScopeVariables(false)); + + // ... then add the whole mess of variables back. + $__psysh__->setScopeVariables(get_defined_vars()); + }; + + $load($shell); + } +} diff --git a/vendor/psy/psysh/src/ExecutionLoop/AbstractListener.php b/vendor/psy/psysh/src/ExecutionLoop/AbstractListener.php new file mode 100644 index 00000000..3617fa24 --- /dev/null +++ b/vendor/psy/psysh/src/ExecutionLoop/AbstractListener.php @@ -0,0 +1,62 @@ + 0) { // This is the main thread. We'll just wait for a while. @@ -51,12 +62,27 @@ class ForkingLoop extends Loop fclose($up); // Wait for a return value from the loop process. - $read = array($down); + $read = [$down]; $write = null; $except = null; - if (stream_select($read, $write, $except, null) === false) { - throw new \RuntimeException('Error waiting for execution loop.'); - } + + do { + $n = @stream_select($read, $write, $except, null); + + if ($n === 0) { + throw new \RuntimeException('Process timed out waiting for execution loop'); + } + + if ($n === false) { + $err = error_get_last(); + if (!isset($err['message']) || stripos($err['message'], 'interrupted system call') === false) { + $msg = $err['message'] ? + sprintf('Error waiting for execution loop: %s', $err['message']) : + 'Error waiting for execution loop'; + throw new \RuntimeException($msg); + } + } + } while ($n < 1); $content = stream_get_contents($down); fclose($down); @@ -65,7 +91,7 @@ class ForkingLoop extends Loop $shell->setScopeVariables(@unserialize($content)); } - return; + throw new BreakException('Exiting main thread'); } // This is the child process. It's going to do all the work. @@ -76,28 +102,26 @@ class ForkingLoop extends Loop // We won't be needing this one. fclose($down); - // Let's do some processing. - parent::run($shell); - - // Send the scope variables back up to the main thread - fwrite($up, $this->serializeReturn($shell->getScopeVariables(false))); - fclose($up); - - posix_kill(posix_getpid(), SIGKILL); + // Save this; we'll need to close it in `afterRun` + $this->up = $up; } /** * Create a savegame at the start of each loop iteration. + * + * @param Shell $shell */ - public function beforeLoop() + public function beforeLoop(Shell $shell) { $this->createSavegame(); } /** * Clean up old savegames at the end of each loop iteration. + * + * @param Shell $shell */ - public function afterLoop() + public function afterLoop(Shell $shell) { // if there's an old savegame hanging around, let's kill it. if (isset($this->savegame)) { @@ -106,6 +130,23 @@ class ForkingLoop extends Loop } } + /** + * After the REPL session ends, send the scope variables back up to the main + * thread (if this is a child thread). + * + * @param Shell $shell + */ + public function afterRun(Shell $shell) + { + // We're a child thread. Send the scope variables back up to the main thread. + if (isset($this->up)) { + fwrite($this->up, $this->serializeReturn($shell->getScopeVariables(false))); + fclose($this->up); + + posix_kill(posix_getpid(), SIGKILL); + } + } + /** * Create a savegame fork. * @@ -120,7 +161,7 @@ class ForkingLoop extends Loop $pid = pcntl_fork(); if ($pid < 0) { - throw new \RuntimeException('Unable to create savegame fork.'); + throw new \RuntimeException('Unable to create savegame fork'); } elseif ($pid > 0) { // we're the savegame now... let's wait and see what happens pcntl_waitpid($pid, $status); @@ -149,7 +190,7 @@ class ForkingLoop extends Loop */ private function serializeReturn(array $return) { - $serializable = array(); + $serializable = []; foreach ($return as $key => $value) { // No need to return magic variables @@ -165,10 +206,11 @@ class ForkingLoop extends Loop try { @serialize($value); $serializable[$key] = $value; - } catch (\Exception $e) { - // we'll just ignore this one... } catch (\Throwable $e) { + // we'll just ignore this one... + } catch (\Exception $e) { // and this one too... + // @todo remove this once we don't support PHP 5.x anymore :) } } diff --git a/vendor/psy/psysh/src/ExecutionLoop/RunkitReloader.php b/vendor/psy/psysh/src/ExecutionLoop/RunkitReloader.php new file mode 100644 index 00000000..5706b79a --- /dev/null +++ b/vendor/psy/psysh/src/ExecutionLoop/RunkitReloader.php @@ -0,0 +1,135 @@ +parser = $parserFactory->createParser(); + } + + /** + * Reload code on input. + * + * @param Shell $shell + * @param string $input + */ + public function onInput(Shell $shell, $input) + { + $this->reload($shell); + } + + /** + * Look through included files and update anything with a new timestamp. + * + * @param Shell $shell + */ + private function reload(Shell $shell) + { + clearstatcache(); + $modified = []; + + foreach (get_included_files() as $file) { + $timestamp = filemtime($file); + + if (!isset($this->timestamps[$file])) { + $this->timestamps[$file] = $timestamp; + continue; + } + + if ($this->timestamps[$file] === $timestamp) { + continue; + } + + if (!$this->lintFile($file)) { + $msg = sprintf('Modified file "%s" could not be reloaded', $file); + $shell->writeException(new ParseErrorException($msg)); + continue; + } + + $modified[] = $file; + $this->timestamps[$file] = $timestamp; + } + + // switch (count($modified)) { + // case 0: + // return; + + // case 1: + // printf("Reloading modified file: \"%s\"\n", str_replace(getcwd(), '.', $file)); + // break; + + // default: + // printf("Reloading %d modified files\n", count($modified)); + // break; + // } + + foreach ($modified as $file) { + runkit_import($file, ( + RUNKIT_IMPORT_FUNCTIONS | + RUNKIT_IMPORT_CLASSES | + RUNKIT_IMPORT_CLASS_METHODS | + RUNKIT_IMPORT_CLASS_CONSTS | + RUNKIT_IMPORT_CLASS_PROPS | + RUNKIT_IMPORT_OVERRIDE + )); + } + } + + /** + * Should this file be re-imported? + * + * Use PHP-Parser to ensure that the file is valid PHP. + * + * @param string $file + * + * @return bool + */ + private function lintFile($file) + { + // first try to parse it + try { + $this->parser->parse(file_get_contents($file)); + } catch (\Exception $e) { + return false; + } + + return true; + } +} diff --git a/vendor/psy/psysh/src/ExecutionLoopClosure.php b/vendor/psy/psysh/src/ExecutionLoopClosure.php new file mode 100644 index 00000000..e34848ed --- /dev/null +++ b/vendor/psy/psysh/src/ExecutionLoopClosure.php @@ -0,0 +1,99 @@ +setClosure($__psysh__, function () use ($__psysh__) { + // Restore execution scope variables + extract($__psysh__->getScopeVariables(false)); + + do { + $__psysh__->beforeLoop(); + + try { + $__psysh__->getInput(); + + try { + // Buffer stdout; we'll need it later + ob_start([$__psysh__, 'writeStdout'], 1); + + // Convert all errors to exceptions + set_error_handler([$__psysh__, 'handleError']); + + // Evaluate the current code buffer + $_ = eval($__psysh__->onExecute($__psysh__->flushCode() ?: ExecutionClosure::NOOP_INPUT)); + } catch (\Throwable $_e) { + // Clean up on our way out. + restore_error_handler(); + if (ob_get_level() > 0) { + ob_end_clean(); + } + + throw $_e; + } catch (\Exception $_e) { + // Clean up on our way out. + restore_error_handler(); + if (ob_get_level() > 0) { + ob_end_clean(); + } + + throw $_e; + } + + // Won't be needing this anymore + restore_error_handler(); + + // Flush stdout (write to shell output, plus save to magic variable) + ob_end_flush(); + + // Save execution scope variables for next time + $__psysh__->setScopeVariables(get_defined_vars()); + + $__psysh__->writeReturnValue($_); + } catch (BreakException $_e) { + $__psysh__->writeException($_e); + + return; + } catch (ThrowUpException $_e) { + $__psysh__->writeException($_e); + + throw $_e; + } catch (\TypeError $_e) { + $__psysh__->writeException(TypeErrorException::fromTypeError($_e)); + } catch (\Error $_e) { + $__psysh__->writeException(ErrorException::fromError($_e)); + } catch (\Exception $_e) { + $__psysh__->writeException($_e); + } + + $__psysh__->afterLoop(); + } while (true); + }); + } +} diff --git a/vendor/psy/psysh/src/Psy/Formatter/CodeFormatter.php b/vendor/psy/psysh/src/Formatter/CodeFormatter.php similarity index 80% rename from vendor/psy/psysh/src/Psy/Formatter/CodeFormatter.php rename to vendor/psy/psysh/src/Formatter/CodeFormatter.php index 45ad4919..5ef195df 100644 --- a/vendor/psy/psysh/src/Psy/Formatter/CodeFormatter.php +++ b/vendor/psy/psysh/src/Formatter/CodeFormatter.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -32,18 +32,14 @@ class CodeFormatter implements Formatter public static function format(\Reflector $reflector, $colorMode = null) { if (!self::isReflectable($reflector)) { - throw new RuntimeException('Source code unavailable.'); + throw new RuntimeException('Source code unavailable'); } $colorMode = $colorMode ?: Configuration::COLOR_MODE_AUTO; - if ($reflector instanceof \ReflectionGenerator) { - $reflector = $reflector->getFunction(); - } - if ($fileName = $reflector->getFileName()) { if (!is_file($fileName)) { - throw new RuntimeException('Source code unavailable.'); + throw new RuntimeException('Source code unavailable'); } $file = file_get_contents($fileName); @@ -56,7 +52,7 @@ class CodeFormatter implements Formatter return $highlighter->getCodeSnippet($file, $start, 0, $end); } else { - throw new RuntimeException('Source code unavailable.'); + throw new RuntimeException('Source code unavailable'); } } @@ -70,7 +66,6 @@ class CodeFormatter implements Formatter private static function isReflectable(\Reflector $reflector) { return $reflector instanceof \ReflectionClass || - $reflector instanceof \ReflectionFunctionAbstract || - $reflector instanceof \ReflectionGenerator; + $reflector instanceof \ReflectionFunctionAbstract; } } diff --git a/vendor/psy/psysh/src/Psy/Formatter/DocblockFormatter.php b/vendor/psy/psysh/src/Formatter/DocblockFormatter.php similarity index 93% rename from vendor/psy/psysh/src/Psy/Formatter/DocblockFormatter.php rename to vendor/psy/psysh/src/Formatter/DocblockFormatter.php index c1e8af9c..33f450e1 100644 --- a/vendor/psy/psysh/src/Psy/Formatter/DocblockFormatter.php +++ b/vendor/psy/psysh/src/Formatter/DocblockFormatter.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -19,10 +19,10 @@ use Symfony\Component\Console\Formatter\OutputFormatter; */ class DocblockFormatter implements Formatter { - private static $vectorParamTemplates = array( + private static $vectorParamTemplates = [ 'type' => 'info', 'var' => 'strong', - ); + ]; /** * Format a docblock. @@ -34,7 +34,7 @@ class DocblockFormatter implements Formatter public static function format(\Reflector $reflector) { $docblock = new Docblock($reflector); - $chunks = array(); + $chunks = []; if (!empty($docblock->desc)) { $chunks[] = 'Description:'; @@ -73,7 +73,7 @@ class DocblockFormatter implements Formatter */ private static function formatVector(array $vector, array $lines) { - $template = array(' '); + $template = [' ']; foreach ($vector as $type) { $max = 0; foreach ($lines as $line) { @@ -89,7 +89,7 @@ class DocblockFormatter implements Formatter $template = implode(' ', $template); return implode("\n", array_map(function ($line) use ($template) { - $escaped = array_map(array('Symfony\Component\Console\Formatter\OutputFormatter', 'escape'), $line); + $escaped = array_map(['Symfony\Component\Console\Formatter\OutputFormatter', 'escape'], $line); return rtrim(vsprintf($template, $escaped)); }, $lines)); @@ -105,7 +105,7 @@ class DocblockFormatter implements Formatter */ private static function formatTags(array $skip, array $tags) { - $chunks = array(); + $chunks = []; foreach ($tags as $name => $values) { if (in_array($name, $skip)) { diff --git a/vendor/psy/psysh/src/Psy/Formatter/Formatter.php b/vendor/psy/psysh/src/Formatter/Formatter.php similarity index 92% rename from vendor/psy/psysh/src/Psy/Formatter/Formatter.php rename to vendor/psy/psysh/src/Formatter/Formatter.php index fe11bce0..08a8e4c1 100644 --- a/vendor/psy/psysh/src/Psy/Formatter/Formatter.php +++ b/vendor/psy/psysh/src/Formatter/Formatter.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Formatter/SignatureFormatter.php b/vendor/psy/psysh/src/Formatter/SignatureFormatter.php similarity index 82% rename from vendor/psy/psysh/src/Psy/Formatter/SignatureFormatter.php rename to vendor/psy/psysh/src/Formatter/SignatureFormatter.php index b3ef2eac..2a83ad1c 100644 --- a/vendor/psy/psysh/src/Psy/Formatter/SignatureFormatter.php +++ b/vendor/psy/psysh/src/Formatter/SignatureFormatter.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,7 +11,8 @@ namespace Psy\Formatter; -use Psy\Reflection\ReflectionConstant; +use Psy\Reflection\ReflectionClassConstant; +use Psy\Reflection\ReflectionConstant_; use Psy\Reflection\ReflectionLanguageConstruct; use Psy\Util\Json; use Symfony\Component\Console\Formatter\OutputFormatter; @@ -41,8 +42,9 @@ class SignatureFormatter implements Formatter case $reflector instanceof \ReflectionClass: return self::formatClass($reflector); - case $reflector instanceof ReflectionConstant: - return self::formatConstant($reflector); + case $reflector instanceof ReflectionClassConstant: + case $reflector instanceof \ReflectionClassConstant: + return self::formatClassConstant($reflector); case $reflector instanceof \ReflectionMethod: return self::formatMethod($reflector); @@ -50,6 +52,9 @@ class SignatureFormatter implements Formatter case $reflector instanceof \ReflectionProperty: return self::formatProperty($reflector); + case $reflector instanceof ReflectionConstant_: + return self::formatConstant($reflector); + default: throw new \InvalidArgumentException('Unexpected Reflector class: ' . get_class($reflector)); } @@ -70,14 +75,20 @@ class SignatureFormatter implements Formatter /** * Print the method, property or class modifiers. * - * Technically this should be a trait. Can't wait for 5.4 :) - * * @param \Reflector $reflector * * @return string Formatted modifiers */ private static function formatModifiers(\Reflector $reflector) { + if ($reflector instanceof \ReflectionClass && $reflector->isTrait()) { + // For some reason, PHP 5.x returns `abstract public` modifiers for + // traits. Let's just ignore that business entirely. + if (version_compare(PHP_VERSION, '7.0.0', '<')) { + return []; + } + } + return implode(' ', array_map(function ($modifier) { return sprintf('%s', $modifier); }, \Reflection::getModifierNames($reflector->getModifiers()))); @@ -92,13 +103,13 @@ class SignatureFormatter implements Formatter */ private static function formatClass(\ReflectionClass $reflector) { - $chunks = array(); + $chunks = []; if ($modifiers = self::formatModifiers($reflector)) { $chunks[] = $modifiers; } - if (version_compare(PHP_VERSION, '5.4', '>=') && $reflector->isTrait()) { + if ($reflector->isTrait()) { $chunks[] = 'trait'; } else { $chunks[] = $reflector->isInterface() ? 'interface' : 'class'; @@ -127,11 +138,11 @@ class SignatureFormatter implements Formatter /** * Format a constant signature. * - * @param ReflectionConstant $reflector + * @param ReflectionClassConstant|\ReflectionClassConstant $reflector * * @return string Formatted signature */ - private static function formatConstant(ReflectionConstant $reflector) + private static function formatClassConstant($reflector) { $value = $reflector->getValue(); $style = self::getTypeStyle($value); @@ -145,6 +156,27 @@ class SignatureFormatter implements Formatter ); } + /** + * Format a constant signature. + * + * @param ReflectionConstant_ $reflector + * + * @return string Formatted signature + */ + private static function formatConstant($reflector) + { + $value = $reflector->getValue(); + $style = self::getTypeStyle($value); + + return sprintf( + 'define(%s, <%s>%s)', + OutputFormatter::escape(Json::encode($reflector->getName())), + $style, + OutputFormatter::escape(Json::encode($value)), + $style + ); + } + /** * Helper for getting output style for a given value's type. * @@ -161,7 +193,7 @@ class SignatureFormatter implements Formatter } elseif (is_bool($value) || is_null($value)) { return 'bool'; } else { - return 'strong'; + return 'strong'; // @codeCoverageIgnore } } @@ -219,11 +251,11 @@ class SignatureFormatter implements Formatter * * @param \ReflectionFunctionAbstract $reflector * - * @return string + * @return array */ private static function formatFunctionParams(\ReflectionFunctionAbstract $reflector) { - $params = array(); + $params = []; foreach ($reflector->getParameters() as $param) { $hint = ''; try { @@ -238,11 +270,14 @@ class SignatureFormatter implements Formatter // come to think of it, the only time I've seen this is with the intl extension. // Hax: we'll try to extract it :P + + // @codeCoverageIgnoreStart $chunks = explode('$' . $param->getName(), (string) $param); $chunks = explode(' ', trim($chunks[0])); $guess = end($chunks); $hint = sprintf('%s ', $guess); + // @codeCoverageIgnoreEnd } if ($param->isOptional()) { diff --git a/vendor/psy/psysh/src/Psy/Input/CodeArgument.php b/vendor/psy/psysh/src/Input/CodeArgument.php similarity index 96% rename from vendor/psy/psysh/src/Psy/Input/CodeArgument.php rename to vendor/psy/psysh/src/Input/CodeArgument.php index 4e50754e..cfeb9e16 100644 --- a/vendor/psy/psysh/src/Psy/Input/CodeArgument.php +++ b/vendor/psy/psysh/src/Input/CodeArgument.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -42,7 +42,7 @@ class CodeArgument extends InputArgument public function __construct($name, $mode = null, $description = '', $default = null) { if ($mode & InputArgument::IS_ARRAY) { - throw new \InvalidArgumentException('Argument mode IS_ARRAY is not valid.'); + throw new \InvalidArgumentException('Argument mode IS_ARRAY is not valid'); } parent::__construct($name, $mode, $description, $default); diff --git a/vendor/psy/psysh/src/Psy/Input/FilterOptions.php b/vendor/psy/psysh/src/Input/FilterOptions.php similarity index 93% rename from vendor/psy/psysh/src/Psy/Input/FilterOptions.php rename to vendor/psy/psysh/src/Input/FilterOptions.php index 46017d22..a2ed49d0 100644 --- a/vendor/psy/psysh/src/Psy/Input/FilterOptions.php +++ b/vendor/psy/psysh/src/Input/FilterOptions.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,6 +11,7 @@ namespace Psy\Input; +use Psy\Exception\ErrorException; use Psy\Exception\RuntimeException; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -32,11 +33,11 @@ class FilterOptions */ public static function getOptions() { - return array( + return [ new InputOption('grep', 'G', InputOption::VALUE_REQUIRED, 'Limit to items matching the given pattern (string or regex).'), new InputOption('insensitive', 'i', InputOption::VALUE_NONE, 'Case-insensitive search (requires --grep).'), new InputOption('invert', 'v', InputOption::VALUE_NONE, 'Inverted search (requires --grep).'), - ); + ]; } /** @@ -103,7 +104,7 @@ class FilterOptions private function validateInput(InputInterface $input) { if (!$input->getOption('grep')) { - foreach (array('invert', 'insensitive') as $option) { + foreach (['invert', 'insensitive'] as $option) { if ($input->getOption($option)) { throw new RuntimeException('--' . $option . ' does not make sense without --grep'); } @@ -132,10 +133,11 @@ class FilterOptions */ private function validateRegex($pattern) { - set_error_handler(array('Psy\Exception\ErrorException', 'throwException')); + set_error_handler(['Psy\Exception\ErrorException', 'throwException']); try { preg_match($pattern, ''); } catch (ErrorException $e) { + restore_error_handler(); throw new RuntimeException(str_replace('preg_match(): ', 'Invalid regular expression: ', $e->getRawMessage())); } restore_error_handler(); diff --git a/vendor/psy/psysh/src/Psy/Input/ShellInput.php b/vendor/psy/psysh/src/Input/ShellInput.php similarity index 91% rename from vendor/psy/psysh/src/Psy/Input/ShellInput.php rename to vendor/psy/psysh/src/Input/ShellInput.php index 68a4252a..7141d2d4 100644 --- a/vendor/psy/psysh/src/Psy/Input/ShellInput.php +++ b/vendor/psy/psysh/src/Input/ShellInput.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -83,29 +83,31 @@ class ShellInput extends StringInput */ private function tokenize($input) { - $tokens = array(); + $tokens = []; $length = strlen($input); $cursor = 0; while ($cursor < $length) { if (preg_match('/\s+/A', $input, $match, null, $cursor)) { } elseif (preg_match('/([^="\'\s]+?)(=?)(' . StringInput::REGEX_QUOTED_STRING . '+)/A', $input, $match, null, $cursor)) { - $tokens[] = array( - $match[1] . $match[2] . stripcslashes(str_replace(array('"\'', '\'"', '\'\'', '""'), '', substr($match[3], 1, strlen($match[3]) - 2))), - substr($input, $cursor), - ); + $tokens[] = [ + $match[1] . $match[2] . stripcslashes(str_replace(['"\'', '\'"', '\'\'', '""'], '', substr($match[3], 1, strlen($match[3]) - 2))), + stripcslashes(substr($input, $cursor)), + ]; } elseif (preg_match('/' . StringInput::REGEX_QUOTED_STRING . '/A', $input, $match, null, $cursor)) { - $tokens[] = array( + $tokens[] = [ stripcslashes(substr($match[0], 1, strlen($match[0]) - 2)), - substr($input, $cursor), - ); + stripcslashes(substr($input, $cursor)), + ]; } elseif (preg_match('/' . StringInput::REGEX_STRING . '/A', $input, $match, null, $cursor)) { - $tokens[] = array( + $tokens[] = [ stripcslashes($match[1]), - substr($input, $cursor), - ); + stripcslashes(substr($input, $cursor)), + ]; } else { // should never happen + // @codeCoverageIgnoreStart throw new \InvalidArgumentException(sprintf('Unable to parse input near "... %s ..."', substr($input, $cursor, 10))); + // @codeCoverageIgnoreEnd } $cursor += strlen($match[0]); @@ -159,15 +161,19 @@ class ShellInput extends StringInput if ($arg instanceof CodeArgument) { // When we find a code argument, we're done parsing. Add the // remaining input to the current argument and call it a day. - $this->parsed = array(); + $this->parsed = []; $this->arguments[$arg->getName()] = $rest; } else { - $this->arguments[$arg->getName()] = $arg->isArray() ? array($token) : $token; + $this->arguments[$arg->getName()] = $arg->isArray() ? [$token] : $token; } return; } + // (copypasta) + // + // @codeCoverageIgnoreStart + // if last argument isArray(), append token to last argument if ($this->definition->hasArgument($c - 1) && $this->definition->getArgument($c - 1)->isArray()) { $arg = $this->definition->getArgument($c - 1); @@ -183,9 +189,11 @@ class ShellInput extends StringInput } throw new \RuntimeException(sprintf('No arguments expected, got "%s".', $token)); + // @codeCoverageIgnoreEnd } // Everything below this is copypasta from ArgvInput private methods + // @codeCoverageIgnoreStart /** * Parses a short option. @@ -250,7 +258,7 @@ class ShellInput extends StringInput if (PHP_VERSION_ID < 70000 && false === $value) { $value = ''; } - array_unshift($this->parsed, array($value, null)); + array_unshift($this->parsed, [$value, null]); } $this->addLongOption(substr($name, 0, $pos), $value); } else { @@ -295,12 +303,12 @@ class ShellInput extends StringInput throw new \RuntimeException(sprintf('The "--%s" option does not accept a value.', $name)); } - if (in_array($value, array('', null), true) && $option->acceptValue() && count($this->parsed)) { + if (in_array($value, ['', null], true) && $option->acceptValue() && count($this->parsed)) { // if option accepts an optional or mandatory argument // let's see if there is one provided $next = array_shift($this->parsed); $nextToken = $next[0]; - if ((isset($nextToken[0]) && '-' !== $nextToken[0]) || in_array($nextToken, array('', null), true)) { + if ((isset($nextToken[0]) && '-' !== $nextToken[0]) || in_array($nextToken, ['', null], true)) { $value = $nextToken; } else { array_unshift($this->parsed, $next); @@ -323,4 +331,6 @@ class ShellInput extends StringInput $this->options[$name] = $value; } } + + // @codeCoverageIgnoreEnd } diff --git a/vendor/psy/psysh/src/Psy/Input/SilentInput.php b/vendor/psy/psysh/src/Input/SilentInput.php similarity index 96% rename from vendor/psy/psysh/src/Psy/Input/SilentInput.php rename to vendor/psy/psysh/src/Input/SilentInput.php index 0da750d6..c6f234ba 100644 --- a/vendor/psy/psysh/src/Psy/Input/SilentInput.php +++ b/vendor/psy/psysh/src/Input/SilentInput.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Output/OutputPager.php b/vendor/psy/psysh/src/Output/OutputPager.php similarity index 94% rename from vendor/psy/psysh/src/Psy/Output/OutputPager.php rename to vendor/psy/psysh/src/Output/OutputPager.php index 03f049f6..a2f12aea 100644 --- a/vendor/psy/psysh/src/Psy/Output/OutputPager.php +++ b/vendor/psy/psysh/src/Output/OutputPager.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Output/PassthruPager.php b/vendor/psy/psysh/src/Output/PassthruPager.php similarity index 96% rename from vendor/psy/psysh/src/Psy/Output/PassthruPager.php rename to vendor/psy/psysh/src/Output/PassthruPager.php index 5bcbf796..2dcb7439 100644 --- a/vendor/psy/psysh/src/Psy/Output/PassthruPager.php +++ b/vendor/psy/psysh/src/Output/PassthruPager.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Output/ProcOutputPager.php b/vendor/psy/psysh/src/Output/ProcOutputPager.php similarity index 93% rename from vendor/psy/psysh/src/Psy/Output/ProcOutputPager.php rename to vendor/psy/psysh/src/Output/ProcOutputPager.php index bb41c6cc..d8c03028 100644 --- a/vendor/psy/psysh/src/Psy/Output/ProcOutputPager.php +++ b/vendor/psy/psysh/src/Output/ProcOutputPager.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -54,7 +54,7 @@ class ProcOutputPager extends StreamOutput implements OutputPager if (false === @fwrite($pipe, $message . ($newline ? PHP_EOL : ''))) { // @codeCoverageIgnoreStart // should never happen - throw new \RuntimeException('Unable to write output.'); + throw new \RuntimeException('Unable to write output'); // @codeCoverageIgnoreEnd } @@ -88,7 +88,7 @@ class ProcOutputPager extends StreamOutput implements OutputPager private function getPipe() { if (!isset($this->pipe) || !isset($this->proc)) { - $desc = array(array('pipe', 'r'), $this->stream, fopen('php://stderr', 'w')); + $desc = [['pipe', 'r'], $this->stream, fopen('php://stderr', 'w')]; $this->proc = proc_open($this->cmd, $desc, $pipes); if (!is_resource($this->proc)) { diff --git a/vendor/psy/psysh/src/Psy/Output/ShellOutput.php b/vendor/psy/psysh/src/Output/ShellOutput.php similarity index 94% rename from vendor/psy/psysh/src/Psy/Output/ShellOutput.php rename to vendor/psy/psysh/src/Output/ShellOutput.php index f390db13..e980d387 100644 --- a/vendor/psy/psysh/src/Psy/Output/ShellOutput.php +++ b/vendor/psy/psysh/src/Output/ShellOutput.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -70,7 +70,7 @@ class ShellOutput extends ConsoleOutput } if (!is_array($messages) && !is_callable($messages)) { - throw new \InvalidArgumentException('Paged output requires a string, array or callback.'); + throw new \InvalidArgumentException('Paged output requires a string, array or callback'); } $this->startPaging(); @@ -126,7 +126,7 @@ class ShellOutput extends ConsoleOutput $template = $this->isDecorated() ? ": %s" : "%{$pad}s: %s"; if ($type & self::OUTPUT_RAW) { - $messages = array_map(array('Symfony\Component\Console\Formatter\OutputFormatter', 'escape'), $messages); + $messages = array_map(['Symfony\Component\Console\Formatter\OutputFormatter', 'escape'], $messages); } foreach ($messages as $i => $line) { @@ -175,20 +175,20 @@ class ShellOutput extends ConsoleOutput $formatter = $this->getFormatter(); $formatter->setStyle('warning', new OutputFormatterStyle('black', 'yellow')); - $formatter->setStyle('error', new OutputFormatterStyle('black', 'red', array('bold'))); + $formatter->setStyle('error', new OutputFormatterStyle('black', 'red', ['bold'])); $formatter->setStyle('aside', new OutputFormatterStyle('blue')); - $formatter->setStyle('strong', new OutputFormatterStyle(null, null, array('bold'))); + $formatter->setStyle('strong', new OutputFormatterStyle(null, null, ['bold'])); $formatter->setStyle('return', new OutputFormatterStyle('cyan')); $formatter->setStyle('urgent', new OutputFormatterStyle('red')); $formatter->setStyle('hidden', new OutputFormatterStyle('black')); // Visibility - $formatter->setStyle('public', new OutputFormatterStyle(null, null, array('bold'))); + $formatter->setStyle('public', new OutputFormatterStyle(null, null, ['bold'])); $formatter->setStyle('protected', new OutputFormatterStyle('yellow')); $formatter->setStyle('private', new OutputFormatterStyle('red')); - $formatter->setStyle('global', new OutputFormatterStyle('cyan', null, array('bold'))); + $formatter->setStyle('global', new OutputFormatterStyle('cyan', null, ['bold'])); $formatter->setStyle('const', new OutputFormatterStyle('cyan')); - $formatter->setStyle('class', new OutputFormatterStyle('blue', null, array('underscore'))); + $formatter->setStyle('class', new OutputFormatterStyle('blue', null, ['underscore'])); $formatter->setStyle('function', new OutputFormatterStyle(null)); $formatter->setStyle('default', new OutputFormatterStyle(null)); diff --git a/vendor/psy/psysh/src/Psy/ParserFactory.php b/vendor/psy/psysh/src/ParserFactory.php similarity index 95% rename from vendor/psy/psysh/src/Psy/ParserFactory.php rename to vendor/psy/psysh/src/ParserFactory.php index 83f15398..21427483 100644 --- a/vendor/psy/psysh/src/Psy/ParserFactory.php +++ b/vendor/psy/psysh/src/ParserFactory.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -32,7 +32,7 @@ class ParserFactory */ public static function getPossibleKinds() { - return array('ONLY_PHP5', 'ONLY_PHP7', 'PREFER_PHP5', 'PREFER_PHP7'); + return ['ONLY_PHP5', 'ONLY_PHP7', 'PREFER_PHP5', 'PREFER_PHP7']; } /** diff --git a/vendor/psy/psysh/src/Psy/Autoloader.php b/vendor/psy/psysh/src/Psy/Autoloader.php deleted file mode 100644 index df2e45b4..00000000 --- a/vendor/psy/psysh/src/Psy/Autoloader.php +++ /dev/null @@ -1,45 +0,0 @@ - - */ -class StaticConstructorPass extends CodeCleanerPass -{ - private $isPHP533; - private $namespace; - - public function __construct() - { - $this->isPHP533 = version_compare(PHP_VERSION, '5.3.3', '>='); - } - - public function beforeTraverse(array $nodes) - { - $this->namespace = array(); - } - - /** - * Validate that the old-style constructor function is not static. - * - * @throws FatalErrorException if the old-style constructor function is static - * - * @param Node $node - */ - public function enterNode(Node $node) - { - if ($node instanceof Namespace_) { - $this->namespace = isset($node->name) ? $node->name->parts : array(); - } elseif ($node instanceof Class_) { - // Bail early if this is PHP 5.3.3 and we have a namespaced class - if (!empty($this->namespace) && $this->isPHP533) { - return; - } - - $constructor = null; - foreach ($node->stmts as $stmt) { - if ($stmt instanceof ClassMethod) { - // Bail early if we find a new-style constructor - if ('__construct' === strtolower($stmt->name)) { - return; - } - - // We found a possible old-style constructor - // (unless there is also a __construct method) - if (strtolower($node->name) === strtolower($stmt->name)) { - $constructor = $stmt; - } - } - } - - if ($constructor && $constructor->isStatic()) { - $msg = sprintf( - 'Constructor %s::%s() cannot be static', - implode('\\', array_merge($this->namespace, (array) $node->name)), - $constructor->name - ); - throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine()); - } - } - } -} diff --git a/vendor/psy/psysh/src/Psy/Command/ThrowUpCommand.php b/vendor/psy/psysh/src/Psy/Command/ThrowUpCommand.php deleted file mode 100644 index 34bf425f..00000000 --- a/vendor/psy/psysh/src/Psy/Command/ThrowUpCommand.php +++ /dev/null @@ -1,87 +0,0 @@ -context = $context; - } - - /** - * {@inheritdoc} - */ - protected function configure() - { - $this - ->setName('throw-up') - ->setDefinition(array( - new InputArgument('exception', InputArgument::OPTIONAL, 'Exception to throw'), - )) - ->setDescription('Throw an exception out of the Psy Shell.') - ->setHelp( - <<<'HELP' -Throws an exception out of the current the Psy Shell instance. - -By default it throws the most recent exception. - -e.g. ->>> throw-up ->>> throw-up $e -HELP - ); - } - - /** - * {@inheritdoc} - * - * @throws InvalidArgumentException if there is no exception to throw - * @throws ThrowUpException because what else do you expect it to do? - */ - protected function execute(InputInterface $input, OutputInterface $output) - { - if ($name = $input->getArgument('exception')) { - $orig = $this->context->get(preg_replace('/^\$/', '', $name)); - } else { - $orig = $this->context->getLastException(); - } - - if (!$orig instanceof \Exception) { - throw new \InvalidArgumentException('throw-up can only throw Exceptions'); - } - - throw new ThrowUpException($orig); - } -} diff --git a/vendor/psy/psysh/src/Psy/Compiler.php b/vendor/psy/psysh/src/Psy/Compiler.php deleted file mode 100644 index 4ec7bf6b..00000000 --- a/vendor/psy/psysh/src/Psy/Compiler.php +++ /dev/null @@ -1,163 +0,0 @@ -version = Shell::VERSION; - - $phar = new \Phar($pharFile, 0, 'psysh.phar'); - $phar->setSignatureAlgorithm(\Phar::SHA1); - - $phar->startBuffering(); - - $finder = Finder::create() - ->files() - ->ignoreVCS(true) - ->name('*.php') - ->notName('Compiler.php') - ->notName('Autoloader.php') - ->in(__DIR__ . '/..'); - - foreach ($finder as $file) { - $this->addFile($phar, $file); - } - - $finder = Finder::create() - ->files() - ->ignoreVCS(true) - ->name('*.php') - ->exclude('Tests') - ->exclude('tests') - ->exclude('Test') - ->exclude('test') - ->in(__DIR__ . '/../../build-vendor'); - - foreach ($finder as $file) { - $this->addFile($phar, $file); - } - - // Stubs - $phar->setStub($this->getStub()); - - $phar->stopBuffering(); - - unset($phar); - } - - /** - * Add a file to the psysh Phar. - * - * @param \Phar $phar - * @param \SplFileInfo $file - * @param bool $strip (default: true) - */ - private function addFile($phar, $file, $strip = true) - { - $path = str_replace(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR, '', $file->getRealPath()); - - $content = file_get_contents($file); - if ($strip) { - $content = $this->stripWhitespace($content); - } elseif ('LICENSE' === basename($file)) { - $content = "\n" . $content . "\n"; - } - - $phar->addFromString($path, $content); - } - - /** - * Removes whitespace from a PHP source string while preserving line numbers. - * - * @param string $source A PHP string - * - * @return string The PHP string with the whitespace removed - */ - private function stripWhitespace($source) - { - if (!function_exists('token_get_all')) { - return $source; - } - - $output = ''; - foreach (token_get_all($source) as $token) { - if (is_string($token)) { - $output .= $token; - } elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) { - $output .= str_repeat("\n", substr_count($token[1], "\n")); - } elseif (T_WHITESPACE === $token[0]) { - // reduce wide spaces - $whitespace = preg_replace('{[ \t]+}', ' ', $token[1]); - // normalize newlines to \n - $whitespace = preg_replace('{(?:\r\n|\r|\n)}', "\n", $whitespace); - // trim leading spaces - $whitespace = preg_replace('{\n +}', "\n", $whitespace); - $output .= $whitespace; - } else { - $output .= $token[1]; - } - } - - return $output; - } - - private static function getStubLicense() - { - $license = file_get_contents(__DIR__ . '/../../LICENSE'); - $license = str_replace('The MIT License (MIT)', '', $license); - $license = str_replace("\n", "\n * ", trim($license)); - - return $license; - } - - const STUB_AUTOLOAD = <<<'EOS' - Phar::mapPhar('psysh.phar'); - require 'phar://psysh.phar/build-vendor/autoload.php'; -EOS; - - /** - * Get a Phar stub for psysh. - * - * This is basically the psysh bin, with the autoload require statements swapped out. - * - * @return string - */ - private function getStub() - { - $content = file_get_contents(__DIR__ . '/../../bin/psysh'); - if (version_compare(PHP_VERSION, '5.4', '<')) { - $content = str_replace('#!/usr/bin/env php', '#!/usr/bin/env php -d detect_unicode=Off', $content); - } - $content = preg_replace('{/\* <<<.*?>>> \*/}sm', self::STUB_AUTOLOAD, $content); - $content = preg_replace('/\\(c\\) .*?with this source code./sm', self::getStubLicense(), $content); - - $content .= '__HALT_COMPILER();'; - - return $content; - } -} diff --git a/vendor/psy/psysh/src/Psy/ExecutionLoop/Loop.php b/vendor/psy/psysh/src/Psy/ExecutionLoop/Loop.php deleted file mode 100644 index 79c31095..00000000 --- a/vendor/psy/psysh/src/Psy/ExecutionLoop/Loop.php +++ /dev/null @@ -1,186 +0,0 @@ -getIncludes() as $__psysh_include__) { - include $__psysh_include__; - } - } catch (\Exception $_e) { - $__psysh__->writeException($_e); - } - restore_error_handler(); - unset($__psysh_include__); - - extract($__psysh__->getScopeVariables(false)); - - do { - $__psysh__->beforeLoop(); - $__psysh__->setScopeVariables(get_defined_vars()); - - try { - // read a line, see if we should eval - $__psysh__->getInput(); - - // evaluate the current code buffer - ob_start( - array($__psysh__, 'writeStdout'), - version_compare(PHP_VERSION, '5.4', '>=') ? 1 : 2 - ); - - // Let PsySH inject some magic variables back into the - // shell scope... things like $__class, and $__file set by - // reflection commands - extract($__psysh__->getSpecialScopeVariables(false)); - - // And unset any magic variables which are no longer needed - foreach ($__psysh__->getUnusedCommandScopeVariableNames() as $__psysh_var_name__) { - unset($$__psysh_var_name__, $__psysh_var_name__); - } - - set_error_handler(array($__psysh__, 'handleError')); - $_ = eval($__psysh__->flushCode() ?: Loop::NOOP_INPUT); - restore_error_handler(); - - ob_end_flush(); - - $__psysh__->writeReturnValue($_); - } catch (BreakException $_e) { - restore_error_handler(); - if (ob_get_level() > 0) { - ob_end_clean(); - } - $__psysh__->writeException($_e); - - return; - } catch (ThrowUpException $_e) { - restore_error_handler(); - if (ob_get_level() > 0) { - ob_end_clean(); - } - $__psysh__->writeException($_e); - - throw $_e; - } catch (\TypeError $_e) { - restore_error_handler(); - if (ob_get_level() > 0) { - ob_end_clean(); - } - $__psysh__->writeException(TypeErrorException::fromTypeError($_e)); - } catch (\Error $_e) { - restore_error_handler(); - if (ob_get_level() > 0) { - ob_end_clean(); - } - $__psysh__->writeException(ErrorException::fromError($_e)); - } catch (\Exception $_e) { - restore_error_handler(); - if (ob_get_level() > 0) { - ob_end_clean(); - } - $__psysh__->writeException($_e); - } - - $__psysh__->afterLoop(); - } while (true); - }; - - // bind the closure to $this from the shell scope variables... - if (self::bindLoop()) { - $that = $shell->getBoundObject(); - if (is_object($that)) { - $loop = $loop->bindTo($that, get_class($that)); - } else { - $loop = $loop->bindTo(null, null); - } - } - - $loop($shell); - } - - /** - * A beforeLoop callback. - * - * This is executed at the start of each loop iteration. In the default - * (non-forking) loop implementation, this is a no-op. - */ - public function beforeLoop() - { - // no-op - } - - /** - * A afterLoop callback. - * - * This is executed at the end of each loop iteration. In the default - * (non-forking) loop implementation, this is a no-op. - */ - public function afterLoop() - { - // no-op - } - - /** - * Decide whether to bind the execution loop. - * - * @return bool - */ - protected static function bindLoop() - { - // skip binding on HHVM <= 3.5.0 - // see https://github.com/facebook/hhvm/issues/1203 - if (defined('HHVM_VERSION')) { - return version_compare(HHVM_VERSION, '3.5.0', '>='); - } - - return version_compare(PHP_VERSION, '5.4', '>='); - } -} diff --git a/vendor/psy/psysh/src/Psy/Readline/GNUReadline.php b/vendor/psy/psysh/src/Readline/GNUReadline.php similarity index 99% rename from vendor/psy/psysh/src/Psy/Readline/GNUReadline.php rename to vendor/psy/psysh/src/Readline/GNUReadline.php index 859b4228..e1041220 100644 --- a/vendor/psy/psysh/src/Psy/Readline/GNUReadline.php +++ b/vendor/psy/psysh/src/Readline/GNUReadline.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Readline/HoaConsole.php b/vendor/psy/psysh/src/Readline/HoaConsole.php similarity index 96% rename from vendor/psy/psysh/src/Psy/Readline/HoaConsole.php rename to vendor/psy/psysh/src/Readline/HoaConsole.php index 1ef7ac99..9330d259 100644 --- a/vendor/psy/psysh/src/Psy/Readline/HoaConsole.php +++ b/vendor/psy/psysh/src/Readline/HoaConsole.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -61,7 +61,7 @@ class HoaConsole implements Readline public function listHistory() { $i = 0; - $list = array(); + $list = []; while (($item = $this->hoaReadline->getHistory($i++)) !== null) { $list[] = $item; } diff --git a/vendor/psy/psysh/src/Psy/Readline/Libedit.php b/vendor/psy/psysh/src/Readline/Libedit.php similarity index 92% rename from vendor/psy/psysh/src/Psy/Readline/Libedit.php rename to vendor/psy/psysh/src/Readline/Libedit.php index 43b31a87..008affea 100644 --- a/vendor/psy/psysh/src/Psy/Readline/Libedit.php +++ b/vendor/psy/psysh/src/Readline/Libedit.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -39,7 +39,7 @@ class Libedit extends GNUReadline { $history = file_get_contents($this->historyFile); if (!$history) { - return array(); + return []; } // libedit doesn't seem to support non-unix line separators. @@ -47,11 +47,11 @@ class Libedit extends GNUReadline // shift the history signature, ensure it's valid if (array_shift($history) !== '_HiStOrY_V2_') { - return array(); + return []; } // decode the line - $history = array_map(array($this, 'parseHistoryLine'), $history); + $history = array_map([$this, 'parseHistoryLine'], $history); // filter empty lines & comments return array_values(array_filter($history)); } diff --git a/vendor/psy/psysh/src/Psy/Readline/Readline.php b/vendor/psy/psysh/src/Readline/Readline.php similarity index 97% rename from vendor/psy/psysh/src/Psy/Readline/Readline.php rename to vendor/psy/psysh/src/Readline/Readline.php index 487ac81f..6d0cb6e6 100644 --- a/vendor/psy/psysh/src/Psy/Readline/Readline.php +++ b/vendor/psy/psysh/src/Readline/Readline.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Readline/Transient.php b/vendor/psy/psysh/src/Readline/Transient.php similarity index 95% rename from vendor/psy/psysh/src/Psy/Readline/Transient.php rename to vendor/psy/psysh/src/Readline/Transient.php index 102eaf78..58518947 100644 --- a/vendor/psy/psysh/src/Psy/Readline/Transient.php +++ b/vendor/psy/psysh/src/Readline/Transient.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -21,6 +21,7 @@ class Transient implements Readline private $history; private $historySize; private $eraseDups; + private $stdin; /** * Transient Readline is always supported. @@ -38,7 +39,7 @@ class Transient implements Readline public function __construct($historyFile = null, $historySize = 0, $eraseDups = false) { // don't do anything with the history file... - $this->history = array(); + $this->history = []; $this->historySize = $historySize; $this->eraseDups = $eraseDups; } @@ -73,7 +74,7 @@ class Transient implements Readline */ public function clearHistory() { - $this->history = array(); + $this->history = []; return true; } diff --git a/vendor/psy/psysh/src/Psy/Reflection/ReflectionConstant.php b/vendor/psy/psysh/src/Reflection/ReflectionClassConstant.php similarity index 52% rename from vendor/psy/psysh/src/Psy/Reflection/ReflectionConstant.php rename to vendor/psy/psysh/src/Reflection/ReflectionClassConstant.php index 4aa21613..ab686bbe 100644 --- a/vendor/psy/psysh/src/Psy/Reflection/ReflectionConstant.php +++ b/vendor/psy/psysh/src/Reflection/ReflectionClassConstant.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -12,21 +12,21 @@ namespace Psy\Reflection; /** - * Somehow the standard reflection library doesn't include constants. + * Somehow the standard reflection library didn't include class constants until 7.1. * - * ReflectionConstant corrects that omission. + * ReflectionClassConstant corrects that omission. */ -class ReflectionConstant implements \Reflector +class ReflectionClassConstant implements \Reflector { - private $class; - private $name; + public $class; + public $name; private $value; /** - * Construct a ReflectionConstant object. + * Construct a ReflectionClassConstant object. * - * @param mixed $class - * @param string $name + * @param string|object $class + * @param string $name */ public function __construct($class, $name) { @@ -45,10 +45,33 @@ class ReflectionConstant implements \Reflector $this->value = $constants[$name]; } + /** + * Exports a reflection. + * + * @param string|object $class + * @param string $name + * @param bool $return pass true to return the export, as opposed to emitting it + * + * @return null|string + */ + public static function export($class, $name, $return = false) + { + $refl = new self($class, $name); + $value = $refl->getValue(); + + $str = sprintf('Constant [ public %s %s ] { %s }', gettype($value), $refl->getName(), $value); + + if ($return) { + return $str; + } + + echo $str . "\n"; + } + /** * Gets the declaring class. * - * @return string + * @return \ReflectionClass */ public function getDeclaringClass() { @@ -67,6 +90,30 @@ class ReflectionConstant implements \Reflector return $class; } + /** + * Get the constant's docblock. + * + * @return false + */ + public function getDocComment() + { + return false; + } + + /** + * Gets the class constant modifiers. + * + * Since this is only used for PHP < 7.1, we can just return "public". All + * the fancier modifiers are only available on PHP versions which have their + * own ReflectionClassConstant class :) + * + * @return int + */ + public function getModifiers() + { + return \ReflectionMethod::IS_PUBLIC; + } + /** * Gets the constant name. * @@ -87,6 +134,46 @@ class ReflectionConstant implements \Reflector return $this->value; } + /** + * Checks if class constant is private. + * + * @return bool false + */ + public function isPrivate() + { + return false; + } + + /** + * Checks if class constant is protected. + * + * @return bool false + */ + public function isProtected() + { + return false; + } + + /** + * Checks if class constant is public. + * + * @return bool true + */ + public function isPublic() + { + return true; + } + + /** + * To string. + * + * @return string + */ + public function __toString() + { + return $this->getName(); + } + /** * Gets the constant's file name. * @@ -120,32 +207,22 @@ class ReflectionConstant implements \Reflector } /** - * Get the constant's docblock. + * Get a ReflectionClassConstant instance. * - * @return false + * In PHP >= 7.1, this will return a \ReflectionClassConstant from the + * standard reflection library. For older PHP, it will return this polyfill. + * + * @param string|object $class + * @param string $name + * + * @return ReflectionClassConstant|\ReflectionClassConstant */ - public function getDocComment() + public static function create($class, $name) { - return false; - } + if (class_exists('\\ReflectionClassConstant')) { + return new \ReflectionClassConstant($class, $name); + } - /** - * Export the constant? I don't think this is possible. - * - * @throws \RuntimeException - */ - public static function export() - { - throw new \RuntimeException('Not yet implemented because it\'s unclear what I should do here :)'); - } - - /** - * To string. - * - * @return string - */ - public function __toString() - { - return $this->getName(); + return new self($class, $name); } } diff --git a/vendor/psy/psysh/src/Reflection/ReflectionConstant.php b/vendor/psy/psysh/src/Reflection/ReflectionConstant.php new file mode 100644 index 00000000..7fa9b8a6 --- /dev/null +++ b/vendor/psy/psysh/src/Reflection/ReflectionConstant.php @@ -0,0 +1,30 @@ +name = $name; + + if (!defined($name) && !self::isMagicConstant($name)) { + throw new \InvalidArgumentException('Unknown constant: ' . $name); + } + + if (!self::isMagicConstant($name)) { + $this->value = @constant($name); + } + } + + /** + * Exports a reflection. + * + * @param string $name + * @param bool $return pass true to return the export, as opposed to emitting it + * + * @return null|string + */ + public static function export($name, $return = false) + { + $refl = new self($name); + $value = $refl->getValue(); + + $str = sprintf('Constant [ %s %s ] { %s }', gettype($value), $refl->getName(), $value); + + if ($return) { + return $str; + } + + echo $str . "\n"; + } + + public static function isMagicConstant($name) + { + return in_array($name, self::$magicConstants); + } + + /** + * Get the constant's docblock. + * + * @return false + */ + public function getDocComment() + { + return false; + } + + /** + * Gets the constant name. + * + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * Gets the namespace name. + * + * Returns '' when the constant is not namespaced. + * + * @return string + */ + public function getNamespaceName() + { + if (!$this->inNamespace()) { + return ''; + } + + return preg_replace('/\\\\[^\\\\]+$/', '', $this->name); + } + + /** + * Gets the value of the constant. + * + * @return mixed + */ + public function getValue() + { + return $this->value; + } + + /** + * Checks if this constant is defined in a namespace. + * + * @return bool + */ + public function inNamespace() + { + return strpos($this->name, '\\') !== false; + } + + /** + * To string. + * + * @return string + */ + public function __toString() + { + return $this->getName(); + } + + /** + * Gets the constant's file name. + * + * Currently returns null, because if it returns a file name the signature + * formatter will barf. + */ + public function getFileName() + { + return; + // return $this->class->getFileName(); + } + + /** + * Get the code start line. + * + * @throws \RuntimeException + */ + public function getStartLine() + { + throw new \RuntimeException('Not yet implemented because it\'s unclear what I should do here :)'); + } + + /** + * Get the code end line. + * + * @throws \RuntimeException + */ + public function getEndLine() + { + return $this->getStartLine(); + } +} diff --git a/vendor/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstruct.php b/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php similarity index 70% rename from vendor/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstruct.php rename to vendor/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php index defa684b..bda08194 100644 --- a/vendor/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstruct.php +++ b/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -21,62 +21,62 @@ class ReflectionLanguageConstruct extends \ReflectionFunctionAbstract /** * Language construct parameter definitions. */ - private static $languageConstructs = array( - 'isset' => array( - 'var' => array(), - '...' => array( + private static $languageConstructs = [ + 'isset' => [ + 'var' => [], + '...' => [ 'isOptional' => true, 'defaultValue' => null, - ), - ), + ], + ], - 'unset' => array( - 'var' => array(), - '...' => array( + 'unset' => [ + 'var' => [], + '...' => [ 'isOptional' => true, 'defaultValue' => null, - ), - ), + ], + ], - 'empty' => array( - 'var' => array(), - ), + 'empty' => [ + 'var' => [], + ], - 'echo' => array( - 'arg1' => array(), - '...' => array( + 'echo' => [ + 'arg1' => [], + '...' => [ 'isOptional' => true, 'defaultValue' => null, - ), - ), + ], + ], - 'print' => array( - 'arg' => array(), - ), + 'print' => [ + 'arg' => [], + ], - 'die' => array( - 'status' => array( + 'die' => [ + 'status' => [ 'isOptional' => true, 'defaultValue' => 0, - ), - ), + ], + ], - 'exit' => array( - 'status' => array( + 'exit' => [ + 'status' => [ 'isOptional' => true, 'defaultValue' => 0, - ), - ), - ); + ], + ], + ]; /** * Construct a ReflectionLanguageConstruct object. * - * @param string $name + * @param string $keyword */ public function __construct($keyword) { - if (self::isLanguageConstruct($keyword)) { + if (!self::isLanguageConstruct($keyword)) { throw new \InvalidArgumentException('Unknown language construct: ' . $keyword); } @@ -116,11 +116,11 @@ class ReflectionLanguageConstruct extends \ReflectionFunctionAbstract /** * Get language construct params. * - * @return + * @return array */ public function getParameters() { - $params = array(); + $params = []; foreach (self::$languageConstructs[$this->keyword] as $parameter => $opts) { array_push($params, new ReflectionLanguageConstructParameter($this->keyword, $parameter, $opts)); } @@ -128,6 +128,18 @@ class ReflectionLanguageConstruct extends \ReflectionFunctionAbstract return $params; } + /** + * Gets the file name from a language construct. + * + * (Hint: it always returns false) + * + * @return bool false + */ + public function getFileName() + { + return false; + } + /** * To string. * @@ -141,7 +153,7 @@ class ReflectionLanguageConstruct extends \ReflectionFunctionAbstract /** * Check whether keyword is a (known) language construct. * - * @param $keyword + * @param string $keyword * * @return bool */ diff --git a/vendor/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstructParameter.php b/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php similarity index 98% rename from vendor/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstructParameter.php rename to vendor/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php index 7d1b0dbd..af1f4cb4 100644 --- a/vendor/psy/psysh/src/Psy/Reflection/ReflectionLanguageConstructParameter.php +++ b/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Shell.php b/vendor/psy/psysh/src/Shell.php similarity index 68% rename from vendor/psy/psysh/src/Psy/Shell.php rename to vendor/psy/psysh/src/Shell.php index e002bee1..3fe0b761 100644 --- a/vendor/psy/psysh/src/Psy/Shell.php +++ b/vendor/psy/psysh/src/Shell.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -16,6 +16,9 @@ use Psy\Exception\BreakException; use Psy\Exception\ErrorException; use Psy\Exception\Exception as PsyException; use Psy\Exception\ThrowUpException; +use Psy\Exception\TypeErrorException; +use Psy\ExecutionLoop\ProcessForker; +use Psy\ExecutionLoop\RunkitReloader; use Psy\Input\ShellInput; use Psy\Input\SilentInput; use Psy\Output\ShellOutput; @@ -44,7 +47,7 @@ use Symfony\Component\Console\Output\OutputInterface; */ class Shell extends Application { - const VERSION = 'v0.8.17'; + const VERSION = 'v0.9.6'; const PROMPT = '>>> '; const BUFF_PROMPT = '... '; @@ -59,14 +62,17 @@ class Shell extends Application private $code; private $codeBuffer; private $codeBufferOpen; + private $codeStack; + private $stdoutBuffer; private $context; private $includes; private $loop; private $outputWantsNewline = false; - private $completion; - private $tabCompletionMatchers = array(); - private $stdoutBuffer; private $prompt; + private $loopListeners; + private $autoCompleter; + private $matchers = []; + private $commandsMatcher; /** * Create a new Psy Shell. @@ -75,14 +81,16 @@ class Shell extends Application */ public function __construct(Configuration $config = null) { - $this->config = $config ?: new Configuration(); - $this->cleaner = $this->config->getCodeCleaner(); - $this->loop = $this->config->getLoop(); - $this->context = new Context(); - $this->includes = array(); - $this->readline = $this->config->getReadline(); - $this->inputBuffer = array(); - $this->stdoutBuffer = ''; + $this->config = $config ?: new Configuration(); + $this->cleaner = $this->config->getCodeCleaner(); + $this->loop = new ExecutionLoop(); + $this->context = new Context(); + $this->includes = []; + $this->readline = $this->config->getReadline(); + $this->inputBuffer = []; + $this->codeStack = []; + $this->stdoutBuffer = ''; + $this->loopListeners = $this->getDefaultLoopListeners(); parent::__construct('Psy Shell', self::VERSION); @@ -101,7 +109,7 @@ class Shell extends Application public static function isIncluded(array $trace) { return isset($trace[0]['function']) && - in_array($trace[0]['function'], array('require', 'include', 'require_once', 'include_once')); + in_array($trace[0]['function'], ['require', 'include', 'require_once', 'include_once']); } /** @@ -110,14 +118,14 @@ class Shell extends Application * @see Psy\debug * @deprecated will be removed in 1.0. Use \Psy\debug instead * - * @param array $vars Scope variables from the calling context (default: array()) - * @param object $boundObject Bound object ($this) value for the shell + * @param array $vars Scope variables from the calling context (default: array()) + * @param object|string $bindTo Bound object ($this) or class (self) value for the shell * * @return array Scope variables from the debugger session */ - public static function debug(array $vars = array(), $boundObject = null) + public static function debug(array $vars = [], $bindTo = null) { - return \Psy\debug($vars, $boundObject); + return \Psy\debug($vars, $bindTo); } /** @@ -139,6 +147,10 @@ class Shell extends Application if ($ret instanceof PresenterAware) { $ret->setPresenter($this->config->getPresenter()); } + + if (isset($this->commandsMatcher)) { + $this->commandsMatcher->setCommands($this->all()); + } } return $ret; @@ -151,10 +163,10 @@ class Shell extends Application */ protected function getDefaultInputDefinition() { - return new InputDefinition(array( + return new InputDefinition([ new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'), new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message.'), - )); + ]); } /** @@ -170,7 +182,7 @@ class Shell extends Application $hist = new Command\HistoryCommand(); $hist->setReadline($this->readline); - return array( + return [ new Command\HelpCommand(), new Command\ListCommand(), new Command\DumpCommand(), @@ -179,6 +191,7 @@ class Shell extends Application new Command\WtfCommand($this->config->colorMode()), new Command\WhereamiCommand($this->config->colorMode()), new Command\ThrowUpCommand(), + new Command\TimeitCommand(), new Command\TraceCommand(), new Command\BufferCommand(), new Command\ClearCommand(), @@ -187,41 +200,85 @@ class Shell extends Application $sudo, $hist, new Command\ExitCommand(), - ); + ]; } /** * @return array */ - protected function getTabCompletionMatchers() + protected function getDefaultMatchers() { - if (empty($this->tabCompletionMatchers)) { - $this->tabCompletionMatchers = array( - new Matcher\CommandsMatcher($this->all()), - new Matcher\KeywordsMatcher(), - new Matcher\VariablesMatcher(), - new Matcher\ConstantsMatcher(), - new Matcher\FunctionsMatcher(), - new Matcher\ClassNamesMatcher(), - new Matcher\ClassMethodsMatcher(), - new Matcher\ClassAttributesMatcher(), - new Matcher\ObjectMethodsMatcher(), - new Matcher\ObjectAttributesMatcher(), - new Matcher\ClassMethodDefaultParametersMatcher(), - new Matcher\ObjectMethodDefaultParametersMatcher(), - new Matcher\FunctionDefaultParametersMatcher(), - ); - } + // Store the Commands Matcher for later. If more commands are added, + // we'll update the Commands Matcher too. + $this->commandsMatcher = new Matcher\CommandsMatcher($this->all()); - return $this->tabCompletionMatchers; + return [ + $this->commandsMatcher, + new Matcher\KeywordsMatcher(), + new Matcher\VariablesMatcher(), + new Matcher\ConstantsMatcher(), + new Matcher\FunctionsMatcher(), + new Matcher\ClassNamesMatcher(), + new Matcher\ClassMethodsMatcher(), + new Matcher\ClassAttributesMatcher(), + new Matcher\ObjectMethodsMatcher(), + new Matcher\ObjectAttributesMatcher(), + new Matcher\ClassMethodDefaultParametersMatcher(), + new Matcher\ObjectMethodDefaultParametersMatcher(), + new Matcher\FunctionDefaultParametersMatcher(), + ]; } /** + * @deprecated Nothing should use this anymore + */ + protected function getTabCompletionMatchers() + { + @trigger_error('getTabCompletionMatchers is no longer used', E_USER_DEPRECATED); + } + + /** + * Gets the default command loop listeners. + * + * @return array An array of Execution Loop Listener instances + */ + protected function getDefaultLoopListeners() + { + $listeners = []; + + if (ProcessForker::isSupported() && $this->config->usePcntl()) { + $listeners[] = new ProcessForker(); + } + + if (RunkitReloader::isSupported()) { + $listeners[] = new RunkitReloader(); + } + + return $listeners; + } + + /** + * Add tab completion matchers. + * + * @param array $matchers + */ + public function addMatchers(array $matchers) + { + $this->matchers = array_merge($this->matchers, $matchers); + + if (isset($this->autoCompleter)) { + $this->addMatchersToAutoCompleter($matchers); + } + } + + /** + * @deprecated Call `addMatchers` instead + * * @param array $matchers */ public function addTabCompletionMatchers(array $matchers) { - $this->tabCompletionMatchers = array_merge($matchers, $this->getTabCompletionMatchers()); + $this->addMatchers($matchers); } /** @@ -247,7 +304,7 @@ class Shell extends Application $this->initializeTabCompletion(); if ($input === null && !isset($_SERVER['argv'])) { - $input = new ArgvInput(array()); + $input = new ArgvInput([]); } if ($output === null) { @@ -259,6 +316,8 @@ class Shell extends Application } catch (\Exception $e) { $this->writeException($e); } + + return 1; } /** @@ -282,18 +341,19 @@ class Shell extends Application $this->readline->readHistory(); - // if ($this->config->useReadline()) { - // readline_completion_function(array($this, 'autocomplete')); - // } - $this->output->writeln($this->getHeader()); $this->writeVersionInfo(); $this->writeStartupMessage(); try { + $this->beforeRun(); $this->loop->run($this); + $this->afterRun(); } catch (ThrowUpException $e) { throw $e->getPrevious(); + } catch (BreakException $e) { + // The ProcessForker throws a BreakException to finish the main thread. + return; } } @@ -332,12 +392,15 @@ class Shell extends Application } // handle empty input - if (trim($input) === '') { + if (trim($input) === '' && !$this->codeBufferOpen) { continue; } - if ($this->hasCommand($input)) { - $this->readline->addHistory($input); + $input = $this->onInput($input); + + // If the input isn't in an open string or comment, check for commands to run. + if ($this->hasCommand($input) && !$this->inputInOpenStringOrComment($input)) { + $this->addHistory($input); $this->runCommand($input); continue; @@ -348,23 +411,101 @@ class Shell extends Application } /** - * Pass the beforeLoop callback through to the Loop instance. + * Check whether the code buffer (plus current input) is in an open string or comment. * - * @see Loop::beforeLoop + * @param string $input current line of input + * + * @return bool true if the input is in an open string or comment */ - public function beforeLoop() + private function inputInOpenStringOrComment($input) { - $this->loop->beforeLoop(); + if (!$this->hasCode()) { + return; + } + + $code = $this->codeBuffer; + array_push($code, $input); + $tokens = @token_get_all('loopListeners as $listener) { + $listener->beforeRun($this); + } + } + + /** + * Run execution loop listeners at the start of each loop. + */ + public function beforeLoop() + { + foreach ($this->loopListeners as $listener) { + $listener->beforeLoop($this); + } + } + + /** + * Run execution loop listeners on user input. * - * @see Loop::afterLoop + * @param string $input + * + * @return string + */ + public function onInput($input) + { + foreach ($this->loopListeners as $listeners) { + if (($return = $listeners->onInput($this, $input)) !== null) { + $input = $return; + } + } + + return $input; + } + + /** + * Run execution loop listeners on code to be executed. + * + * @param string $code + * + * @return string + */ + public function onExecute($code) + { + foreach ($this->loopListeners as $listener) { + if (($return = $listener->onExecute($this, $code)) !== null) { + $code = $return; + } + } + + return $code; + } + + /** + * Run execution loop listeners after each loop. */ public function afterLoop() { - $this->loop->afterLoop(); + foreach ($this->loopListeners as $listener) { + $listener->afterLoop($this); + } + } + + /** + * Run execution loop listers after the shell session. + */ + protected function afterRun() + { + foreach ($this->loopListeners as $listener) { + $listener->afterRun($this); + } } /** @@ -469,12 +610,32 @@ class Shell extends Application return $this->context->getBoundObject(); } + /** + * Set the bound class (self) for the interactive shell. + * + * @param string|null $boundClass + */ + public function setBoundClass($boundClass) + { + $this->context->setBoundClass($boundClass); + } + + /** + * Get the bound class (self) for the interactive shell. + * + * @return string|null + */ + public function getBoundClass() + { + return $this->context->getBoundClass(); + } + /** * Add includes, to be parsed and executed before running the interactive shell. * * @param array $includes */ - public function setIncludes(array $includes = array()) + public function setIncludes(array $includes = []) { $this->includes = $includes; } @@ -515,8 +676,9 @@ class Shell extends Application * Add code to the code buffer. * * @param string $code + * @param bool $silent */ - public function addCode($code) + public function addCode($code, $silent = false) { try { // Code lines ending in \ keep the buffer open @@ -527,7 +689,7 @@ class Shell extends Application $this->codeBufferOpen = false; } - $this->codeBuffer[] = $code; + $this->codeBuffer[] = $silent ? new SilentInput($code) : $code; $this->code = $this->cleaner->clean($this->codeBuffer, $this->config->requireSemicolons()); } catch (\Exception $e) { // Add failed code blocks to the readline history. @@ -537,6 +699,44 @@ class Shell extends Application } } + /** + * Set the code buffer. + * + * This is mostly used by `Shell::execute`. Any existing code in the input + * buffer is pushed onto a stack and will come back after this new code is + * executed. + * + * @throws \InvalidArgumentException if $code isn't a complete statement + * + * @param string $code + * @param bool $silent + */ + private function setCode($code, $silent = false) + { + if ($this->hasCode()) { + $this->codeStack[] = [$this->codeBuffer, $this->codeBufferOpen, $this->code]; + } + + $this->resetCodeBuffer(); + try { + $this->addCode($code, $silent); + } catch (\Throwable $e) { + $this->popCodeStack(); + + throw $e; + } catch (\Exception $e) { + $this->popCodeStack(); + + throw $e; + } + + if (!$this->hasValidCode()) { + $this->popCodeStack(); + + throw new \InvalidArgumentException('Unexpected end of input'); + } + } + /** * Get the current code buffer. * @@ -568,7 +768,7 @@ class Shell extends Application $input = new ShellInput(str_replace('\\', '\\\\', rtrim($input, " \t\n\r\0\x0B;"))); - if ($input->hasParameterOption(array('--help', '-h'))) { + if ($input->hasParameterOption(['--help', '-h'])) { $helpCommand = $this->get('help'); $helpCommand->setCommand($command); @@ -586,7 +786,7 @@ class Shell extends Application */ public function resetCodeBuffer() { - $this->codeBuffer = array(); + $this->codeBuffer = []; $this->code = false; } @@ -618,12 +818,54 @@ class Shell extends Application if ($this->hasValidCode()) { $this->addCodeBufferToHistory(); $code = $this->code; - $this->resetCodeBuffer(); + $this->popCodeStack(); return $code; } } + /** + * Reset the code buffer and restore any code pushed during `execute` calls. + */ + private function popCodeStack() + { + $this->resetCodeBuffer(); + + if (empty($this->codeStack)) { + return; + } + + list($codeBuffer, $codeBufferOpen, $code) = array_pop($this->codeStack); + + $this->codeBuffer = $codeBuffer; + $this->codeBufferOpen = $codeBufferOpen; + $this->code = $code; + } + + /** + * (Possibly) add a line to the readline history. + * + * Like Bash, if the line starts with a space character, it will be omitted + * from history. Note that an entire block multi-line code input will be + * omitted iff the first line begins with a space. + * + * Additionally, if a line is "silent", i.e. it was initially added with the + * silent flag, it will also be omitted. + * + * @param string|SilentInput $line + */ + private function addHistory($line) + { + if ($line instanceof SilentInput) { + return; + } + + // Skip empty lines and lines starting with a space + if (trim($line) !== '' && substr($line, 0, 1) !== ' ') { + $this->readline->addHistory($line); + } + } + /** * Filter silent input from code buffer, write the rest to readline history. */ @@ -633,11 +875,7 @@ class Shell extends Application return !$line instanceof SilentInput; }); - $code = implode("\n", $codeBuffer); - - if (trim($code) !== '') { - $this->readline->addHistory($code); - } + $this->addHistory(implode("\n", $codeBuffer)); } /** @@ -664,10 +902,7 @@ class Shell extends Application */ public function writeStdout($out, $phase = PHP_OUTPUT_HANDLER_END) { - $isCleaning = false; - if (version_compare(PHP_VERSION, '5.4', '>=')) { - $isCleaning = $phase & PHP_OUTPUT_HANDLER_CLEAN; - } + $isCleaning = $phase & PHP_OUTPUT_HANDLER_CLEAN; // Incremental flush if ($out !== '' && !$isCleaning) { @@ -723,8 +958,7 @@ class Shell extends Application * * Stores $e as the last Exception in the Shell Context. * - * @param \Exception $e An exception instance - * @param OutputInterface $output An OutputInterface instance + * @param \Exception $e An exception instance */ public function writeException(\Exception $e) { @@ -753,6 +987,14 @@ class Shell extends Application } } + $message = preg_replace( + "#(\\w:)?(/\\w+)*/src/Execution(?:Loop)?Closure.php\(\d+\) : eval\(\)'d code#", + "eval()'d code", + str_replace('\\', '/', $message) + ); + + $message = str_replace(" in eval()'d code", ' in Psy Shell code', $message); + $severity = ($e instanceof \ErrorException) ? $this->getSeverity($e) : 'error'; return sprintf('<%s>%s', $severity, OutputFormatter::escape($message), $severity); @@ -788,6 +1030,34 @@ class Shell extends Application } } + /** + * Execute code in the shell execution context. + * + * @param string $code + * @param bool $throwExceptions + * + * @return mixed + */ + public function execute($code, $throwExceptions = false) + { + $this->setCode($code, true); + $closure = new ExecutionClosure($this); + + if ($throwExceptions) { + return $closure->execute(); + } + + try { + return $closure->execute(); + } catch (\TypeError $_e) { + $this->writeException(TypeErrorException::fromTypeError($_e)); + } catch (\Error $_e) { + $this->writeException(ErrorException::fromError($_e)); + } catch (\Exception $_e) { + $this->writeException($_e); + } + } + /** * Helper for throwing an ErrorException. * @@ -862,9 +1132,8 @@ class Shell extends Application */ protected function hasCommand($input) { - $input = new StringInput($input); - if ($name = $input->getFirstArgument()) { - return $this->has($name); + if (preg_match('/([^\s]+?)(?:\s|$)/A', ltrim($input), $match)) { + return $this->has($match[1]); } return false; @@ -952,28 +1221,11 @@ class Shell extends Application } /** - * Autocomplete variable names. - * - * This is used by `readline` for tab completion. - * - * @param string $text - * - * @return mixed Array possible completions for the given input, if any + * @deprecated Tab completion is provided by the AutoCompleter service */ protected function autocomplete($text) { - $info = readline_info(); - // $line = substr($info['line_buffer'], 0, $info['end']); - - // Check whether there's a command for this - // $words = explode(' ', $line); - // $firstWord = reset($words); - - // check whether this is a variable... - $firstChar = substr($info['line_buffer'], max(0, $info['end'] - strlen($text) - 1), 1); - if ($firstChar === '$') { - return $this->getScopeVariableNames(); - } + @trigger_error('Tab completion is provided by the AutoCompleter service', E_USER_DEPRECATED); } /** @@ -984,17 +1236,32 @@ class Shell extends Application */ protected function initializeTabCompletion() { - // auto completer needs shell to be linked to configuration because of the context aware matchers - if ($this->config->getTabCompletion()) { - $this->completion = $this->config->getAutoCompleter(); - $this->addTabCompletionMatchers($this->config->getTabCompletionMatchers()); - foreach ($this->getTabCompletionMatchers() as $matcher) { - if ($matcher instanceof ContextAware) { - $matcher->setContext($this->context); - } - $this->completion->addMatcher($matcher); + if (!$this->config->useTabCompletion()) { + return; + } + + $this->autoCompleter = $this->config->getAutoCompleter(); + + // auto completer needs shell to be linked to configuration because of + // the context aware matchers + $this->addMatchersToAutoCompleter($this->getDefaultMatchers()); + $this->addMatchersToAutoCompleter($this->matchers); + + $this->autoCompleter->activate(); + } + + /** + * Add matchers to the auto completer, setting context if needed. + * + * @param array $matchers + */ + private function addMatchersToAutoCompleter(array $matchers) + { + foreach ($matchers as $matcher) { + if ($matcher instanceof ContextAware) { + $matcher->setContext($this->context); } - $this->completion->activate(); + $this->autoCompleter->addMatcher($matcher); } } diff --git a/vendor/psy/psysh/src/Psy/Sudo.php b/vendor/psy/psysh/src/Sudo.php similarity index 99% rename from vendor/psy/psysh/src/Psy/Sudo.php rename to vendor/psy/psysh/src/Sudo.php index 2ba55728..3c085239 100644 --- a/vendor/psy/psysh/src/Psy/Sudo.php +++ b/vendor/psy/psysh/src/Sudo.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/Sudo/SudoVisitor.php b/vendor/psy/psysh/src/Sudo/SudoVisitor.php similarity index 64% rename from vendor/psy/psysh/src/Psy/Sudo/SudoVisitor.php rename to vendor/psy/psysh/src/Sudo/SudoVisitor.php index 77ed7e02..31fe6bfb 100644 --- a/vendor/psy/psysh/src/Psy/Sudo/SudoVisitor.php +++ b/vendor/psy/psysh/src/Sudo/SudoVisitor.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -19,6 +19,8 @@ use PhpParser\Node\Expr\MethodCall; use PhpParser\Node\Expr\PropertyFetch; use PhpParser\Node\Expr\StaticCall; use PhpParser\Node\Expr\StaticPropertyFetch; +use PhpParser\Node\Identifier; +use PhpParser\Node\Name; use PhpParser\Node\Name\FullyQualified as FullyQualifiedName; use PhpParser\Node\Scalar\String_; use PhpParser\NodeVisitorAbstract; @@ -47,60 +49,67 @@ class SudoVisitor extends NodeVisitorAbstract public function enterNode(Node $node) { if ($node instanceof PropertyFetch) { - $args = array( + $name = $node->name instanceof Identifier ? $node->name->toString() : $node->name; + $args = [ $node->var, - is_string($node->name) ? new String_($node->name) : $node->name, - ); + is_string($name) ? new String_($name) : $name, + ]; return $this->prepareCall(self::PROPERTY_FETCH, $args); } elseif ($node instanceof Assign && $node->var instanceof PropertyFetch) { $target = $node->var; - $args = array( + $name = $target->name instanceof Identifier ? $target->name->toString() : $target->name; + $args = [ $target->var, - is_string($target->name) ? new String_($target->name) : $target->name, + is_string($name) ? new String_($name) : $name, $node->expr, - ); + ]; return $this->prepareCall(self::PROPERTY_ASSIGN, $args); } elseif ($node instanceof MethodCall) { + $name = $node->name instanceof Identifier ? $node->name->toString() : $node->name; $args = $node->args; - array_unshift($args, new Arg(is_string($node->name) ? new String_($node->name) : $node->name)); + array_unshift($args, new Arg(is_string($name) ? new String_($name) : $name)); array_unshift($args, new Arg($node->var)); // not using prepareCall because the $node->args we started with are already Arg instances return new StaticCall(new FullyQualifiedName(self::SUDO_CLASS), self::METHOD_CALL, $args); } elseif ($node instanceof StaticPropertyFetch) { - $class = $node->class instanceof Name ? (string) $node->class : $node->class; - $args = array( + $class = $node->class instanceof Name ? $node->class->toString() : $node->class; + $name = $node->name instanceof Identifier ? $node->name->toString() : $node->name; + $args = [ is_string($class) ? new String_($class) : $class, - is_string($node->name) ? new String_($node->name) : $node->name, - ); + is_string($name) ? new String_($name) : $name, + ]; return $this->prepareCall(self::STATIC_PROPERTY_FETCH, $args); } elseif ($node instanceof Assign && $node->var instanceof StaticPropertyFetch) { $target = $node->var; - $class = $target->class instanceof Name ? (string) $target->class : $target->class; - $args = array( + $class = $target->class instanceof Name ? $target->class->toString() : $target->class; + $name = $target->name instanceof Identifier ? $target->name->toString() : $target->name; + $args = [ is_string($class) ? new String_($class) : $class, - is_string($target->name) ? new String_($target->name) : $target->name, + is_string($name) ? new String_($name) : $name, $node->expr, - ); + ]; return $this->prepareCall(self::STATIC_PROPERTY_ASSIGN, $args); } elseif ($node instanceof StaticCall) { $args = $node->args; - $class = $node->class instanceof Name ? (string) $node->class : $node->class; - array_unshift($args, new Arg(is_string($node->name) ? new String_($node->name) : $node->name)); + $class = $node->class instanceof Name ? $node->class->toString() : $node->class; + $name = $node->name instanceof Identifier ? $node->name->toString() : $node->name; + array_unshift($args, new Arg(is_string($name) ? new String_($name) : $name)); array_unshift($args, new Arg(is_string($class) ? new String_($class) : $class)); // not using prepareCall because the $node->args we started with are already Arg instances return new StaticCall(new FullyQualifiedName(self::SUDO_CLASS), self::STATIC_CALL, $args); } elseif ($node instanceof ClassConstFetch) { - $class = $node->class instanceof Name ? (string) $node->class : $node->class; - $args = array( + $class = $node->class instanceof Name ? $node->class->toString() : $node->class; + $name = $node->name instanceof Identifier ? $node->name->toString() : $node->name; + $args = [ is_string($class) ? new String_($class) : $class, - is_string($node->name) ? new String_($node->name) : $node->name, - ); + is_string($name) ? new String_($name) : $name, + ]; return $this->prepareCall(self::CLASS_CONST_FETCH, $args); } diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/AutoCompleter.php b/vendor/psy/psysh/src/TabCompletion/AutoCompleter.php similarity index 87% rename from vendor/psy/psysh/src/Psy/TabCompletion/AutoCompleter.php rename to vendor/psy/psysh/src/TabCompletion/AutoCompleter.php index 86cd1663..8b316445 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/AutoCompleter.php +++ b/vendor/psy/psysh/src/TabCompletion/AutoCompleter.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -38,7 +38,7 @@ class AutoCompleter */ public function activate() { - readline_completion_function(array(&$this, 'callback')); + readline_completion_function([&$this, 'callback']); } /** @@ -50,7 +50,7 @@ class AutoCompleter * * @return array */ - public function processCallback($input, $index, $info = array()) + public function processCallback($input, $index, $info = []) { // Some (Windows?) systems provide incomplete `readline_info`, so let's // try to work around it. @@ -69,7 +69,7 @@ class AutoCompleter return !AbstractMatcher::tokenIs($token, AbstractMatcher::T_WHITESPACE); }); - $matches = array(); + $matches = []; foreach ($this->matchers as $matcher) { if ($matcher->hasMatched($tokens)) { $matches = array_merge($matcher->getMatches($tokens), $matches); @@ -78,7 +78,7 @@ class AutoCompleter $matches = array_unique($matches); - return !empty($matches) ? $matches : array(''); + return !empty($matches) ? $matches : ['']; } /** @@ -86,8 +86,8 @@ class AutoCompleter * * @see processCallback * - * @param $input - * @param $index + * @param string $input + * @param int $index * * @return array */ @@ -103,8 +103,6 @@ class AutoCompleter { // PHP didn't implement the whole readline API when they first switched // to libedit. And they still haven't. - // - // So this is a thing to make PsySH work on 5.3.x: if (function_exists('readline_callback_handler_remove')) { readline_callback_handler_remove(); } diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractContextAwareMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractContextAwareMatcher.php similarity index 94% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractContextAwareMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/AbstractContextAwareMatcher.php index ad4d74ff..91816b20 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractContextAwareMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractContextAwareMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -44,7 +44,7 @@ abstract class AbstractContextAwareMatcher extends AbstractMatcher implements Co /** * Get a Context variable by name. * - * @param $var Variable name + * @param string $var Variable name * * @return mixed */ diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php similarity index 87% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php index 3d7b4214..1dc0765a 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -20,11 +20,11 @@ abstract class AbstractDefaultParametersMatcher extends AbstractContextAwareMatc */ public function getDefaultParameterCompletion(array $reflectionParameters) { - $parametersProcessed = array(); + $parametersProcessed = []; foreach ($reflectionParameters as $parameter) { if (!$parameter->isDefaultValueAvailable()) { - return array(); + return []; } $defaultValue = $this->valueToShortString($parameter->getDefaultValue()); @@ -33,10 +33,10 @@ abstract class AbstractDefaultParametersMatcher extends AbstractContextAwareMatc } if (empty($parametersProcessed)) { - return array(); + return []; } - return array(implode(', ', $parametersProcessed) . ')'); + return [implode(', ', $parametersProcessed) . ')']; } /** @@ -54,8 +54,8 @@ abstract class AbstractDefaultParametersMatcher extends AbstractContextAwareMatc return json_encode($value); } - $chunks = array(); - $chunksSequential = array(); + $chunks = []; + $chunksSequential = []; $allSequential = true; diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractMatcher.php similarity index 93% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/AbstractMatcher.php index 016c3219..efa9e57e 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -83,9 +83,13 @@ abstract class AbstractMatcher { $class = ''; while (self::hasToken( - array(self::T_NS_SEPARATOR, self::T_STRING), + [self::T_NS_SEPARATOR, self::T_STRING], $token = array_pop($tokens) )) { + if (self::needCompleteClass($token)) { + continue; + } + $class = $token[1] . $class; } @@ -100,7 +104,7 @@ abstract class AbstractMatcher * * @return array The matches resulting from the query */ - abstract public function getMatches(array $tokens, array $info = array()); + abstract public function getMatches(array $tokens, array $info = []); /** * Check whether $word starts with $prefix. @@ -167,6 +171,11 @@ abstract class AbstractMatcher return strpos(self::MISC_OPERATORS, $token) !== false; } + public static function needCompleteClass($token) + { + return in_array($token[1], ['doc', 'ls', 'show']); + } + /** * Check whether $token type is present in $coll. * diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassAttributesMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php similarity index 88% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassAttributesMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php index 2635b10d..b26df778 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassAttributesMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -24,7 +24,7 @@ class ClassAttributesMatcher extends AbstractMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $input = $this->getInput($tokens); @@ -39,7 +39,7 @@ class ClassAttributesMatcher extends AbstractMatcher try { $reflection = new \ReflectionClass($class); } catch (\ReflectionException $re) { - return array(); + return []; } $vars = array_merge( @@ -54,7 +54,10 @@ class ClassAttributesMatcher extends AbstractMatcher return array_map( function ($name) use ($class) { - return $class . '::' . $name; + $chunks = explode('\\', $class); + $className = array_pop($chunks); + + return $className . '::' . $name; }, array_filter( $vars, diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php similarity index 90% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php index 9b97e8b2..4e6025bb 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,7 @@ namespace Psy\TabCompletion\Matcher; class ClassMethodDefaultParametersMatcher extends AbstractDefaultParametersMatcher { - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $openBracket = array_pop($tokens); $functionName = array_pop($tokens); @@ -25,7 +25,7 @@ class ClassMethodDefaultParametersMatcher extends AbstractDefaultParametersMatch $reflection = new \ReflectionClass($class); } catch (\ReflectionException $e) { // In this case the class apparently does not exist, so we can do nothing - return array(); + return []; } $methods = $reflection->getMethods(\ReflectionMethod::IS_STATIC); @@ -36,7 +36,7 @@ class ClassMethodDefaultParametersMatcher extends AbstractDefaultParametersMatch } } - return array(); + return []; } public function hasMatched(array $tokens) diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodsMatcher.php similarity index 78% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodsMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodsMatcher.php index fa734fde..2aba6dc1 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodsMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodsMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -24,7 +24,7 @@ class ClassMethodsMatcher extends AbstractMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $input = $this->getInput($tokens); @@ -39,17 +39,25 @@ class ClassMethodsMatcher extends AbstractMatcher try { $reflection = new \ReflectionClass($class); } catch (\ReflectionException $re) { - return array(); + return []; + } + + if (self::needCompleteClass($tokens[1])) { + $methods = $reflection->getMethods(); + } else { + $methods = $reflection->getMethods(\ReflectionMethod::IS_STATIC); } - $methods = $reflection->getMethods(\ReflectionMethod::IS_STATIC); $methods = array_map(function (\ReflectionMethod $method) { return $method->getName(); }, $methods); return array_map( function ($name) use ($class) { - return $class . '::' . $name; + $chunks = explode('\\', $class); + $className = array_pop($chunks); + + return $className . '::' . $name; }, array_filter($methods, function ($method) use ($input) { return AbstractMatcher::startsWith($input, $method); diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassNamesMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassNamesMatcher.php similarity index 75% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassNamesMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/ClassNamesMatcher.php index aa6be0c6..8c35094f 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ClassNamesMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassNamesMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -23,7 +23,7 @@ class ClassNamesMatcher extends AbstractMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $class = $this->getNamespaceAndClass($tokens); if (strlen($class) > 0 && $class[0] === '\\') { @@ -56,18 +56,18 @@ class ClassNamesMatcher extends AbstractMatcher $token = array_pop($tokens); $prevToken = array_pop($tokens); - $blacklistedTokens = array( + $blacklistedTokens = [ self::T_INCLUDE, self::T_INCLUDE_ONCE, self::T_REQUIRE, self::T_REQUIRE_ONCE, - ); + ]; switch (true) { - case self::hasToken(array($blacklistedTokens), $token): - case self::hasToken(array($blacklistedTokens), $prevToken): + case self::hasToken([$blacklistedTokens], $token): + case self::hasToken([$blacklistedTokens], $prevToken): case is_string($token) && $token === '$': return false; - case self::hasToken(array(self::T_NEW, self::T_OPEN_TAG, self::T_NS_SEPARATOR), $prevToken): - case self::hasToken(array(self::T_NEW, self::T_OPEN_TAG, self::T_NS_SEPARATOR), $token): - case self::hasToken(array(self::T_OPEN_TAG, self::T_VARIABLE), $token): + case self::hasToken([self::T_NEW, self::T_OPEN_TAG, self::T_NS_SEPARATOR, self::T_STRING], $prevToken): + case self::hasToken([self::T_NEW, self::T_OPEN_TAG, self::T_NS_SEPARATOR], $token): + case self::hasToken([self::T_OPEN_TAG, self::T_VARIABLE], $token): case self::isOperator($token): return true; } diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/CommandsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/CommandsMatcher.php similarity index 90% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/CommandsMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/CommandsMatcher.php index 330d4dbf..eddcef98 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/CommandsMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/CommandsMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -24,7 +24,7 @@ use Psy\Command\Command; class CommandsMatcher extends AbstractMatcher { /** @var string[] */ - protected $commands = array(); + protected $commands = []; /** * CommandsMatcher constructor. @@ -43,9 +43,9 @@ class CommandsMatcher extends AbstractMatcher */ public function setCommands(array $commands) { - $names = array(); + $names = []; foreach ($commands as $command) { - $names = array_merge(array($command->getName()), $names); + $names = array_merge([$command->getName()], $names); $names = array_merge($command->getAliases(), $names); } $this->commands = $names; @@ -84,7 +84,7 @@ class CommandsMatcher extends AbstractMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $input = $this->getInput($tokens); diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ConstantsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ConstantsMatcher.php similarity index 86% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ConstantsMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/ConstantsMatcher.php index 885941e5..ddd8bcb0 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ConstantsMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ConstantsMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -23,7 +23,7 @@ class ConstantsMatcher extends AbstractMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $const = $this->getInput($tokens); @@ -44,7 +44,7 @@ class ConstantsMatcher extends AbstractMatcher case self::tokenIs($prevToken, self::T_NEW): case self::tokenIs($prevToken, self::T_NS_SEPARATOR): return false; - case self::hasToken(array(self::T_OPEN_TAG, self::T_STRING), $token): + case self::hasToken([self::T_OPEN_TAG, self::T_STRING], $token): case self::isOperator($token): return true; } diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php similarity index 89% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php index 47be34b6..14c568e1 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,7 @@ namespace Psy\TabCompletion\Matcher; class FunctionDefaultParametersMatcher extends AbstractDefaultParametersMatcher { - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { array_pop($tokens); // open bracket @@ -22,7 +22,7 @@ class FunctionDefaultParametersMatcher extends AbstractDefaultParametersMatcher try { $reflection = new \ReflectionFunction($functionName[1]); } catch (\ReflectionException $e) { - return array(); + return []; } $parameters = $reflection->getParameters(); diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionsMatcher.php similarity index 87% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionsMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/FunctionsMatcher.php index aa37f883..8bf16856 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionsMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionsMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -23,7 +23,7 @@ class FunctionsMatcher extends AbstractMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $func = $this->getInput($tokens); @@ -46,7 +46,7 @@ class FunctionsMatcher extends AbstractMatcher switch (true) { case self::tokenIs($prevToken, self::T_NEW): return false; - case self::hasToken(array(self::T_OPEN_TAG, self::T_STRING), $token): + case self::hasToken([self::T_OPEN_TAG, self::T_STRING], $token): case self::isOperator($token): return true; } diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/KeywordsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/KeywordsMatcher.php similarity index 82% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/KeywordsMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/KeywordsMatcher.php index 329271cf..b576f82b 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/KeywordsMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/KeywordsMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -20,14 +20,14 @@ namespace Psy\TabCompletion\Matcher; */ class KeywordsMatcher extends AbstractMatcher { - protected $keywords = array( + protected $keywords = [ 'array', 'clone', 'declare', 'die', 'echo', 'empty', 'eval', 'exit', 'include', 'include_once', 'isset', 'list', 'print', 'require', 'require_once', 'unset', - ); + ]; - protected $mandatoryStartKeywords = array( + protected $mandatoryStartKeywords = [ 'die', 'echo', 'print', 'unset', - ); + ]; /** * Get all (completable) PHP keywords. @@ -54,7 +54,7 @@ class KeywordsMatcher extends AbstractMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $input = $this->getInput($tokens); @@ -72,9 +72,9 @@ class KeywordsMatcher extends AbstractMatcher $prevToken = array_pop($tokens); switch (true) { - case self::hasToken(array(self::T_OPEN_TAG, self::T_VARIABLE), $token): + case self::hasToken([self::T_OPEN_TAG, self::T_VARIABLE], $token): // case is_string($token) && $token === '$': - case self::hasToken(array(self::T_OPEN_TAG, self::T_VARIABLE), $prevToken) && + case self::hasToken([self::T_OPEN_TAG, self::T_VARIABLE], $prevToken) && self::tokenIs($token, self::T_STRING): case self::isOperator($token): return true; diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/MongoClientMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/MongoClientMatcher.php similarity index 92% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/MongoClientMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/MongoClientMatcher.php index d08442e7..eb15f15c 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/MongoClientMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/MongoClientMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -23,7 +23,7 @@ class MongoClientMatcher extends AbstractContextAwareMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $input = $this->getInput($tokens); @@ -37,7 +37,7 @@ class MongoClientMatcher extends AbstractContextAwareMatcher $object = $this->getVariable($objectName); if (!$object instanceof \MongoClient) { - return array(); + return []; } $list = $object->listDBs(); diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/MongoDatabaseMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/MongoDatabaseMatcher.php similarity index 92% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/MongoDatabaseMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/MongoDatabaseMatcher.php index 8494067b..26e2337a 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/MongoDatabaseMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/MongoDatabaseMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -23,7 +23,7 @@ class MongoDatabaseMatcher extends AbstractContextAwareMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $input = $this->getInput($tokens); @@ -37,7 +37,7 @@ class MongoDatabaseMatcher extends AbstractContextAwareMatcher $object = $this->getVariable($objectName); if (!$object instanceof \MongoDB) { - return array(); + return []; } return array_filter( diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php similarity index 90% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php index 668f3685..bed365a8 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,7 +26,7 @@ class ObjectAttributesMatcher extends AbstractContextAwareMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $input = $this->getInput($tokens); @@ -37,18 +37,18 @@ class ObjectAttributesMatcher extends AbstractContextAwareMatcher } $objectToken = array_pop($tokens); if (!is_array($objectToken)) { - return array(); + return []; } $objectName = str_replace('$', '', $objectToken[1]); try { $object = $this->getVariable($objectName); } catch (InvalidArgumentException $e) { - return array(); + return []; } if (!is_object($object)) { - return array(); + return []; } return array_filter( diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php similarity index 85% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php index 69873a0f..cb95ae7e 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,7 @@ namespace Psy\TabCompletion\Matcher; class ObjectMethodDefaultParametersMatcher extends AbstractDefaultParametersMatcher { - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $openBracket = array_pop($tokens); $functionName = array_pop($tokens); @@ -21,7 +21,7 @@ class ObjectMethodDefaultParametersMatcher extends AbstractDefaultParametersMatc $objectToken = array_pop($tokens); if (!is_array($objectToken)) { - return array(); + return []; } $objectName = str_replace('$', '', $objectToken[1]); @@ -29,10 +29,10 @@ class ObjectMethodDefaultParametersMatcher extends AbstractDefaultParametersMatc try { $object = $this->getVariable($objectName); $reflection = new \ReflectionObject($object); - } catch (InvalidArgumentException $e) { - return array(); + } catch (\InvalidArgumentException $e) { + return []; } catch (\ReflectionException $e) { - return array(); + return []; } $methods = $reflection->getMethods(); @@ -43,7 +43,7 @@ class ObjectMethodDefaultParametersMatcher extends AbstractDefaultParametersMatc } } - return array(); + return []; } public function hasMatched(array $tokens) diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodsMatcher.php similarity index 91% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodsMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodsMatcher.php index dfb1d305..cc45b1d9 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodsMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodsMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,7 +26,7 @@ class ObjectMethodsMatcher extends AbstractContextAwareMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $input = $this->getInput($tokens); @@ -37,18 +37,18 @@ class ObjectMethodsMatcher extends AbstractContextAwareMatcher } $objectToken = array_pop($tokens); if (!is_array($objectToken)) { - return array(); + return []; } $objectName = str_replace('$', '', $objectToken[1]); try { $object = $this->getVariable($objectName); } catch (InvalidArgumentException $e) { - return array(); + return []; } if (!is_object($object)) { - return array(); + return []; } return array_filter( diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/VariablesMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/VariablesMatcher.php similarity index 85% rename from vendor/psy/psysh/src/Psy/TabCompletion/Matcher/VariablesMatcher.php rename to vendor/psy/psysh/src/TabCompletion/Matcher/VariablesMatcher.php index ee3b27cd..28685259 100644 --- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/VariablesMatcher.php +++ b/vendor/psy/psysh/src/TabCompletion/Matcher/VariablesMatcher.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -23,7 +23,7 @@ class VariablesMatcher extends AbstractContextAwareMatcher /** * {@inheritdoc} */ - public function getMatches(array $tokens, array $info = array()) + public function getMatches(array $tokens, array $info = []) { $var = str_replace('$', '', $this->getInput($tokens)); @@ -40,7 +40,7 @@ class VariablesMatcher extends AbstractContextAwareMatcher $token = array_pop($tokens); switch (true) { - case self::hasToken(array(self::T_OPEN_TAG, self::T_VARIABLE), $token): + case self::hasToken([self::T_OPEN_TAG, self::T_VARIABLE], $token): case is_string($token) && $token === '$': case self::isOperator($token): return true; diff --git a/vendor/psy/psysh/src/Psy/Util/Docblock.php b/vendor/psy/psysh/src/Util/Docblock.php similarity index 93% rename from vendor/psy/psysh/src/Psy/Util/Docblock.php rename to vendor/psy/psysh/src/Util/Docblock.php index 381c2b20..c7989471 100644 --- a/vendor/psy/psysh/src/Psy/Util/Docblock.php +++ b/vendor/psy/psysh/src/Util/Docblock.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -30,11 +30,11 @@ class Docblock * * @var array */ - public static $vectors = array( - 'throws' => array('type', 'desc'), - 'param' => array('type', 'var', 'desc'), - 'return' => array('type', 'desc'), - ); + public static $vectors = [ + 'throws' => ['type', 'desc'], + 'param' => ['type', 'var', 'desc'], + 'return' => ['type', 'desc'], + ]; protected $reflector; @@ -85,7 +85,7 @@ class Docblock protected function setComment($comment) { $this->desc = ''; - $this->tags = array(); + $this->tags = []; $this->comment = $comment; $this->parseComment($comment); @@ -142,15 +142,15 @@ class Docblock }, $comment); // Group the lines together by @tags - $blocks = array(); + $blocks = []; $b = -1; foreach ($comment as $line) { if (self::isTagged($line)) { $b++; - $blocks[] = array(); + $blocks[] = []; } elseif ($b === -1) { $b = 0; - $blocks[] = array(); + $blocks[] = []; } $blocks[$b][] = $line; } @@ -173,7 +173,7 @@ class Docblock if ($body) { $parts = preg_split('/\s+/', $body, $count); } else { - $parts = array(); + $parts = []; } // Default the trailing values diff --git a/vendor/psy/psysh/src/Psy/Util/Json.php b/vendor/psy/psysh/src/Util/Json.php similarity index 76% rename from vendor/psy/psysh/src/Psy/Util/Json.php rename to vendor/psy/psysh/src/Util/Json.php index 352e8456..54ccf313 100644 --- a/vendor/psy/psysh/src/Psy/Util/Json.php +++ b/vendor/psy/psysh/src/Util/Json.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,9 +26,7 @@ class Json */ public static function encode($val, $opt = 0) { - if (version_compare(PHP_VERSION, '5.4', '>=')) { - $opt |= JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE; - } + $opt |= JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE; return json_encode($val, $opt); } diff --git a/vendor/psy/psysh/src/Psy/Util/Mirror.php b/vendor/psy/psysh/src/Util/Mirror.php similarity index 83% rename from vendor/psy/psysh/src/Psy/Util/Mirror.php rename to vendor/psy/psysh/src/Util/Mirror.php index 4a3b061e..862d0bed 100644 --- a/vendor/psy/psysh/src/Psy/Util/Mirror.php +++ b/vendor/psy/psysh/src/Util/Mirror.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -12,7 +12,8 @@ namespace Psy\Util; use Psy\Exception\RuntimeException; -use Psy\Reflection\ReflectionConstant; +use Psy\Reflection\ReflectionClassConstant; +use Psy\Reflection\ReflectionConstant_; /** * A utility class for getting Reflectors. @@ -39,12 +40,16 @@ class Mirror * @param string $member Optional: property, constant or method name (default: null) * @param int $filter (default: CONSTANT | METHOD | PROPERTY | STATIC_PROPERTY) * - * @return Reflector + * @return \Reflector */ public static function get($value, $member = null, $filter = 15) { - if ($member === null && is_string($value) && function_exists($value)) { - return new \ReflectionFunction($value); + if ($member === null && is_string($value)) { + if (function_exists($value)) { + return new \ReflectionFunction($value); + } elseif (defined($value) || ReflectionConstant_::isMagicConstant($value)) { + return new ReflectionConstant_($value); + } } $class = self::getClass($value); @@ -52,7 +57,7 @@ class Mirror if ($member === null) { return $class; } elseif ($filter & self::CONSTANT && $class->hasConstant($member)) { - return new ReflectionConstant($class, $member); + return ReflectionClassConstant::create($value, $member); } elseif ($filter & self::METHOD && $class->hasMethod($member)) { return $class->getMethod($member); } elseif ($filter & self::PROPERTY && $class->hasProperty($member)) { @@ -85,7 +90,7 @@ class Mirror if (!is_string($value)) { throw new \InvalidArgumentException('Mirror expects an object or class'); - } elseif (!class_exists($value) && !interface_exists($value) && !(function_exists('trait_exists') && trait_exists($value))) { + } elseif (!class_exists($value) && !interface_exists($value) && !trait_exists($value)) { throw new \InvalidArgumentException('Unknown class or function: ' . $value); } diff --git a/vendor/psy/psysh/src/Psy/Util/Str.php b/vendor/psy/psysh/src/Util/Str.php similarity index 98% rename from vendor/psy/psysh/src/Psy/Util/Str.php rename to vendor/psy/psysh/src/Util/Str.php index e3a34cb7..88c052af 100644 --- a/vendor/psy/psysh/src/Psy/Util/Str.php +++ b/vendor/psy/psysh/src/Util/Str.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/VarDumper/Cloner.php b/vendor/psy/psysh/src/VarDumper/Cloner.php similarity index 84% rename from vendor/psy/psysh/src/Psy/VarDumper/Cloner.php rename to vendor/psy/psysh/src/VarDumper/Cloner.php index 4685007b..eb6c65e1 100644 --- a/vendor/psy/psysh/src/Psy/VarDumper/Cloner.php +++ b/vendor/psy/psysh/src/VarDumper/Cloner.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -37,6 +37,6 @@ class Cloner extends VarCloner */ protected function castResource(Stub $stub, $isNested) { - return Caster::EXCLUDE_VERBOSE & $this->filter ? array() : parent::castResource($stub, $isNested); + return Caster::EXCLUDE_VERBOSE & $this->filter ? [] : parent::castResource($stub, $isNested); } } diff --git a/vendor/psy/psysh/src/Psy/VarDumper/Dumper.php b/vendor/psy/psysh/src/VarDumper/Dumper.php similarity index 94% rename from vendor/psy/psysh/src/Psy/VarDumper/Dumper.php rename to vendor/psy/psysh/src/VarDumper/Dumper.php index 42c8832c..a6e9e875 100644 --- a/vendor/psy/psysh/src/Psy/VarDumper/Dumper.php +++ b/vendor/psy/psysh/src/VarDumper/Dumper.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -25,7 +25,7 @@ class Dumper extends CliDumper protected static $onlyControlCharsRx = '/^[\x00-\x1F\x7F]+$/'; protected static $controlCharsRx = '/([\x00-\x1F\x7F]+)/'; - protected static $controlCharsMap = array( + protected static $controlCharsMap = [ "\0" => '\0', "\t" => '\t', "\n" => '\n', @@ -33,7 +33,7 @@ class Dumper extends CliDumper "\f" => '\f', "\r" => '\r', "\033" => '\e', - ); + ]; public function __construct(OutputFormatter $formatter, $forceArrayIndexes = false) { @@ -64,7 +64,7 @@ class Dumper extends CliDumper } } - protected function style($style, $value, $attr = array()) + protected function style($style, $value, $attr = []) { if ('ref' === $style) { $value = strtr($value, '@', '#'); diff --git a/vendor/psy/psysh/src/Psy/VarDumper/Presenter.php b/vendor/psy/psysh/src/VarDumper/Presenter.php similarity index 93% rename from vendor/psy/psysh/src/Psy/VarDumper/Presenter.php rename to vendor/psy/psysh/src/VarDumper/Presenter.php index b48ca9dd..400778ab 100644 --- a/vendor/psy/psysh/src/Psy/VarDumper/Presenter.php +++ b/vendor/psy/psysh/src/VarDumper/Presenter.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -24,14 +24,14 @@ class Presenter private $cloner; private $dumper; - private $exceptionsImportants = array( + private $exceptionsImportants = [ "\0*\0message", "\0*\0code", "\0*\0file", "\0*\0line", "\0Exception\0previous", - ); - private $styles = array( + ]; + private $styles = [ 'num' => 'number', 'const' => 'const', 'str' => 'string', @@ -44,7 +44,7 @@ class Presenter 'meta' => 'comment', 'key' => 'comment', 'index' => 'number', - ); + ]; public function __construct(OutputFormatter $formatter, $forceArrayIndexes = false) { @@ -59,7 +59,7 @@ class Presenter setlocale(LC_NUMERIC, $oldLocale); $this->cloner = new Cloner(); - $this->cloner->addCasters(array('*' => function ($obj, array $a, Stub $stub, $isNested, $filter = 0) { + $this->cloner->addCasters(['*' => function ($obj, array $a, Stub $stub, $isNested, $filter = 0) { if ($filter || $isNested) { if ($obj instanceof \Exception) { $a = Caster::filter($a, Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_EMPTY, $this->exceptionsImportants); @@ -69,7 +69,7 @@ class Presenter } return $a; - })); + }]); } /** diff --git a/vendor/psy/psysh/src/Psy/VarDumper/PresenterAware.php b/vendor/psy/psysh/src/VarDumper/PresenterAware.php similarity index 93% rename from vendor/psy/psysh/src/Psy/VarDumper/PresenterAware.php rename to vendor/psy/psysh/src/VarDumper/PresenterAware.php index 8406b8ae..1645c604 100644 --- a/vendor/psy/psysh/src/Psy/VarDumper/PresenterAware.php +++ b/vendor/psy/psysh/src/VarDumper/PresenterAware.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/VersionUpdater/Checker.php b/vendor/psy/psysh/src/VersionUpdater/Checker.php similarity index 94% rename from vendor/psy/psysh/src/Psy/VersionUpdater/Checker.php rename to vendor/psy/psysh/src/VersionUpdater/Checker.php index 97763dbd..c4044870 100644 --- a/vendor/psy/psysh/src/Psy/VersionUpdater/Checker.php +++ b/vendor/psy/psysh/src/VersionUpdater/Checker.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/VersionUpdater/GitHubChecker.php b/vendor/psy/psysh/src/VersionUpdater/GitHubChecker.php similarity index 93% rename from vendor/psy/psysh/src/Psy/VersionUpdater/GitHubChecker.php rename to vendor/psy/psysh/src/VersionUpdater/GitHubChecker.php index 5ac6969d..e62a4d27 100644 --- a/vendor/psy/psysh/src/Psy/VersionUpdater/GitHubChecker.php +++ b/vendor/psy/psysh/src/VersionUpdater/GitHubChecker.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -68,12 +68,12 @@ class GitHubChecker implements Checker */ public function fetchLatestRelease() { - $context = stream_context_create(array( - 'http' => array( + $context = stream_context_create([ + 'http' => [ 'user_agent' => 'PsySH/' . Shell::VERSION, 'timeout' => 3, - ), - )); + ], + ]); set_error_handler(function () { // Just ignore all errors with this. The checker will throw an exception diff --git a/vendor/psy/psysh/src/Psy/VersionUpdater/IntervalChecker.php b/vendor/psy/psysh/src/VersionUpdater/IntervalChecker.php similarity index 96% rename from vendor/psy/psysh/src/Psy/VersionUpdater/IntervalChecker.php rename to vendor/psy/psysh/src/VersionUpdater/IntervalChecker.php index 968a2857..712f2758 100644 --- a/vendor/psy/psysh/src/Psy/VersionUpdater/IntervalChecker.php +++ b/vendor/psy/psysh/src/VersionUpdater/IntervalChecker.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -59,10 +59,10 @@ class IntervalChecker extends GitHubChecker private function updateCache($release) { - $data = array( + $data = [ 'last_check' => date(DATE_ATOM), 'release' => $release, - ); + ]; file_put_contents($this->cacheFile, json_encode($data)); } diff --git a/vendor/psy/psysh/src/Psy/VersionUpdater/NoopChecker.php b/vendor/psy/psysh/src/VersionUpdater/NoopChecker.php similarity index 94% rename from vendor/psy/psysh/src/Psy/VersionUpdater/NoopChecker.php rename to vendor/psy/psysh/src/VersionUpdater/NoopChecker.php index 5edbe00d..c5c9bcb4 100644 --- a/vendor/psy/psysh/src/Psy/VersionUpdater/NoopChecker.php +++ b/vendor/psy/psysh/src/VersionUpdater/NoopChecker.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/src/Psy/functions.php b/vendor/psy/psysh/src/functions.php similarity index 82% rename from vendor/psy/psysh/src/Psy/functions.php rename to vendor/psy/psysh/src/functions.php index dc77e121..b07c4920 100644 --- a/vendor/psy/psysh/src/Psy/functions.php +++ b/vendor/psy/psysh/src/functions.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -28,7 +28,7 @@ if (!function_exists('Psy\sh')) { */ function sh() { - return 'extract(\Psy\debug(get_defined_vars(), isset($this) ? $this : null));'; + return 'extract(\Psy\debug(get_defined_vars(), isset($this) ? $this : @get_called_class()));'; } } @@ -50,9 +50,9 @@ if (!function_exists('Psy\debug')) { * var_dump($item); // will be whatever you set $item to in Psy Shell * } * - * Optionally, supply an object as the `$boundObject` parameter. This - * determines the value `$this` will have in the shell, and sets up class - * scope so that private and protected members are accessible: + * Optionally, supply an object as the `$bindTo` parameter. This determines + * the value `$this` will have in the shell, and sets up class scope so that + * private and protected members are accessible: * * class Foo { * function bar() { @@ -60,14 +60,22 @@ if (!function_exists('Psy\debug')) { * } * } * - * This only really works in PHP 5.4+ and HHVM 3.5+, so upgrade already. + * For the static equivalent, pass a class name as the `$bindTo` parameter. + * This makes `self` work in the shell, and sets up static scope so that + * private and protected static members are accessible: * - * @param array $vars Scope variables from the calling context (default: array()) - * @param object $boundObject Bound object ($this) value for the shell + * class Foo { + * static function bar() { + * \Psy\debug(get_defined_vars(), get_called_class()); + * } + * } + * + * @param array $vars Scope variables from the calling context (default: array()) + * @param object|string $bindTo Bound object ($this) or class (self) value for the shell * * @return array Scope variables from the debugger session */ - function debug(array $vars = array(), $boundObject = null) + function debug(array $vars = [], $bindTo = null) { echo PHP_EOL; @@ -81,8 +89,10 @@ if (!function_exists('Psy\debug')) { $sh->addInput('whereami -n2', true); } - if ($boundObject !== null) { - $sh->setBoundObject($boundObject); + if (is_string($bindTo)) { + $sh->setBoundClass($bindTo); + } elseif ($bindTo !== null) { + $sh->setBoundObject($bindTo); } $sh->run(); @@ -126,21 +136,22 @@ if (!function_exists('Psy\info')) { $config = $lastConfig ?: new Configuration(); - $core = array( + $core = [ 'PsySH version' => Shell::VERSION, 'PHP version' => PHP_VERSION, + 'OS' => PHP_OS, 'default includes' => $config->getDefaultIncludes(), 'require semicolons' => $config->requireSemicolons(), 'error logging level' => $config->errorLoggingLevel(), - 'config file' => array( + 'config file' => [ 'default config file' => $prettyPath($config->getConfigFile()), 'local config file' => $prettyPath($config->getLocalConfigFile()), 'PSYSH_CONFIG env' => $prettyPath(getenv('PSYSH_CONFIG')), - ), + ], // 'config dir' => $config->getConfigDir(), // 'data dir' => $config->getDataDir(), // 'runtime dir' => $config->getRuntimeDir(), - ); + ]; // Use an explicit, fresh update check here, rather than relying on whatever is in $config. $checker = new GitHubChecker(); @@ -152,21 +163,21 @@ if (!function_exists('Psy\info')) { } catch (\Exception $e) { } - $updates = array( + $updates = [ 'update available' => $updateAvailable, 'latest release version' => $latest, 'update check interval' => $config->getUpdateCheck(), 'update cache file' => $prettyPath($config->getUpdateCheckCacheFile()), - ); + ]; if ($config->hasReadline()) { $info = readline_info(); - $readline = array( + $readline = [ 'readline available' => true, 'readline enabled' => $config->useReadline(), 'readline service' => get_class($config->getReadline()), - ); + ]; if (isset($info['library_version'])) { $readline['readline library'] = $info['library_version']; @@ -176,31 +187,31 @@ if (!function_exists('Psy\info')) { $readline['readline name'] = $info['readline_name']; } } else { - $readline = array( + $readline = [ 'readline available' => false, - ); + ]; } - $pcntl = array( + $pcntl = [ 'pcntl available' => function_exists('pcntl_signal'), 'posix available' => function_exists('posix_getpid'), - ); + ]; $disabledFuncs = array_map('trim', explode(',', ini_get('disable_functions'))); if (in_array('pcntl_signal', $disabledFuncs) || in_array('pcntl_fork', $disabledFuncs)) { $pcntl['pcntl disabled'] = true; } - $history = array( + $history = [ 'history file' => $prettyPath($config->getHistoryFile()), 'history size' => $config->getHistorySize(), 'erase duplicates' => $config->getEraseDuplicates(), - ); + ]; - $docs = array( + $docs = [ 'manual db file' => $prettyPath($config->getManualDbFile()), 'sqlite available' => true, - ); + ]; try { if ($db = $config->getManualDb()) { @@ -230,11 +241,21 @@ if (!function_exists('Psy\info')) { } } - $autocomplete = array( - 'tab completion enabled' => $config->getTabCompletion(), + $autocomplete = [ + 'tab completion enabled' => $config->useTabCompletion(), 'custom matchers' => array_map('get_class', $config->getTabCompletionMatchers()), 'bracketed paste' => $config->useBracketedPaste(), - ); + ]; + + // Shenanigans, but totally justified. + if ($shell = Sudo::fetchProperty($config, 'shell')) { + $core['loop listeners'] = array_map('get_class', Sudo::fetchProperty($shell, 'loopListeners')); + $core['commands'] = array_map('get_class', $shell->all()); + + $autocomplete['custom matchers'] = array_map('get_class', Sudo::fetchProperty($shell, 'matchers')); + } + + // @todo Show Presenter / custom casters. return array_merge($core, compact('updates', 'pcntl', 'readline', 'history', 'docs', 'autocomplete')); } @@ -244,7 +265,7 @@ if (!function_exists('Psy\bin')) { /** * `psysh` command line executable. * - * @return Closure + * @return \Closure */ function bin() { @@ -253,7 +274,7 @@ if (!function_exists('Psy\bin')) { $input = new ArgvInput(); try { - $input->bind(new InputDefinition(array( + $input->bind(new InputDefinition([ new InputOption('help', 'h', InputOption::VALUE_NONE), new InputOption('config', 'c', InputOption::VALUE_REQUIRED), new InputOption('version', 'v', InputOption::VALUE_NONE), @@ -262,12 +283,12 @@ if (!function_exists('Psy\bin')) { new InputOption('no-color', null, InputOption::VALUE_NONE), new InputArgument('include', InputArgument::IS_ARRAY), - ))); + ])); } catch (\RuntimeException $e) { $usageException = $e; } - $config = array(); + $config = []; // Handle --config if ($configFile = $input->getOption('config')) { @@ -276,7 +297,7 @@ if (!function_exists('Psy\bin')) { // Handle --color and --no-color if ($input->getOption('color') && $input->getOption('no-color')) { - $usageException = new \RuntimeException('Using both "--color" and "--no-color" options is invalid.'); + $usageException = new \RuntimeException('Using both "--color" and "--no-color" options is invalid'); } elseif ($input->getOption('color')) { $config['colorMode'] = Configuration::COLOR_MODE_FORCED; } elseif ($input->getOption('no-color')) { @@ -323,7 +344,7 @@ EOL; try { // And go! $shell->run(); - } catch (Exception $e) { + } catch (\Exception $e) { echo $e->getMessage() . PHP_EOL; // @todo this triggers the "exited unexpectedly" logic in the diff --git a/vendor/psy/psysh/test/ClassWithSecrets.php b/vendor/psy/psysh/test/ClassWithSecrets.php new file mode 100644 index 00000000..92eaf76d --- /dev/null +++ b/vendor/psy/psysh/test/ClassWithSecrets.php @@ -0,0 +1,37 @@ +setPass(new AbstractClassPass()); + } + + /** + * @dataProvider invalidStatements + * @expectedException \Psy\Exception\FatalErrorException + */ + public function testProcessStatementFails($code) + { + $this->parseAndTraverse($code); + } + + public function invalidStatements() + { + return [ + ['class A { abstract function a(); }'], + ['abstract class B { abstract function b() {} }'], + ['abstract class B { abstract function b() { echo "yep"; } }'], + ]; + } + + /** + * @dataProvider validStatements + */ + public function testProcessStatementPasses($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validStatements() + { + return [ + ['abstract class C { function c() {} }'], + ['abstract class D { abstract function d(); }'], + ]; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/AssignThisVariablePassTest.php b/vendor/psy/psysh/test/CodeCleaner/AssignThisVariablePassTest.php similarity index 52% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/AssignThisVariablePassTest.php rename to vendor/psy/psysh/test/CodeCleaner/AssignThisVariablePassTest.php index 1a975f4b..1ff15c57 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/AssignThisVariablePassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/AssignThisVariablePassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,16 +11,13 @@ namespace Psy\Test\CodeCleaner; -use PhpParser\NodeTraverser; use Psy\CodeCleaner\AssignThisVariablePass; class AssignThisVariablePassTest extends CodeCleanerTestCase { public function setUp() { - $this->pass = new AssignThisVariablePass(); - $this->traverser = new NodeTraverser(); - $this->traverser->addVisitor($this->pass); + $this->setPass(new AssignThisVariablePass()); } /** @@ -29,16 +26,15 @@ class AssignThisVariablePassTest extends CodeCleanerTestCase */ public function testProcessStatementFails($code) { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); + $this->parseAndTraverse($code); } public function invalidStatements() { - return array( - array('$this = 3'), - array('strtolower($this = "this")'), - ); + return [ + ['$this = 3'], + ['strtolower($this = "this")'], + ]; } /** @@ -46,20 +42,17 @@ class AssignThisVariablePassTest extends CodeCleanerTestCase */ public function testProcessStatementPasses($code) { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? + $this->parseAndTraverse($code); $this->assertTrue(true); } public function validStatements() { - return array( - array('$this'), - array('$a = $this'), - array('$a = "this"; $$a = 3'), - array('$$this = "b"'), - ); + return [ + ['$this'], + ['$a = $this'], + ['$a = "this"; $$a = 3'], + ['$$this = "b"'], + ]; } } diff --git a/vendor/psy/psysh/test/CodeCleaner/CallTimePassByReferencePassTest.php b/vendor/psy/psysh/test/CodeCleaner/CallTimePassByReferencePassTest.php new file mode 100644 index 00000000..cd321b5d --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/CallTimePassByReferencePassTest.php @@ -0,0 +1,59 @@ +setPass(new CallTimePassByReferencePass()); + } + + /** + * @dataProvider invalidStatements + * @expectedException \Psy\Exception\FatalErrorException + */ + public function testProcessStatementFails($code) + { + $this->parseAndTraverse($code); + } + + public function invalidStatements() + { + return [ + ['f(&$arg)'], + ['$object->method($first, &$arg)'], + ['$closure($first, &$arg, $last)'], + ['A::b(&$arg)'], + ]; + } + + /** + * @dataProvider validStatements + */ + public function testProcessStatementPasses($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validStatements() + { + return [ + ['array(&$var)'], + ['$a = &$b'], + ['f(array(&$b))'], + ]; + } +} diff --git a/vendor/psy/psysh/test/CodeCleaner/CalledClassPassTest.php b/vendor/psy/psysh/test/CodeCleaner/CalledClassPassTest.php new file mode 100644 index 00000000..c80f257a --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/CalledClassPassTest.php @@ -0,0 +1,90 @@ +setPass(new CalledClassPass()); + } + + /** + * @dataProvider invalidStatements + * @expectedException \Psy\Exception\ErrorException + */ + public function testProcessStatementFails($code) + { + $this->parseAndTraverse($code); + } + + public function invalidStatements() + { + return [ + ['get_class()'], + ['get_class(null)'], + ['get_called_class()'], + ['get_called_class(null)'], + ['function foo() { return get_class(); }'], + ['function foo() { return get_class(null); }'], + ['function foo() { return get_called_class(); }'], + ['function foo() { return get_called_class(null); }'], + ]; + } + + /** + * @dataProvider validStatements + */ + public function testProcessStatementPasses($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validStatements() + { + return [ + ['get_class($foo)'], + ['get_class(bar())'], + ['get_called_class($foo)'], + ['get_called_class(bar())'], + ['function foo($bar) { return get_class($bar); }'], + ['function foo($bar) { return get_called_class($bar); }'], + ['class Foo { function bar() { return get_class(); } }'], + ['class Foo { function bar() { return get_class(null); } }'], + ['class Foo { function bar() { return get_called_class(); } }'], + ['class Foo { function bar() { return get_called_class(null); } }'], + ['$foo = function () {}; $foo()'], + ]; + } + + /** + * @dataProvider validTraitStatements + */ + public function testProcessTraitStatementPasses($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validTraitStatements() + { + return [ + ['trait Foo { function bar() { return get_class(); } }'], + ['trait Foo { function bar() { return get_class(null); } }'], + ['trait Foo { function bar() { return get_called_class(); } }'], + ['trait Foo { function bar() { return get_called_class(null); } }'], + ]; + } +} diff --git a/vendor/psy/psysh/test/CodeCleaner/CodeCleanerTestCase.php b/vendor/psy/psysh/test/CodeCleaner/CodeCleanerTestCase.php new file mode 100644 index 00000000..6962c114 --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/CodeCleanerTestCase.php @@ -0,0 +1,41 @@ +pass = null; + parent::tearDown(); + } + + protected function setPass(CodeCleanerPass $pass) + { + $this->pass = $pass; + if (!isset($this->traverser)) { + $this->traverser = new NodeTraverser(); + } + $this->traverser->addVisitor($this->pass); + } + + protected function parseAndTraverse($code, $prefix = 'traverse($this->parse($code, $prefix)); + } +} diff --git a/vendor/psy/psysh/test/CodeCleaner/ExitPassTest.php b/vendor/psy/psysh/test/CodeCleaner/ExitPassTest.php new file mode 100644 index 00000000..b22766c7 --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/ExitPassTest.php @@ -0,0 +1,59 @@ +setPass(new ExitPass()); + } + + /** + * @dataProvider dataProviderExitStatement + */ + public function testExitStatement($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + /** + * Data provider for testExitStatement. + * + * @return array + */ + public function dataProviderExitStatement() + { + return [ + ['exit;', "{$this->expectedExceptionString};"], + ['exit();', "{$this->expectedExceptionString};"], + ['die;', "{$this->expectedExceptionString};"], + ['exit(die(die));', "{$this->expectedExceptionString};"], + ['if (true) { exit; }', "if (true) {\n {$this->expectedExceptionString};\n}"], + ['if (false) { exit; }', "if (false) {\n {$this->expectedExceptionString};\n}"], + ['1 and exit();', "1 and {$this->expectedExceptionString};"], + ['foo() or die', "foo() or {$this->expectedExceptionString};"], + ['exit and 1;', "{$this->expectedExceptionString} and 1;"], + ['if (exit) { echo $wat; }', "if ({$this->expectedExceptionString}) {\n echo \$wat;\n}"], + ['exit or die;', "{$this->expectedExceptionString} or {$this->expectedExceptionString};"], + ['switch (die) { }', "switch ({$this->expectedExceptionString}) {\n}"], + ['for ($i = 1; $i < 10; die) {}', "for (\$i = 1; \$i < 10; {$this->expectedExceptionString}) {\n}"], + ]; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/FinalClassPassTest.php b/vendor/psy/psysh/test/CodeCleaner/FinalClassPassTest.php similarity index 53% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/FinalClassPassTest.php rename to vendor/psy/psysh/test/CodeCleaner/FinalClassPassTest.php index 02b892d4..ef6eae66 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/FinalClassPassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/FinalClassPassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,16 +11,13 @@ namespace Psy\Test\CodeCleaner; -use PhpParser\NodeTraverser; use Psy\CodeCleaner\FinalClassPass; class FinalClassPassTest extends CodeCleanerTestCase { public function setUp() { - $this->pass = new FinalClassPass(); - $this->traverser = new NodeTraverser(); - $this->traverser->addVisitor($this->pass); + $this->setPass(new FinalClassPass()); } /** @@ -29,24 +26,23 @@ class FinalClassPassTest extends CodeCleanerTestCase */ public function testProcessStatementFails($code) { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); + $this->parseAndTraverse($code); } public function invalidStatements() { - $stmts = array( - array('final class A {} class B extends A {}'), - array('class A {} final class B extends A {} class C extends B {}'), + $data = [ + ['final class A {} class B extends A {}'], + ['class A {} final class B extends A {} class C extends B {}'], // array('namespace A { final class B {} } namespace C { class D extends \\A\\B {} }'), - ); + ]; if (!defined('HHVM_VERSION')) { // For some reason Closure isn't final in HHVM? - $stmts[] = array('class A extends \\Closure {}'); + $data[] = ['class A extends \\Closure {}']; } - return $stmts; + return $data; } /** @@ -54,19 +50,16 @@ class FinalClassPassTest extends CodeCleanerTestCase */ public function testProcessStatementPasses($code) { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? + $this->parseAndTraverse($code); $this->assertTrue(true); } public function validStatements() { - return array( - array('class A extends \\stdClass {}'), - array('final class A extends \\stdClass {}'), - array('class A {} class B extends A {}'), - ); + return [ + ['class A extends \\stdClass {}'], + ['final class A extends \\stdClass {}'], + ['class A {} class B extends A {}'], + ]; } } diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/Fixtures/ClassWithCallStatic.php b/vendor/psy/psysh/test/CodeCleaner/Fixtures/ClassWithCallStatic.php similarity index 91% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/Fixtures/ClassWithCallStatic.php rename to vendor/psy/psysh/test/CodeCleaner/Fixtures/ClassWithCallStatic.php index f576ebf6..0c674c0e 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/Fixtures/ClassWithCallStatic.php +++ b/vendor/psy/psysh/test/CodeCleaner/Fixtures/ClassWithCallStatic.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/Fixtures/ClassWithStatic.php b/vendor/psy/psysh/test/CodeCleaner/Fixtures/ClassWithStatic.php similarity index 91% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/Fixtures/ClassWithStatic.php rename to vendor/psy/psysh/test/CodeCleaner/Fixtures/ClassWithStatic.php index 9686392a..64c64c76 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/Fixtures/ClassWithStatic.php +++ b/vendor/psy/psysh/test/CodeCleaner/Fixtures/ClassWithStatic.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/FunctionContextPassTest.php b/vendor/psy/psysh/test/CodeCleaner/FunctionContextPassTest.php similarity index 51% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/FunctionContextPassTest.php rename to vendor/psy/psysh/test/CodeCleaner/FunctionContextPassTest.php index 2dd89043..851eb228 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/FunctionContextPassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/FunctionContextPassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,16 +11,13 @@ namespace Psy\Test\CodeCleaner; -use PhpParser\NodeTraverser; use Psy\CodeCleaner\FunctionContextPass; class FunctionContextPassTest extends CodeCleanerTestCase { public function setUp() { - $this->pass = new FunctionContextPass(); - $this->traverser = new NodeTraverser(); - $this->traverser->addVisitor($this->pass); + $this->setPass(new FunctionContextPass()); } /** @@ -28,19 +25,16 @@ class FunctionContextPassTest extends CodeCleanerTestCase */ public function testProcessStatementPasses($code) { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? + $this->parseAndTraverse($code); $this->assertTrue(true); } public function validStatements() { - return array( - array('function foo() { yield; }'), - array('if (function(){ yield; })'), - ); + return [ + ['function foo() { yield; }'], + ['if (function(){ yield; })'], + ]; } /** @@ -49,19 +43,14 @@ class FunctionContextPassTest extends CodeCleanerTestCase */ public function testInvalidYield($code) { - if (version_compare(PHP_VERSION, '5.4', '<')) { - $this->markTestSkipped(); - } - - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); + $this->parseAndTraverse($code); } public function invalidYieldStatements() { - return array( - array('yield'), - array('if (yield)'), - ); + return [ + ['yield'], + ['if (yield)'], + ]; } } diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/FunctionReturnInWriteContextPassTest.php b/vendor/psy/psysh/test/CodeCleaner/FunctionReturnInWriteContextPassTest.php similarity index 72% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/FunctionReturnInWriteContextPassTest.php rename to vendor/psy/psysh/test/CodeCleaner/FunctionReturnInWriteContextPassTest.php index 04034951..fb323ab5 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/FunctionReturnInWriteContextPassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/FunctionReturnInWriteContextPassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,7 +11,6 @@ namespace Psy\Test\CodeCleaner; -use PhpParser\NodeTraverser; use Psy\CodeCleaner\FunctionReturnInWriteContextPass; use Psy\Exception\FatalErrorException; @@ -19,9 +18,7 @@ class FunctionReturnInWriteContextPassTest extends CodeCleanerTestCase { public function setUp() { - $this->pass = new FunctionReturnInWriteContextPass(); - $this->traverser = new NodeTraverser(); - $this->traverser->addVisitor($this->pass); + $this->setPass(new FunctionReturnInWriteContextPass()); } /** @@ -31,20 +28,19 @@ class FunctionReturnInWriteContextPassTest extends CodeCleanerTestCase */ public function testProcessStatementFails($code) { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); + $this->parseAndTraverse($code); } public function invalidStatements() { - return array( - array('f(&g())'), - array('array(& $object->method())'), - array('$a->method(& $closure())'), - array('array(& A::b())'), - array('f() = 5'), - array('unset(h())'), - ); + return [ + ['f(&g())'], + ['array(& $object->method())'], + ['$a->method(& $closure())'], + ['array(& A::b())'], + ['f() = 5'], + ['unset(h())'], + ]; } public function testIsset() @@ -76,4 +72,20 @@ class FunctionReturnInWriteContextPassTest extends CodeCleanerTestCase $this->traverser->traverse($this->parse('empty(strtolower("A"))')); } + + /** + * @dataProvider validStatements + */ + public function testValidStatements($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validStatements() + { + return [ + ['isset($foo)'], + ]; + } } diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ImplicitReturnPassTest.php b/vendor/psy/psysh/test/CodeCleaner/ImplicitReturnPassTest.php similarity index 64% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/ImplicitReturnPassTest.php rename to vendor/psy/psysh/test/CodeCleaner/ImplicitReturnPassTest.php index b9912c39..1c28b4a8 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ImplicitReturnPassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/ImplicitReturnPassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -30,11 +30,19 @@ class ImplicitReturnPassTest extends CodeCleanerTestCase public function implicitReturns() { - $values = array( - array('4', 'return 4;'), - array('foo()', 'return foo();'), - array('return 1', 'return 1;'), - ); + $data = [ + ['4', 'return 4;'], + ['foo()', 'return foo();'], + ['return 1', 'return 1;'], + ['', 'return new \Psy\CodeCleaner\NoReturnValue();'], + ]; + + $from = 'echo "foo";'; + $to = <<<'EOS' +echo "foo"; +return new \Psy\CodeCleaner\NoReturnValue(); +EOS; + $data[] = [$from, $to]; $from = 'if (true) { 1; } elseif (true) { 2; } else { 3; }'; $to = <<<'EOS' @@ -47,7 +55,7 @@ if (true) { } return new \Psy\CodeCleaner\NoReturnValue(); EOS; - $values[] = array($from, $to); + $data[] = [$from, $to]; $from = 'class A {}'; $to = <<<'EOS' @@ -56,7 +64,7 @@ class A } return new \Psy\CodeCleaner\NoReturnValue(); EOS; - $values[] = array($from, $to); + $data[] = [$from, $to]; $from = <<<'EOS' switch (false) { @@ -83,14 +91,22 @@ switch (false) { } return new \Psy\CodeCleaner\NoReturnValue(); EOS; - $values[] = array($from, $to); + $data[] = [$from, $to]; - if (version_compare(PHP_VERSION, '5.4', '<')) { - $values[] = array('exit()', 'die;'); - } else { - $values[] = array('exit()', 'exit;'); - } + $from = <<<'EOS' +namespace Foo { + 1 + 1; +} +EOS; + $to = <<<'EOS' +namespace Foo; - return $values; +return 1 + 1; +EOS; + $data[] = [$from, $to]; + + $data[] = ['exit()', 'exit;']; + + return $data; } } diff --git a/vendor/psy/psysh/test/CodeCleaner/InstanceOfPassTest.php b/vendor/psy/psysh/test/CodeCleaner/InstanceOfPassTest.php new file mode 100644 index 00000000..b8c63313 --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/InstanceOfPassTest.php @@ -0,0 +1,72 @@ +setPass(new InstanceOfPass()); + } + + /** + * @dataProvider invalidStatements + * @expectedException \Psy\Exception\FatalErrorException + */ + public function testProcessInvalidStatement($code) + { + $this->parseAndTraverse($code); + } + + public function invalidStatements() + { + return [ + ['null instanceof stdClass'], + ['true instanceof stdClass'], + ['9 instanceof stdClass'], + ['1.0 instanceof stdClass'], + ['"foo" instanceof stdClass'], + ['__DIR__ instanceof stdClass'], + ['PHP_SAPI instanceof stdClass'], + ['1+1 instanceof stdClass'], + ['true && false instanceof stdClass'], + ['"a"."b" instanceof stdClass'], + ['!5 instanceof stdClass'], + ]; + } + + /** + * @dataProvider validStatements + */ + public function testProcessValidStatement($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validStatements() + { + $data = [ + ['$a instanceof stdClass'], + ['strtolower("foo") instanceof stdClass'], + ['array(1) instanceof stdClass'], + ['(string) "foo" instanceof stdClass'], + ['(1+1) instanceof stdClass'], + ['"foo ${foo} $bar" instanceof stdClass'], + ['DateTime::ISO8601 instanceof stdClass'], + ]; + + return $data; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/LeavePsyshAlonePassTest.php b/vendor/psy/psysh/test/CodeCleaner/LeavePsyshAlonePassTest.php similarity index 59% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/LeavePsyshAlonePassTest.php rename to vendor/psy/psysh/test/CodeCleaner/LeavePsyshAlonePassTest.php index 10fce3e2..9df633e8 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/LeavePsyshAlonePassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/LeavePsyshAlonePassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -24,8 +24,6 @@ class LeavePsyshAlonePassTest extends CodeCleanerTestCase { $inline = $this->parse('not php at all!', ''); $this->traverse($inline); - - // @todo a better thing to assert here? $this->assertTrue(true); } @@ -34,23 +32,20 @@ class LeavePsyshAlonePassTest extends CodeCleanerTestCase */ public function testProcessStatementPasses($code) { - $stmts = $this->parse($code); - $this->traverse($stmts); - - // @todo a better thing to assert here? + $this->parseAndTraverse($code); $this->assertTrue(true); } public function validStatements() { - return array( - array('array_merge()'), - array('__psysh__()'), - array('$this'), - array('$psysh'), - array('$__psysh'), - array('$banana'), - ); + return [ + ['array_merge()'], + ['__psysh__()'], + ['$this'], + ['$psysh'], + ['$__psysh'], + ['$banana'], + ]; } /** @@ -59,17 +54,16 @@ class LeavePsyshAlonePassTest extends CodeCleanerTestCase */ public function testProcessStatementFails($code) { - $stmts = $this->parse($code); - $this->traverse($stmts); + $this->parseAndTraverse($code); } public function invalidStatements() { - return array( - array('$__psysh__'), - array('var_dump($__psysh__)'), - array('$__psysh__ = "your mom"'), - array('$__psysh__->fakeFunctionCall()'), - ); + return [ + ['$__psysh__'], + ['var_dump($__psysh__)'], + ['$__psysh__ = "your mom"'], + ['$__psysh__->fakeFunctionCall()'], + ]; } } diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/LegacyEmptyPassTest.php b/vendor/psy/psysh/test/CodeCleaner/LegacyEmptyPassTest.php similarity index 52% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/LegacyEmptyPassTest.php rename to vendor/psy/psysh/test/CodeCleaner/LegacyEmptyPassTest.php index d4fbd8b7..5afb5759 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/LegacyEmptyPassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/LegacyEmptyPassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,26 +26,25 @@ class LegacyEmptyPassTest extends CodeCleanerTestCase */ public function testProcessInvalidStatement($code) { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); + $this->parseAndTraverse($code); } public function invalidStatements() { if (version_compare(PHP_VERSION, '5.5', '>=')) { - return array( - array('empty()'), - ); + return [ + ['empty()'], + ]; } - return array( - array('empty()'), - array('empty(null)'), - array('empty(PHP_EOL)'), - array('empty("wat")'), - array('empty(1.1)'), - array('empty(Foo::$bar)'), - ); + return [ + ['empty()'], + ['empty(null)'], + ['empty(PHP_EOL)'], + ['empty("wat")'], + ['empty(1.1)'], + ['empty(Foo::$bar)'], + ]; } /** @@ -53,28 +52,25 @@ class LegacyEmptyPassTest extends CodeCleanerTestCase */ public function testProcessValidStatement($code) { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? + $this->parseAndTraverse($code); $this->assertTrue(true); } public function validStatements() { if (version_compare(PHP_VERSION, '5.5', '<')) { - return array( - array('empty($foo)'), - ); + return [ + ['empty($foo)'], + ]; } - return array( - array('empty($foo)'), - array('empty(null)'), - array('empty(PHP_EOL)'), - array('empty("wat")'), - array('empty(1.1)'), - array('empty(Foo::$bar)'), - ); + return [ + ['empty($foo)'], + ['empty(null)'], + ['empty(PHP_EOL)'], + ['empty("wat")'], + ['empty(1.1)'], + ['empty(Foo::$bar)'], + ]; } } diff --git a/vendor/psy/psysh/test/CodeCleaner/ListPassTest.php b/vendor/psy/psysh/test/CodeCleaner/ListPassTest.php new file mode 100644 index 00000000..95cf3a74 --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/ListPassTest.php @@ -0,0 +1,104 @@ +setPass(new ListPass()); + } + + /** + * @dataProvider invalidStatements + * @expectedException \Psy\Exception\ParseErrorException + */ + public function testProcessInvalidStatement($code, $expectedMessage) + { + if (method_exists($this, 'setExpectedException')) { + $this->setExpectedException('Psy\Exception\ParseErrorException', $expectedMessage); + } else { + $this->expectExceptionMessage($expectedMessage); + } + + $stmts = $this->parse($code); + $this->traverser->traverse($stmts); + } + + public function invalidStatements() + { + // Not typo. It is ambiguous whether "Syntax" or "syntax". + $errorShortListAssign = "yntax error, unexpected '='"; + $errorEmptyList = 'Cannot use empty list'; + $errorAssocListAssign = 'Syntax error, unexpected T_CONSTANT_ENCAPSED_STRING, expecting \',\' or \')\''; + $errorNonVariableAssign = 'Assignments can only happen to writable values'; + $errorPhpParserSyntax = 'PHP Parse error: Syntax error, unexpected'; + + $invalidExpr = [ + ['list() = array()', $errorEmptyList], + ['list("a") = array(1)', $errorPhpParserSyntax], + ]; + + if (version_compare(PHP_VERSION, '7.1', '<')) { + return array_merge($invalidExpr, [ + ['list("a" => _) = array("a" => 1)', $errorPhpParserSyntax], + ['[] = []', $errorShortListAssign], + ['[$a] = [1]', $errorShortListAssign], + ['list("a" => $a) = array("a" => 1)', $errorAssocListAssign], + ]); + } + + return array_merge($invalidExpr, [ + ['list("a" => _) = array("a" => 1)', $errorPhpParserSyntax], + ['["a"] = [1]', $errorNonVariableAssign], + ['[] = []', $errorEmptyList], + ['[,] = [1,2]', $errorEmptyList], + ]); + } + + /** + * @dataProvider validStatements + */ + public function testProcessValidStatement($code) + { + $stmts = $this->parse($code); + $this->traverser->traverse($stmts); + $this->assertTrue(true); + } + + public function validStatements() + { + $validExpr = [ + ['list($a) = array(1)'], + ['list($x, $y) = array(1, 2)'], + ]; + + if (version_compare(PHP_VERSION, '7.1', '>=')) { + return array_merge($validExpr, [ + ['[$a] = array(1)'], + ['list($b) = [2]'], + ['[$x, $y] = array(1, 2)'], + ['[$a] = [1]'], + ['[$x, $y] = [1, 2]'], + ['["_" => $v] = ["_" => 1]'], + ['[$a,] = [1,2,3]'], + ['[,$b] = [1,2,3]'], + ['[$a,,$c] = [1,2,3]'], + ['[$a,,,] = [1,2,3]'], + ]); + } + + return $validExpr; + } +} diff --git a/vendor/psy/psysh/test/CodeCleaner/LoopContextPassTest.php b/vendor/psy/psysh/test/CodeCleaner/LoopContextPassTest.php new file mode 100644 index 00000000..3b363068 --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/LoopContextPassTest.php @@ -0,0 +1,108 @@ +setPass(new LoopContextPass()); + } + + /** + * @dataProvider invalidStatements + * @expectedException \Psy\Exception\FatalErrorException + */ + public function testProcessStatementFails($code) + { + $this->parseAndTraverse($code); + } + + public function invalidStatements() + { + return [ + ['continue'], + ['break'], + ['if (true) { continue; }'], + ['if (true) { break; }'], + ['if (false) { continue; }'], + ['if (false) { break; }'], + ['function foo() { break; }'], + ['function foo() { continue; }'], + + // actually enforce break/continue depth argument + ['do { break 2; } while (true)'], + ['do { continue 2; } while (true)'], + ['for ($a; $b; $c) { break 2; }'], + ['for ($a; $b; $c) { continue 2; }'], + ['foreach ($a as $b) { break 2; }'], + ['foreach ($a as $b) { continue 2; }'], + ['switch (true) { default: break 2; }'], + ['switch (true) { default: continue 2; }'], + ['while (true) { break 2; }'], + ['while (true) { continue 2; }'], + + // In PHP 5.4+, only positive literal integers are allowed + ['while (true) { break $n; }'], + ['while (true) { continue $n; }'], + ['while (true) { break N; }'], + ['while (true) { continue N; }'], + ['while (true) { break 0; }'], + ['while (true) { continue 0; }'], + ['while (true) { break -1; }'], + ['while (true) { continue -1; }'], + ['while (true) { break 1.0; }'], + ['while (true) { continue 1.0; }'], + ['while (true) { break 2.0; }'], + ['while (true) { continue 2.0; }'], + + // and once with nested loops, just for good measure + ['while (true) { while (true) { break 3; } }'], + ['while (true) { while (true) { continue 3; } }'], + ]; + } + + /** + * @dataProvider validStatements + */ + public function testProcessStatementPasses($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validStatements() + { + return [ + ['do { break; } while (true)'], + ['do { continue; } while (true)'], + ['for ($a; $b; $c) { break; }'], + ['for ($a; $b; $c) { continue; }'], + ['foreach ($a as $b) { break; }'], + ['foreach ($a as $b) { continue; }'], + ['switch (true) { default: break; }'], + ['switch (true) { default: continue; }'], + ['while (true) { break; }'], + ['while (true) { continue; }'], + + // `break 1` is redundant, but not invalid + ['while (true) { break 1; }'], + ['while (true) { continue 1; }'], + + // and once with nested loops just for good measure + ['while (true) { while (true) { break 2; } }'], + ['while (true) { while (true) { continue 2; } }'], + ]; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/MagicConstantsPassTest.php b/vendor/psy/psysh/test/CodeCleaner/MagicConstantsPassTest.php similarity index 75% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/MagicConstantsPassTest.php rename to vendor/psy/psysh/test/CodeCleaner/MagicConstantsPassTest.php index 1f78e12d..321ac6ff 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/MagicConstantsPassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/MagicConstantsPassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -30,10 +30,10 @@ class MagicConstantsPassTest extends CodeCleanerTestCase public function magicConstants() { - return array( - array('__DIR__;', 'getcwd();'), - array('__FILE__;', "'';"), - array('___FILE___;', '___FILE___;'), - ); + return [ + ['__DIR__;', 'getcwd();'], + ['__FILE__;', "'';"], + ['___FILE___;', '___FILE___;'], + ]; } } diff --git a/vendor/psy/psysh/test/CodeCleaner/NamespacePassTest.php b/vendor/psy/psysh/test/CodeCleaner/NamespacePassTest.php new file mode 100644 index 00000000..0c28dc6e --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/NamespacePassTest.php @@ -0,0 +1,59 @@ +cleaner = new CodeCleaner(); + $this->setPass(new NamespacePass($this->cleaner)); + } + + public function testProcess() + { + $this->parseAndTraverse(''); + $this->assertNull($this->cleaner->getNamespace()); + + $this->parseAndTraverse('array_merge()'); + $this->assertNull($this->cleaner->getNamespace()); + + // A non-block namespace statement should set the current namespace. + $this->parseAndTraverse('namespace Alpha'); + $this->assertSame(['Alpha'], $this->cleaner->getNamespace()); + + // A new non-block namespace statement should override the current namespace. + $this->parseAndTraverse('namespace Beta; class B {}'); + $this->assertSame(['Beta'], $this->cleaner->getNamespace()); + + // A new block namespace clears out the current namespace... + $this->parseAndTraverse('namespace Gamma { array_merge(); }'); + + if (defined('PhpParser\\Node\\Stmt\\Namespace_::KIND_SEMICOLON')) { + $this->assertNull($this->cleaner->getNamespace()); + } else { + // But not for PHP-Parser < v3.1.2 :( + $this->assertSame(['Gamma'], $this->cleaner->getNamespace()); + } + + $this->parseAndTraverse('namespace Delta'); + + // A null namespace clears out the current namespace. + $this->parseAndTraverse('namespace { array_merge(); }'); + $this->assertNull($this->cleaner->getNamespace()); + } +} diff --git a/vendor/psy/psysh/test/CodeCleaner/NoReturnValueTest.php b/vendor/psy/psysh/test/CodeCleaner/NoReturnValueTest.php new file mode 100644 index 00000000..6a7d009a --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/NoReturnValueTest.php @@ -0,0 +1,32 @@ +assertSame( + $this->prettyPrint($this->parse('new \\Psy\CodeCleaner\\NoReturnValue()')), + $this->prettyPrint([$stmt]) + ); + } +} diff --git a/vendor/psy/psysh/test/CodeCleaner/PassableByReferencePassTest.php b/vendor/psy/psysh/test/CodeCleaner/PassableByReferencePassTest.php new file mode 100644 index 00000000..a73ad471 --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/PassableByReferencePassTest.php @@ -0,0 +1,104 @@ +setPass(new PassableByReferencePass()); + } + + /** + * @dataProvider invalidStatements + * @expectedException \Psy\Exception\FatalErrorException + */ + public function testProcessStatementFails($code) + { + $this->parseAndTraverse($code); + } + + public function invalidStatements() + { + return [ + ['array_pop(array())'], + ['array_pop(array($foo))'], + ['array_shift(array())'], + ]; + } + + /** + * @dataProvider validStatements + */ + public function testProcessStatementPasses($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validStatements() + { + return [ + ['array_pop(json_decode("[]"))'], + ['array_pop($foo)'], + ['array_pop($foo->bar)'], + ['array_pop($foo::baz)'], + ['array_pop(Foo::qux)'], + ]; + } + + /** + * @dataProvider validArrayMultisort + */ + public function testArrayMultisort($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validArrayMultisort() + { + return [ + ['array_multisort($a)'], + ['array_multisort($a, $b)'], + ['array_multisort($a, SORT_NATURAL, $b)'], + ['array_multisort($a, SORT_NATURAL | SORT_FLAG_CASE, $b)'], + ['array_multisort($a, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE, $b)'], + ['array_multisort($a, SORT_NATURAL | SORT_FLAG_CASE, SORT_ASC, $b)'], + ['array_multisort($a, $b, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE)'], + ['array_multisort($a, SORT_NATURAL | SORT_FLAG_CASE, $b, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE)'], + ['array_multisort($a, 1, $b)'], + ['array_multisort($a, 1 + 2, $b)'], + ['array_multisort($a, getMultisortFlags(), $b)'], + ]; + } + + /** + * @dataProvider invalidArrayMultisort + * @expectedException \Psy\Exception\FatalErrorException + */ + public function testInvalidArrayMultisort($code) + { + $this->parseAndTraverse($code); + } + + public function invalidArrayMultisort() + { + return [ + ['array_multisort(1)'], + ['array_multisort(array(1, 2, 3))'], + ['array_multisort($a, SORT_NATURAL, SORT_ASC, SORT_NATURAL, $b)'], + ]; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/RequirePassTest.php b/vendor/psy/psysh/test/CodeCleaner/RequirePassTest.php similarity index 50% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/RequirePassTest.php rename to vendor/psy/psysh/test/CodeCleaner/RequirePassTest.php index c7a68f24..0b7b3bc3 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/RequirePassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/RequirePassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -32,32 +32,25 @@ class RequirePassTest extends CodeCleanerTestCase { $resolve = '\\Psy\\CodeCleaner\\RequirePass::resolve'; - if (version_compare(PHP_VERSION, '5.4', '<')) { - return array( - array('require $foo', "require $resolve(\$foo, 1);"), - array('$bar = require $baz', "\$bar = (require $resolve(\$baz, 1));"), - ); - } - - return array( + return [ // The basics - array('require "a"', "require $resolve(\"a\", 1);"), - array('require "b.php"', "require $resolve(\"b.php\", 1);"), - array('require_once "c"', "require_once $resolve(\"c\", 1);"), - array('require_once "d.php"', "require_once $resolve(\"d.php\", 1);"), + ['require "a"', "require $resolve(\"a\", 1);"], + ['require "b.php"', "require $resolve(\"b.php\", 1);"], + ['require_once "c"', "require_once $resolve(\"c\", 1);"], + ['require_once "d.php"', "require_once $resolve(\"d.php\", 1);"], // Ensure that line numbers work correctly - array("null;\nrequire \"e.php\"", "null;\nrequire $resolve(\"e.php\", 2);"), - array("null;\nrequire_once \"f.php\"", "null;\nrequire_once $resolve(\"f.php\", 2);"), + ["null;\nrequire \"e.php\"", "null;\nrequire $resolve(\"e.php\", 2);"], + ["null;\nrequire_once \"f.php\"", "null;\nrequire_once $resolve(\"f.php\", 2);"], // Things with expressions - array('require $foo', "require $resolve(\$foo, 1);"), - array('require_once $foo', "require_once $resolve(\$foo, 1);"), - array('require ($bar = "g.php")', "require $resolve(\$bar = \"g.php\", 1);"), - array('require_once ($bar = "h.php")', "require_once $resolve(\$bar = \"h.php\", 1);"), - array('$bar = require ($baz = "i.php")', "\$bar = (require $resolve(\$baz = \"i.php\", 1));"), - array('$bar = require_once ($baz = "j.php")', "\$bar = (require_once $resolve(\$baz = \"j.php\", 1));"), - ); + ['require $foo', "require $resolve(\$foo, 1);"], + ['require_once $foo', "require_once $resolve(\$foo, 1);"], + ['require ($bar = "g.php")', "require $resolve(\$bar = \"g.php\", 1);"], + ['require_once ($bar = "h.php")', "require_once $resolve(\$bar = \"h.php\", 1);"], + ['$bar = require ($baz = "i.php")', "\$bar = (require $resolve(\$baz = \"i.php\", 1));"], + ['$bar = require_once ($baz = "j.php")', "\$bar = (require_once $resolve(\$baz = \"j.php\", 1));"], + ]; } /** @@ -86,10 +79,15 @@ class RequirePassTest extends CodeCleanerTestCase public function emptyWarnings() { - return array( - array(null), - array(false), - array(''), - ); + return [ + [null], + [false], + [''], + ]; + } + + public function testResolveWorks() + { + $this->assertEquals(__FILE__, RequirePass::resolve(__FILE__, 3)); } } diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/StrictTypesPassTest.php b/vendor/psy/psysh/test/CodeCleaner/StrictTypesPassTest.php similarity index 74% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/StrictTypesPassTest.php rename to vendor/psy/psysh/test/CodeCleaner/StrictTypesPassTest.php index 8458fc01..ee147824 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/StrictTypesPassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/StrictTypesPassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -36,18 +36,17 @@ class StrictTypesPassTest extends CodeCleanerTestCase * @dataProvider invalidDeclarations * @expectedException \Psy\Exception\FatalErrorException */ - public function testInvalidDeclarations($declaration) + public function testInvalidDeclarations($code) { - $stmts = $this->parse($declaration); - $this->traverser->traverse($stmts); + $this->parseAndTraverse($code); } public function invalidDeclarations() { - return array( - array('declare(strict_types=-1)'), - array('declare(strict_types=2)'), - array('declare(strict_types="foo")'), - ); + return [ + ['declare(strict_types=-1)'], + ['declare(strict_types=2)'], + ['declare(strict_types="foo")'], + ]; } } diff --git a/vendor/psy/psysh/test/CodeCleaner/UseStatementPassTest.php b/vendor/psy/psysh/test/CodeCleaner/UseStatementPassTest.php new file mode 100644 index 00000000..aedfd499 --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/UseStatementPassTest.php @@ -0,0 +1,102 @@ +setPass(new UseStatementPass()); + } + + /** + * @dataProvider useStatements + */ + public function testProcess($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function useStatements() + { + return [ + [ + "use StdClass as NotSoStd;\n\$std = new NotSoStd();", + '$std = new \\StdClass();', + ], + [ + "namespace Foo;\n\nuse StdClass as S;\n\$std = new S();", + "namespace Foo;\n\n\$std = new \\StdClass();", + ], + [ + "namespace Foo;\n\nuse \\StdClass as S;\n\$std = new S();", + "namespace Foo;\n\n\$std = new \\StdClass();", + ], + [ + "use Foo\\Bar as fb;\n\$baz = new fb\\Baz();", + '$baz = new \\Foo\\Bar\\Baz();', + ], + [ + "use Foo\\Bar;\n\$baz = new Bar\\Baz();", + '$baz = new \\Foo\\Bar\\Baz();', + ], + [ + "namespace Foo;\nuse Bar;\n\$baz = new Bar\\Baz();", + "namespace Foo;\n\n\$baz = new \\Bar\\Baz();", + ], + [ + "namespace Foo;\n\nuse \\StdClass as S;\n\$std = new S();\nnamespace Foo;\n\n\$std = new S();", + "namespace Foo;\n\n\$std = new \\StdClass();\nnamespace Foo;\n\n\$std = new \\StdClass();", + ], + [ + "namespace Foo;\n\nuse \\StdClass as S;\n\$std = new S();\nnamespace Bar;\n\n\$std = new S();", + "namespace Foo;\n\n\$std = new \\StdClass();\nnamespace Bar;\n\n\$std = new S();", + ], + [ + "use Foo\\Bar as fb, Qux as Q;\n\$baz = new fb\\Baz();\n\$qux = new Q();", + "\$baz = new \\Foo\\Bar\\Baz();\n\$qux = new \\Qux();", + ], + ]; + } + + /** + * @dataProvider groupUseStatements + */ + public function testGroupUseProcess($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function groupUseStatements() + { + if (version_compare(PHP_VERSION, '7.0', '<')) { + $this->markTestSkipped(); + } + + return [ + [ + "use Foo\\{Bar, Baz, Qux as Q};\n\$bar = new Bar();\n\$baz = new Baz();\n\$qux = new Q();", + "\$bar = new \\Foo\\Bar();\n\$baz = new \\Foo\\Baz();\n\$qux = new \\Foo\\Qux();", + ], + [ + "use X\\{Foo, Bar as B};\n\$foo = new Foo();\n\$baz = new B\\Baz();", + "\$foo = new \\X\\Foo();\n\$baz = new \\X\\Bar\\Baz();", + ], + [ + "use X\\{Foo, Bar as B};\n\$foo = new Foo();\n\$bar = new Bar();\n\$baz = new B\\Baz();", + "\$foo = new \\X\\Foo();\n\$bar = new Bar();\n\$baz = new \\X\\Bar\\Baz();", + ], + ]; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ValidClassNamePassTest.php b/vendor/psy/psysh/test/CodeCleaner/ValidClassNamePassTest.php similarity index 64% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/ValidClassNamePassTest.php rename to vendor/psy/psysh/test/CodeCleaner/ValidClassNamePassTest.php index 6be71072..67b15750 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ValidClassNamePassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/ValidClassNamePassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -12,7 +12,6 @@ namespace Psy\Test\CodeCleaner; use Psy\CodeCleaner\ValidClassNamePass; -use Psy\Exception\Exception; class ValidClassNamePassTest extends CodeCleanerTestCase { @@ -23,103 +22,95 @@ class ValidClassNamePassTest extends CodeCleanerTestCase /** * @dataProvider getInvalid + * @expectedException \Psy\Exception\FatalErrorException */ - public function testProcessInvalid($code, $php54 = false) + public function testProcessInvalid($code) { - try { - $stmts = $this->parse($code); - $this->traverse($stmts); - $this->fail(); - } catch (Exception $e) { - if ($php54 && version_compare(PHP_VERSION, '5.4', '<')) { - $this->assertInstanceOf('Psy\Exception\ParseErrorException', $e); - } else { - $this->assertInstanceOf('Psy\Exception\FatalErrorException', $e); - } - } + $this->parseAndTraverse($code); } public function getInvalid() { // class declarations - return array( + return [ // core class - array('class stdClass {}'), + ['class stdClass {}'], // capitalization - array('class stdClass {}'), + ['class stdClass {}'], // collisions with interfaces and traits - array('interface stdClass {}'), - array('trait stdClass {}', true), + ['interface stdClass {}'], + ['trait stdClass {}'], // collisions inside the same code snippet - array(' + [' class Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} class Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} trait Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} - ', true), - array(' + '], + [' trait Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} class Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} - ', true), - array(' + '], + [' trait Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} interface Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} - ', true), - array(' + '], + [' interface Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} trait Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} - ', true), - array(' + '], + [' interface Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} class Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} interface Psy_Test_CodeCleaner_ValidClassNamePass_Alpha {} - '), + '], // namespaced collisions - array(' + [' namespace Psy\\Test\\CodeCleaner { class ValidClassNamePassTest {} } - '), - array(' + '], + [' namespace Psy\\Test\\CodeCleaner\\ValidClassNamePass { class Beta {} } namespace Psy\\Test\\CodeCleaner\\ValidClassNamePass { class Beta {} } - '), + '], // extends and implements - array('class ValidClassNamePassTest extends NotAClass {}'), - array('class ValidClassNamePassTest extends ArrayAccess {}'), - array('class ValidClassNamePassTest implements stdClass {}'), - array('class ValidClassNamePassTest implements ArrayAccess, stdClass {}'), - array('interface ValidClassNamePassTest extends stdClass {}'), - array('interface ValidClassNamePassTest extends ArrayAccess, stdClass {}'), + ['class ValidClassNamePassTest extends NotAClass {}'], + ['class ValidClassNamePassTest extends ArrayAccess {}'], + ['class ValidClassNamePassTest implements stdClass {}'], + ['class ValidClassNamePassTest implements ArrayAccess, stdClass {}'], + ['interface ValidClassNamePassTest extends stdClass {}'], + ['interface ValidClassNamePassTest extends ArrayAccess, stdClass {}'], // class instantiations - array('new Psy_Test_CodeCleaner_ValidClassNamePass_Gamma();'), - array(' + ['new Psy_Test_CodeCleaner_ValidClassNamePass_Gamma();'], + [' namespace Psy\\Test\\CodeCleaner\\ValidClassNamePass { new Psy_Test_CodeCleaner_ValidClassNamePass_Delta(); } - '), + '], // class constant fetch - array('Psy\\Test\\CodeCleaner\\ValidClassNamePass\\NotAClass::FOO'), + ['Psy\\Test\\CodeCleaner\\ValidClassNamePass\\NotAClass::FOO'], // static call - array('Psy\\Test\\CodeCleaner\\ValidClassNamePass\\NotAClass::foo()'), - array('Psy\\Test\\CodeCleaner\\ValidClassNamePass\\NotAClass::$foo()'), - ); + ['Psy\\Test\\CodeCleaner\\ValidClassNamePass\\NotAClass::foo()'], + ['Psy\\Test\\CodeCleaner\\ValidClassNamePass\\NotAClass::$foo()'], + ['Psy\\Test\\CodeCleaner\\ValidClassNamePassTest::notAMethod()'], + ]; } /** @@ -127,151 +118,148 @@ class ValidClassNamePassTest extends CodeCleanerTestCase */ public function testProcessValid($code) { - $stmts = $this->parse($code); - $this->traverse($stmts); - - // @todo a better thing to assert here? + $this->parseAndTraverse($code); $this->assertTrue(true); } public function getValid() { - $valid = array( + $valid = [ // class declarations - array('class Psy_Test_CodeCleaner_ValidClassNamePass_Epsilon {}'), - array('namespace Psy\Test\CodeCleaner\ValidClassNamePass; class Zeta {}'), - array(' + ['class Psy_Test_CodeCleaner_ValidClassNamePass_Epsilon {}'], + ['namespace Psy\Test\CodeCleaner\ValidClassNamePass; class Zeta {}'], + [' namespace { class Psy_Test_CodeCleaner_ValidClassNamePass_Eta {}; } namespace Psy\\Test\\CodeCleaner\\ValidClassNamePass { class Psy_Test_CodeCleaner_ValidClassNamePass_Eta {} } - '), - array('namespace Psy\Test\CodeCleaner\ValidClassNamePass { class stdClass {} }'), + '], + ['namespace Psy\Test\CodeCleaner\ValidClassNamePass { class stdClass {} }'], // class instantiations - array('new stdClass();'), - array('new stdClass();'), - array(' + ['new stdClass();'], + ['new stdClass();'], + [' namespace Psy\\Test\\CodeCleaner\\ValidClassNamePass { class Theta {} } namespace Psy\\Test\\CodeCleaner\\ValidClassNamePass { new Theta(); } - '), - array(' + '], + [' namespace Psy\\Test\\CodeCleaner\\ValidClassNamePass { class Iota {} new Iota(); } - '), - array(' + '], + [' namespace Psy\\Test\\CodeCleaner\\ValidClassNamePass { class Kappa {} } namespace { new \\Psy\\Test\\CodeCleaner\\ValidClassNamePass\\Kappa(); } - '), + '], // Class constant fetch (ValidConstantPassTest validates the actual constant) - array('class A {} A::FOO'), - array('$a = new DateTime; $a::ATOM'), - array('interface A { const B = 1; } A::B'), + ['class A {} A::FOO'], + ['$a = new DateTime; $a::ATOM'], + ['interface A { const B = 1; } A::B'], // static call - array('DateTime::createFromFormat()'), - array('DateTime::$someMethod()'), - array('Psy\Test\CodeCleaner\Fixtures\ClassWithStatic::doStuff()'), - array('Psy\Test\CodeCleaner\Fixtures\ClassWithCallStatic::doStuff()'), + ['DateTime::createFromFormat()'], + ['DateTime::$someMethod()'], + ['Psy\Test\CodeCleaner\Fixtures\ClassWithStatic::doStuff()'], + ['Psy\Test\CodeCleaner\Fixtures\ClassWithCallStatic::doStuff()'], // Allow `self` and `static` as class names. - array(' + [' class Psy_Test_CodeCleaner_ValidClassNamePass_ClassWithStatic { public static function getInstance() { return new self(); } } - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_ClassWithStatic { public static function getInstance() { return new SELF(); } } - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_ClassWithStatic { public static function getInstance() { return new self; } } - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_ClassWithStatic { public static function getInstance() { return new static(); } } - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_ClassWithStatic { public static function getInstance() { return new Static(); } } - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_ClassWithStatic { public static function getInstance() { return new static; } } - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_ClassWithStatic { public static function foo() { return parent::bar(); } } - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_ClassWithStatic { public static function foo() { return self::bar(); } } - '), - array(' + '], + [' class Psy_Test_CodeCleaner_ValidClassNamePass_ClassWithStatic { public static function foo() { return static::bar(); } } - '), + '], - array('class A { static function b() { return new A; } }'), - array(' + ['class A { static function b() { return new A; } }'], + [' class A { const B = 123; function c() { return A::B; } } - '), - array('class A {} class B { function c() { return new A; } }'), + '], + ['class A {} class B { function c() { return new A; } }'], // recursion - array('class A { function a() { A::a(); } }'), + ['class A { function a() { A::a(); } }'], // conditionally defined classes - array(' + [' class A {} if (false) { class A {} } - '), - array(' + '], + [' class A {} if (true) { class A {} @@ -280,9 +268,9 @@ class ValidClassNamePassTest extends CodeCleanerTestCase } else { class A {} } - '), + '], // ewww - array(' + [' class A {} if (true): class A {} @@ -291,16 +279,16 @@ class ValidClassNamePassTest extends CodeCleanerTestCase else: class A {} endif; - '), - array(' + '], + [' class A {} while (false) { class A {} } - '), - array(' + '], + [' class A {} do { class A {} } while (false); - '), - array(' + '], + [' class A {} switch (1) { case 0: @@ -313,22 +301,22 @@ class ValidClassNamePassTest extends CodeCleanerTestCase class A {} break; } - '), - ); + '], + ]; // Ugh. There's gotta be a better way to test for this. if (class_exists('PhpParser\ParserFactory')) { // PHP 7.0 anonymous classes, only supported by PHP Parser v2.x - $valid[] = array('$obj = new class() {}'); + $valid[] = ['$obj = new class() {}']; } if (version_compare(PHP_VERSION, '5.5', '>=')) { - $valid[] = array('interface A {} A::class'); - $valid[] = array('interface A {} A::CLASS'); - $valid[] = array('class A {} A::class'); - $valid[] = array('class A {} A::CLASS'); - $valid[] = array('A::class'); - $valid[] = array('A::CLASS'); + $valid[] = ['interface A {} A::class']; + $valid[] = ['interface A {} A::CLASS']; + $valid[] = ['class A {} A::class']; + $valid[] = ['class A {} A::CLASS']; + $valid[] = ['A::class']; + $valid[] = ['A::CLASS']; } return $valid; diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ValidConstantPassTest.php b/vendor/psy/psysh/test/CodeCleaner/ValidConstantPassTest.php similarity index 58% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/ValidConstantPassTest.php rename to vendor/psy/psysh/test/CodeCleaner/ValidConstantPassTest.php index c06139c7..a6c52e04 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ValidConstantPassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/ValidConstantPassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,19 +26,18 @@ class ValidConstantPassTest extends CodeCleanerTestCase */ public function testProcessInvalidConstantReferences($code) { - $stmts = $this->parse($code); - $this->traverse($stmts); + $this->parseAndTraverse($code); } public function getInvalidReferences() { - return array( - array('Foo\BAR'), + return [ + ['Foo\BAR'], // class constant fetch - array('Psy\Test\CodeCleaner\ValidConstantPassTest::FOO'), - array('DateTime::BACON'), - ); + ['Psy\Test\CodeCleaner\ValidConstantPassTest::FOO'], + ['DateTime::BACON'], + ]; } /** @@ -46,24 +45,21 @@ class ValidConstantPassTest extends CodeCleanerTestCase */ public function testProcessValidConstantReferences($code) { - $stmts = $this->parse($code); - $this->traverse($stmts); - - // @todo a better thing to assert here? + $this->parseAndTraverse($code); $this->assertTrue(true); } public function getValidReferences() { - return array( - array('PHP_EOL'), + return [ + ['PHP_EOL'], // class constant fetch - array('NotAClass::FOO'), - array('DateTime::ATOM'), - array('$a = new DateTime; $a::ATOM'), - array('DateTime::class'), - array('$a = new DateTime; $a::class'), - ); + ['NotAClass::FOO'], + ['DateTime::ATOM'], + ['$a = new DateTime; $a::ATOM'], + ['DateTime::class'], + ['$a = new DateTime; $a::class'], + ]; } } diff --git a/vendor/psy/psysh/test/CodeCleaner/ValidConstructorPassTest.php b/vendor/psy/psysh/test/CodeCleaner/ValidConstructorPassTest.php new file mode 100644 index 00000000..c0379b26 --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleaner/ValidConstructorPassTest.php @@ -0,0 +1,93 @@ +setPass(new ValidConstructorPass()); + } + + /** + * @dataProvider invalidStatements + * @expectedException \Psy\Exception\FatalErrorException + */ + public function testProcessInvalidStatement($code) + { + $this->parseAndTraverse($code); + } + + /** + * @dataProvider invalidParserStatements + * @expectedException \Psy\Exception\ParseErrorException + */ + public function testProcessInvalidStatementCatchedByParser($code) + { + $this->parseAndTraverse($code); + } + + public function invalidStatements() + { + $data = [ + ['class A { public static function A() {}}'], + ['class A { public static function a() {}}'], + ['class A { private static function A() {}}'], + ['class A { private static function a() {}}'], + ]; + + if (version_compare(PHP_VERSION, '7.0', '>=')) { + $data[] = ['class A { public function A(): ?array {}}']; + $data[] = ['class A { public function a(): ?array {}}']; + } + + return $data; + } + + public function invalidParserStatements() + { + return [ + ['class A { public static function __construct() {}}'], + ['class A { private static function __construct() {}}'], + ['class A { private static function __construct() {} public function A() {}}'], + ['namespace B; class A { private static function __construct() {}}'], + ]; + } + + /** + * @dataProvider validStatements + */ + public function testProcessValidStatement($code) + { + $this->parseAndTraverse($code); + $this->assertTrue(true); + } + + public function validStatements() + { + $data = [ + ['class A { public static function A() {} public function __construct() {}}'], + ['class A { private function __construct() {} public static function A() {}}'], + ['namespace B; class A { private static function A() {}}'], + ]; + + if (version_compare(PHP_VERSION, '7.0', '>=')) { + $data[] = ['class A { public static function A() {} public function __construct() {}}']; + $data[] = ['class A { private function __construct() {} public static function A(): ?array {}}']; + $data[] = ['namespace B; class A { private static function A(): ?array {}}']; + } + + return $data; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ValidFunctionNamePassTest.php b/vendor/psy/psysh/test/CodeCleaner/ValidFunctionNamePassTest.php similarity index 76% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/ValidFunctionNamePassTest.php rename to vendor/psy/psysh/test/CodeCleaner/ValidFunctionNamePassTest.php index 79b51cf2..70a17315 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ValidFunctionNamePassTest.php +++ b/vendor/psy/psysh/test/CodeCleaner/ValidFunctionNamePassTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,40 +26,39 @@ class ValidFunctionNamePassTest extends CodeCleanerTestCase */ public function testProcessInvalidFunctionCallsAndDeclarations($code) { - $stmts = $this->parse($code); - $this->traverse($stmts); + $this->parseAndTraverse($code); } public function getInvalidFunctions() { - return array( + return [ // function declarations - array('function array_merge() {}'), - array('function Array_Merge() {}'), - array(' + ['function array_merge() {}'], + ['function Array_Merge() {}'], + [' function psy_test_codecleaner_validfunctionnamepass_alpha() {} function psy_test_codecleaner_validfunctionnamepass_alpha() {} - '), - array(' + '], + [' namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { function beta() {} } namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { function beta() {} } - '), + '], // function calls - array('psy_test_codecleaner_validfunctionnamepass_gamma()'), - array(' + ['psy_test_codecleaner_validfunctionnamepass_gamma()'], + [' namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { delta(); } - '), + '], // recursion - array('function a() { a(); } function a() {}'), - ); + ['function a() { a(); } function a() {}'], + ]; } /** @@ -67,76 +66,73 @@ class ValidFunctionNamePassTest extends CodeCleanerTestCase */ public function testProcessValidFunctionCallsAndDeclarations($code) { - $stmts = $this->parse($code); - $this->traverse($stmts); - - // @todo a better thing to assert here? + $this->parseAndTraverse($code); $this->assertTrue(true); } public function getValidFunctions() { - return array( - array('function psy_test_codecleaner_validfunctionnamepass_epsilon() {}'), - array(' + return [ + ['function psy_test_codecleaner_validfunctionnamepass_epsilon() {}'], + [' namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { function zeta() {} } - '), - array(' + '], + [' namespace { function psy_test_codecleaner_validfunctionnamepass_eta() {} } namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { function psy_test_codecleaner_validfunctionnamepass_eta() {} } - '), - array(' + '], + [' namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { function psy_test_codecleaner_validfunctionnamepass_eta() {} } namespace { function psy_test_codecleaner_validfunctionnamepass_eta() {} } - '), - array(' + '], + [' namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { function array_merge() {} } - '), + '], // function calls - array('array_merge();'), - array(' + ['array_merge();'], + [' namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { function theta() {} } namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { theta(); } - '), + '], // closures - array('$test = function(){};$test()'), - array(' + ['$test = function(){};$test()'], + [' namespace Psy\\Test\\CodeCleaner\\ValidFunctionNamePass { function theta() {} } namespace { Psy\\Test\\CodeCleaner\\ValidFunctionNamePass\\theta(); } - '), + '], // recursion - array('function a() { a(); }'), + ['function a() { a(); }'], // conditionally defined functions - array(' + [' function a() {} if (false) { function a() {} } - '), - array(' + '], + [' function a() {} if (true) { function a() {} @@ -145,9 +141,9 @@ class ValidFunctionNamePassTest extends CodeCleanerTestCase } else { function a() {} } - '), + '], // ewww - array(' + [' function a() {} if (true): function a() {} @@ -156,16 +152,16 @@ class ValidFunctionNamePassTest extends CodeCleanerTestCase else: function a() {} endif; - '), - array(' + '], + [' function a() {} while (false) { function a() {} } - '), - array(' + '], + [' function a() {} do { function a() {} } while (false); - '), - array(' + '], + [' function a() {} switch (1) { case 0: @@ -178,7 +174,7 @@ class ValidFunctionNamePassTest extends CodeCleanerTestCase function a() {} break; } - '), - ); + '], + ]; } } diff --git a/vendor/psy/psysh/test/CodeCleanerTest.php b/vendor/psy/psysh/test/CodeCleanerTest.php new file mode 100644 index 00000000..40ec6b42 --- /dev/null +++ b/vendor/psy/psysh/test/CodeCleanerTest.php @@ -0,0 +1,131 @@ +assertSame($expected, $cc->clean($lines, $requireSemicolons)); + } + + public function semicolonCodeProvider() + { + return [ + [['true'], false, 'return true;'], + [['true;'], false, 'return true;'], + [['true;'], true, 'return true;'], + [['true'], true, false], + + [['echo "foo";', 'true'], true, false], + + [['echo "foo";', 'true'], false, "echo \"foo\";\nreturn true;"], + ]; + } + + /** + * @dataProvider unclosedStatementsProvider + */ + public function testUnclosedStatements(array $lines, $isUnclosed) + { + $cc = new CodeCleaner(); + $res = $cc->clean($lines); + + if ($isUnclosed) { + $this->assertFalse($res); + } else { + $this->assertNotFalse($res); + } + } + + public function unclosedStatementsProvider() + { + return [ + [['echo "'], true], + [['echo \''], true], + [['if (1) {'], true], + + [['echo "foo",'], true], + + [['echo ""'], false], + [["echo ''"], false], + [['if (1) {}'], false], + + [['// closed comment'], false], + [['function foo() { /**'], true], + + [['var_dump(1, 2,'], true], + [['var_dump(1, 2,', '3)'], false], + ]; + } + + /** + * @dataProvider moreUnclosedStatementsProvider + */ + public function testMoreUnclosedStatements(array $lines) + { + if (defined('HHVM_VERSION')) { + $this->markTestSkipped('HHVM not supported.'); + } + + $cc = new CodeCleaner(); + $res = $cc->clean($lines); + + $this->assertFalse($res); + } + + public function moreUnclosedStatementsProvider() + { + return [ + [["\$content = <<clean([$code]); + } + + public function invalidStatementsProvider() + { + // n.b. We used to check that `var_dump(1,2,)` failed, but PHP Parser + // 4.x backported trailing comma function calls from PHP 7.3 for free! + // so we're not going to spend too much time worrying about it :) + + return [ + ['function "what'], + ["function 'what"], + ['echo }'], + ['echo {'], + ['if (1) }'], + ['echo """'], + ["echo '''"], + ['$foo "bar'], + ['$foo \'bar'], + ]; + } +} diff --git a/vendor/psy/psysh/test/Command/ExitCommandTest.php b/vendor/psy/psysh/test/Command/ExitCommandTest.php new file mode 100644 index 00000000..45626be2 --- /dev/null +++ b/vendor/psy/psysh/test/Command/ExitCommandTest.php @@ -0,0 +1,29 @@ +execute([]); + } +} diff --git a/vendor/psy/psysh/test/Command/ThrowUpCommandTest.php b/vendor/psy/psysh/test/Command/ThrowUpCommandTest.php new file mode 100644 index 00000000..511c5809 --- /dev/null +++ b/vendor/psy/psysh/test/Command/ThrowUpCommandTest.php @@ -0,0 +1,89 @@ +getMockBuilder('Psy\\Shell') + ->setMethods(['hasCode', 'addCode']) + ->getMock(); + + $shell->expects($this->once())->method('hasCode')->willReturn($hasCode); + $shell->expects($this->once()) + ->method('addCode') + ->with($this->equalTo($expect), $this->equalTo($addSilent)); + + $command = new ThrowUpCommand(); + $command->setApplication($shell); + $tester = new CommandTester($command); + $tester->execute($args); + $this->assertEquals('', $tester->getDisplay()); + } + + public function executeThis() + { + $throw = 'throw \Psy\Exception\ThrowUpException::fromThrowable'; + + return [ + [[], false, $throw . '($_e);'], + + [['exception' => '$ex'], false, $throw . '($ex);'], + [['exception' => 'getException()'], false, $throw . '(getException());'], + [['exception' => 'new \\Exception("WAT")'], false, $throw . '(new \\Exception("WAT"));'], + + [['exception' => '\'some string\''], false, $throw . '(new \\Exception(\'some string\'));'], + [['exception' => '"WHEEEEEEE!"'], false, $throw . '(new \\Exception("WHEEEEEEE!"));'], + + // Everything should work with or without semicolons. + [['exception' => '$ex;'], false, $throw . '($ex);'], + [['exception' => '"WHEEEEEEE!";'], false, $throw . '(new \\Exception("WHEEEEEEE!"));'], + + // Don't add as silent code if we've already got code. + [[], true, $throw . '($_e);', false], + [['exception' => 'getException()'], true, $throw . '(getException());', false], + [['exception' => '\'some string\''], true, $throw . '(new \\Exception(\'some string\'));', false], + ]; + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage No idea how to throw this + */ + public function testMultipleArgsThrowsException() + { + $command = new ThrowUpCommand(); + $command->setApplication(new Shell()); + $tester = new CommandTester($command); + $tester->execute(['exception' => 'foo(); bar()']); + } + + /** + * @expectedException \PhpParser\Error + * @expectedExceptionMessage Syntax error, unexpected ')' on line 1 + */ + public function testParseErrorThrowsException() + { + $command = new ThrowUpCommand(); + $command->setApplication(new Shell()); + $tester = new CommandTester($command); + $tester->execute(['exception' => 'foo)']); + } +} diff --git a/vendor/psy/psysh/test/Command/TimeitCommand/TimeitVisitorTest.php b/vendor/psy/psysh/test/Command/TimeitCommand/TimeitVisitorTest.php new file mode 100644 index 00000000..1f317350 --- /dev/null +++ b/vendor/psy/psysh/test/Command/TimeitCommand/TimeitVisitorTest.php @@ -0,0 +1,52 @@ +traverser = new NodeTraverser(); + $this->traverser->addVisitor(new TimeitVisitor()); + } + + /** + * @dataProvider codez + */ + public function testProcess($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function codez() + { + $start = '\Psy\Command\TimeitCommand::markStart'; + $end = '\Psy\Command\TimeitCommand::markEnd'; + $noReturn = 'new \Psy\CodeCleaner\NoReturnValue()'; + + return [ + ['', "$end($start());"], // heh + ['a()', "$start(); $end(a());"], + ['$b()', "$start(); $end(\$b());"], + ['$c->d()', "$start(); $end(\$c->d());"], + ['e(); f()', "$start(); e(); $end(f());"], + ['function g() { return 1; }', "$start(); function g() {return 1;} $end($noReturn);"], + ['return 1', "$start(); return $end(1);"], + ['return 1; 2', "$start(); return $end(1); $end(2);"], + ['return 1; function h() {}', "$start(); return $end(1); function h() {} $end($noReturn);"], + ]; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/ConfigurationTest.php b/vendor/psy/psysh/test/ConfigurationTest.php similarity index 67% rename from vendor/psy/psysh/test/Psy/Test/ConfigurationTest.php rename to vendor/psy/psysh/test/ConfigurationTest.php index e4d9936d..a250d834 100644 --- a/vendor/psy/psysh/test/Psy/Test/ConfigurationTest.php +++ b/vendor/psy/psysh/test/ConfigurationTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ namespace Psy\Test; use Psy\CodeCleaner; use Psy\Configuration; -use Psy\ExecutionLoop\Loop; use Psy\Output\PassthruPager; use Psy\VersionUpdater\GitHubChecker; use Symfony\Component\Console\Output\ConsoleOutput; @@ -22,19 +21,19 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase { private function getConfig($configFile = null) { - return new Configuration(array( - 'configFile' => $configFile ?: __DIR__ . '/../../fixtures/empty.php', - )); + return new Configuration([ + 'configFile' => $configFile ?: __DIR__ . '/fixtures/empty.php', + ]); } public function testDefaults() { $config = $this->getConfig(); - $this->assertEquals(function_exists('readline'), $config->hasReadline()); - $this->assertEquals(function_exists('readline'), $config->useReadline()); - $this->assertEquals(function_exists('pcntl_signal'), $config->hasPcntl()); - $this->assertEquals(function_exists('pcntl_signal'), $config->usePcntl()); + $this->assertSame(function_exists('readline'), $config->hasReadline()); + $this->assertSame(function_exists('readline'), $config->useReadline()); + $this->assertSame(function_exists('pcntl_signal'), $config->hasPcntl()); + $this->assertSame(function_exists('pcntl_signal'), $config->usePcntl()); $this->assertFalse($config->requireSemicolons()); $this->assertSame(Configuration::COLOR_MODE_AUTO, $config->colorMode()); $this->assertNull($config->getStartupMessage()); @@ -46,11 +45,11 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase $this->assertNull($config->getDataDir()); $config->setDataDir('wheee'); - $this->assertEquals('wheee', $config->getDataDir()); + $this->assertSame('wheee', $config->getDataDir()); $this->assertNull($config->getConfigDir()); $config->setConfigDir('wheee'); - $this->assertEquals('wheee', $config->getConfigDir()); + $this->assertSame('wheee', $config->getConfigDir()); } /** @@ -62,37 +61,37 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase putenv("HOME=$home"); $config = new Configuration(); - $this->assertEquals(realpath($configFile), realpath($config->getConfigFile())); - $this->assertEquals(realpath($historyFile), realpath($config->getHistoryFile())); - $this->assertEquals(realpath($manualDbFile), realpath($config->getManualDbFile())); + $this->assertSame(realpath($configFile), realpath($config->getConfigFile())); + $this->assertSame(realpath($historyFile), realpath($config->getHistoryFile())); + $this->assertSame(realpath($manualDbFile), realpath($config->getManualDbFile())); putenv("HOME=$oldHome"); } public function directories() { - $base = realpath(__DIR__ . '/../../fixtures'); + $base = realpath(__DIR__ . '/fixtures'); - return array( - array( + return [ + [ $base . '/default', $base . '/default/.config/psysh/config.php', $base . '/default/.config/psysh/psysh_history', $base . '/default/.local/share/psysh/php_manual.sqlite', - ), - array( + ], + [ $base . '/legacy', $base . '/legacy/.psysh/rc.php', $base . '/legacy/.psysh/history', $base . '/legacy/.psysh/php_manual.sqlite', - ), - array( + ], + [ $base . '/mixed', $base . '/mixed/.psysh/config.php', $base . '/mixed/.psysh/psysh_history', null, - ), - ); + ], + ]; } public function testLoadConfig() @@ -100,34 +99,31 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase $config = $this->getConfig(); $cleaner = new CodeCleaner(); $pager = new PassthruPager(new ConsoleOutput()); - $loop = new Loop($config); - $config->loadConfig(array( + $config->loadConfig([ 'useReadline' => false, 'usePcntl' => false, 'codeCleaner' => $cleaner, 'pager' => $pager, - 'loop' => $loop, 'requireSemicolons' => true, 'errorLoggingLevel' => E_ERROR | E_WARNING, 'colorMode' => Configuration::COLOR_MODE_FORCED, 'startupMessage' => 'Psysh is awesome!', - )); + ]); $this->assertFalse($config->useReadline()); $this->assertFalse($config->usePcntl()); $this->assertSame($cleaner, $config->getCodeCleaner()); $this->assertSame($pager, $config->getPager()); - $this->assertSame($loop, $config->getLoop()); $this->assertTrue($config->requireSemicolons()); - $this->assertEquals(E_ERROR | E_WARNING, $config->errorLoggingLevel()); + $this->assertSame(E_ERROR | E_WARNING, $config->errorLoggingLevel()); $this->assertSame(Configuration::COLOR_MODE_FORCED, $config->colorMode()); $this->assertSame('Psysh is awesome!', $config->getStartupMessage()); } public function testLoadConfigFile() { - $config = $this->getConfig(__DIR__ . '/../../fixtures/config.php'); + $config = $this->getConfig(__DIR__ . '/fixtures/config.php'); $runtimeDir = $this->joinPath(realpath(sys_get_temp_dir()), 'psysh_test', 'withconfig', 'temp'); @@ -135,27 +131,27 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase $this->assertStringStartsWith($runtimeDir, realpath(dirname($config->getPipe('pipe', 123)))); $this->assertStringStartsWith($runtimeDir, realpath($config->getRuntimeDir())); - $this->assertEquals(function_exists('readline'), $config->useReadline()); + $this->assertSame(function_exists('readline'), $config->useReadline()); $this->assertFalse($config->usePcntl()); - $this->assertEquals(E_ALL & ~E_NOTICE, $config->errorLoggingLevel()); + $this->assertSame(E_ALL & ~E_NOTICE, $config->errorLoggingLevel()); } public function testLoadLocalConfigFile() { $oldPwd = getcwd(); - chdir(realpath(__DIR__ . '/../../fixtures/project/')); + chdir(realpath(__DIR__ . '/fixtures/project/')); $config = new Configuration(); // When no configuration file is specified local project config is merged - $this->assertFalse($config->useReadline()); - $this->assertTrue($config->usePcntl()); + $this->assertTrue($config->requireSemicolons()); + $this->assertFalse($config->useUnicode()); - $config = new Configuration(array('configFile' => __DIR__ . '/../../fixtures/config.php')); + $config = new Configuration(['configFile' => __DIR__ . '/fixtures/config.php']); // Defining a configuration file skips loading local project config - $this->assertTrue($config->useReadline()); - $this->assertFalse($config->usePcntl()); + $this->assertFalse($config->requireSemicolons()); + $this->assertTrue($config->useUnicode()); chdir($oldPwd); } @@ -165,7 +161,7 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase */ public function testBaseDirConfigIsDeprecated() { - $config = new Configuration(array('baseDir' => 'fake')); + $config = new Configuration(['baseDir' => 'fake']); } private function joinPath() @@ -175,14 +171,14 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase public function testConfigIncludes() { - $config = new Configuration(array( - 'defaultIncludes' => array('/file.php'), - 'configFile' => __DIR__ . '/../../fixtures/empty.php', - )); + $config = new Configuration([ + 'defaultIncludes' => ['/file.php'], + 'configFile' => __DIR__ . '/fixtures/empty.php', + ]); $includes = $config->getDefaultIncludes(); $this->assertCount(1, $includes); - $this->assertEquals('/file.php', $includes[0]); + $this->assertSame('/file.php', $includes[0]); } public function testGetOutput() @@ -190,25 +186,25 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase $config = $this->getConfig(); $output = $config->getOutput(); - $this->assertInstanceOf('\Psy\Output\ShellOutput', $output); + $this->assertInstanceOf('Psy\Output\ShellOutput', $output); } public function getOutputDecoratedProvider() { - return array( - 'auto' => array( + return [ + 'auto' => [ null, Configuration::COLOR_MODE_AUTO, - ), - 'forced' => array( + ], + 'forced' => [ true, Configuration::COLOR_MODE_FORCED, - ), - 'disabled' => array( + ], + 'disabled' => [ false, Configuration::COLOR_MODE_DISABLED, - ), - ); + ], + ]; } /** @dataProvider getOutputDecoratedProvider */ @@ -222,11 +218,11 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase public function setColorModeValidProvider() { - return array( - 'auto' => array(Configuration::COLOR_MODE_AUTO), - 'forced' => array(Configuration::COLOR_MODE_FORCED), - 'disabled' => array(Configuration::COLOR_MODE_DISABLED), - ); + return [ + 'auto' => [Configuration::COLOR_MODE_AUTO], + 'forced' => [Configuration::COLOR_MODE_FORCED], + 'disabled' => [Configuration::COLOR_MODE_DISABLED], + ]; } /** @dataProvider setColorModeValidProvider */ @@ -235,7 +231,7 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase $config = $this->getConfig(); $config->setColorMode($colorMode); - $this->assertEquals($colorMode, $config->colorMode()); + $this->assertSame($colorMode, $config->colorMode()); } /** diff --git a/vendor/psy/psysh/test/Psy/Test/ConsoleColorFactoryTest.php b/vendor/psy/psysh/test/ConsoleColorFactoryTest.php similarity index 84% rename from vendor/psy/psysh/test/Psy/Test/ConsoleColorFactoryTest.php rename to vendor/psy/psysh/test/ConsoleColorFactoryTest.php index 3da13c7b..d58a48d3 100644 --- a/vendor/psy/psysh/test/Psy/Test/ConsoleColorFactoryTest.php +++ b/vendor/psy/psysh/test/ConsoleColorFactoryTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -24,7 +24,7 @@ class ConsoleColorFactoryTest extends \PHPUnit\Framework\TestCase $themes = $colors->getThemes(); $this->assertFalse($colors->isStyleForced()); - $this->assertEquals(array('blue'), $themes['line_number']); + $this->assertSame(['blue'], $themes['line_number']); } public function testGetConsoleColorForced() @@ -35,7 +35,7 @@ class ConsoleColorFactoryTest extends \PHPUnit\Framework\TestCase $themes = $colors->getThemes(); $this->assertTrue($colors->isStyleForced()); - $this->assertEquals(array('blue'), $themes['line_number']); + $this->assertSame(['blue'], $themes['line_number']); } public function testGetConsoleColorDisabled() @@ -46,6 +46,6 @@ class ConsoleColorFactoryTest extends \PHPUnit\Framework\TestCase $themes = $colors->getThemes(); $this->assertFalse($colors->isStyleForced()); - $this->assertEquals(array('none'), $themes['line_number']); + $this->assertSame(['none'], $themes['line_number']); } } diff --git a/vendor/psy/psysh/test/ContextTest.php b/vendor/psy/psysh/test/ContextTest.php new file mode 100644 index 00000000..0b8b6dc8 --- /dev/null +++ b/vendor/psy/psysh/test/ContextTest.php @@ -0,0 +1,325 @@ +assertTrue(true); + } + + public function testGetAll() + { + $this->assertTrue(true); + } + + public function testGetSpecialVariables() + { + $context = new Context(); + + $this->assertNull($context->get('_')); + $this->assertNull($context->getReturnValue()); + + $this->assertEquals(['_' => null], $context->getAll()); + + $e = new \Exception('eeeeeee'); + $obj = new \StdClass(); + $context->setLastException($e); + $context->setLastStdout('out'); + $context->setBoundObject($obj); + + $context->setCommandScopeVariables([ + '__function' => 'function', + '__method' => 'method', + '__class' => 'class', + '__namespace' => 'namespace', + '__file' => 'file', + '__line' => 'line', + '__dir' => 'dir', + ]); + + $expected = [ + '_' => null, + '_e' => $e, + '__out' => 'out', + 'this' => $obj, + '__function' => 'function', + '__method' => 'method', + '__class' => 'class', + '__namespace' => 'namespace', + '__file' => 'file', + '__line' => 'line', + '__dir' => 'dir', + ]; + + $this->assertEquals($expected, $context->getAll()); + } + + public function testSetAll() + { + $context = new Context(); + + $baz = new \StdClass(); + $vars = [ + 'foo' => 'Foo', + 'bar' => 123, + 'baz' => $baz, + + '_' => 'fail', + '_e' => 'fail', + '__out' => 'fail', + 'this' => 'fail', + '__psysh__' => 'fail', + + '__function' => 'fail', + '__method' => 'fail', + '__class' => 'fail', + '__namespace' => 'fail', + '__file' => 'fail', + '__line' => 'fail', + '__dir' => 'fail', + ]; + + $context->setAll($vars); + + $this->assertEquals('Foo', $context->get('foo')); + $this->assertEquals(123, $context->get('bar')); + $this->assertSame($baz, $context->get('baz')); + + $this->assertEquals(['foo' => 'Foo', 'bar' => 123, 'baz' => $baz, '_' => null], $context->getAll()); + } + + /** + * @dataProvider specialNames + * @expectedException \InvalidArgumentException + * @expectedExceptionMessageRegEx /Unknown variable: \$\w+/ + */ + public function testSetAllDoesNotSetSpecial($name) + { + $context = new Context(); + $context->setAll([$name => 'fail']); + $context->get($name); + } + + public function specialNames() + { + return [ + ['_e'], + ['__out'], + ['this'], + ['__psysh__'], + ['__function'], + ['__method'], + ['__class'], + ['__namespace'], + ['__file'], + ['__line'], + ['__dir'], + ]; + } + + public function testReturnValue() + { + $context = new Context(); + $this->assertNull($context->getReturnValue()); + + $val = 'some string'; + $context->setReturnValue($val); + $this->assertEquals($val, $context->getReturnValue()); + $this->assertEquals($val, $context->get('_')); + + $obj = new \StdClass(); + $context->setReturnValue($obj); + $this->assertSame($obj, $context->getReturnValue()); + $this->assertSame($obj, $context->get('_')); + + $context->setReturnValue(null); + $this->assertNull($context->getReturnValue()); + } + + public function testLastException() + { + $context = new Context(); + $e = new \Exception('wat'); + $context->setLastException($e); + $this->assertSame($e, $context->getLastException()); + $this->assertSame($e, $context->get('_e')); + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage No most-recent exception + */ + public function testLastExceptionThrowsSometimes() + { + $context = new Context(); + $context->getLastException(); + } + + public function testLastStdout() + { + $context = new Context(); + $context->setLastStdout('ouuuuut'); + $this->assertEquals('ouuuuut', $context->getLastStdout()); + $this->assertEquals('ouuuuut', $context->get('__out')); + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage No most-recent output + */ + public function testLastStdoutThrowsSometimes() + { + $context = new Context(); + $context->getLastStdout(); + } + + public function testBoundObject() + { + $context = new Context(); + $this->assertNull($context->getBoundObject()); + + $obj = new \StdClass(); + $context->setBoundObject($obj); + $this->assertSame($obj, $context->getBoundObject()); + $this->assertSame($obj, $context->get('this')); + + $context->setBoundObject(null); + $this->assertNull($context->getBoundObject()); + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage Unknown variable: $this + */ + public function testBoundObjectThrowsSometimes() + { + $context = new Context(); + $context->get('this'); + } + + public function testBoundClass() + { + $context = new Context(); + $this->assertNull($context->getBoundClass()); + + $context->setBoundClass(''); + $this->assertNull($context->getBoundClass()); + + $context->setBoundClass('Psy\Shell'); + $this->assertEquals('Psy\Shell', $context->getBoundClass()); + + $context->setBoundObject(new \StdClass()); + $this->assertNotNull($context->getBoundObject()); + $this->assertNull($context->getBoundClass()); + + $context->setBoundClass('Psy\Shell'); + $this->assertEquals('Psy\Shell', $context->getBoundClass()); + $this->assertNull($context->getBoundObject()); + + $context->setBoundClass(null); + $this->assertNull($context->getBoundClass()); + $this->assertNull($context->getBoundObject()); + } + + public function testCommandScopeVariables() + { + $__function = 'donkey'; + $__method = 'diddy'; + $__class = 'cranky'; + $__namespace = 'funky'; + $__file = 'candy'; + $__line = 'dixie'; + $__dir = 'wrinkly'; + + $vars = compact('__function', '__method', '__class', '__namespace', '__file', '__line', '__dir'); + + $context = new Context(); + $context->setCommandScopeVariables($vars); + + $this->assertEquals($vars, $context->getCommandScopeVariables()); + + $this->assertEquals($__function, $context->get('__function')); + $this->assertEquals($__method, $context->get('__method')); + $this->assertEquals($__class, $context->get('__class')); + $this->assertEquals($__namespace, $context->get('__namespace')); + $this->assertEquals($__file, $context->get('__file')); + $this->assertEquals($__line, $context->get('__line')); + $this->assertEquals($__dir, $context->get('__dir')); + + $someVars = compact('__function', '__namespace', '__file', '__line', '__dir'); + $context->setCommandScopeVariables($someVars); + } + + public function testGetUnusedCommandScopeVariableNames() + { + $context = new Context(); + + $this->assertEquals( + ['__function', '__method', '__class', '__namespace', '__file', '__line', '__dir'], + $context->getUnusedCommandScopeVariableNames() + ); + + $context->setCommandScopeVariables([ + '__function' => 'foo', + '__namespace' => 'bar', + '__file' => 'baz', + '__line' => 123, + '__dir' => 'qux', + ]); + + $this->assertEquals( + ['__method', '__class'], + array_values($context->getUnusedCommandScopeVariableNames()) + ); + } + + /** + * @dataProvider specialAndNotSpecialVariableNames + */ + public function testIsSpecialVariableName($name, $isSpecial) + { + $context = new Context(); + + if ($isSpecial) { + $this->assertTrue($context->isSpecialVariableName($name)); + } else { + $this->assertFalse($context->isSpecialVariableName($name)); + } + } + + public function specialAndNotSpecialVariableNames() + { + return [ + ['foo', false], + ['psysh', false], + ['__psysh', false], + + ['_', true], + ['_e', true], + ['__out', true], + ['this', true], + ['__psysh__', true], + + ['__function', true], + ['__method', true], + ['__class', true], + ['__namespace', true], + ['__file', true], + ['__line', true], + ['__dir', true], + ]; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/Exception/BreakExceptionTest.php b/vendor/psy/psysh/test/Exception/BreakExceptionTest.php similarity index 56% rename from vendor/psy/psysh/test/Psy/Test/Exception/BreakExceptionTest.php rename to vendor/psy/psysh/test/Exception/BreakExceptionTest.php index fb094985..ae39fb1f 100644 --- a/vendor/psy/psysh/test/Psy/Test/Exception/BreakExceptionTest.php +++ b/vendor/psy/psysh/test/Exception/BreakExceptionTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -12,7 +12,6 @@ namespace Psy\Test\Exception; use Psy\Exception\BreakException; -use Psy\Exception\Exception; class BreakExceptionTest extends \PHPUnit\Framework\TestCase { @@ -20,8 +19,8 @@ class BreakExceptionTest extends \PHPUnit\Framework\TestCase { $e = new BreakException(); - $this->assertTrue($e instanceof Exception); - $this->assertTrue($e instanceof BreakException); + $this->assertInstanceOf('Psy\Exception\Exception', $e); + $this->assertInstanceOf('Psy\Exception\BreakException', $e); } public function testMessage() @@ -29,6 +28,15 @@ class BreakExceptionTest extends \PHPUnit\Framework\TestCase $e = new BreakException('foo'); $this->assertContains('foo', $e->getMessage()); - $this->assertEquals('foo', $e->getRawMessage()); + $this->assertSame('foo', $e->getRawMessage()); + } + + /** + * @expectedException \Psy\Exception\BreakException + * @expectedExceptionMessage Goodbye + */ + public function testExitShell() + { + BreakException::exitShell(); } } diff --git a/vendor/psy/psysh/test/Psy/Test/Exception/ErrorExceptionTest.php b/vendor/psy/psysh/test/Exception/ErrorExceptionTest.php similarity index 57% rename from vendor/psy/psysh/test/Psy/Test/Exception/ErrorExceptionTest.php rename to vendor/psy/psysh/test/Exception/ErrorExceptionTest.php index 4bc7f555..e66319b9 100644 --- a/vendor/psy/psysh/test/Psy/Test/Exception/ErrorExceptionTest.php +++ b/vendor/psy/psysh/test/Exception/ErrorExceptionTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -12,7 +12,6 @@ namespace Psy\Test\Exception; use Psy\Exception\ErrorException; -use Psy\Exception\Exception; class ErrorExceptionTest extends \PHPUnit\Framework\TestCase { @@ -20,9 +19,9 @@ class ErrorExceptionTest extends \PHPUnit\Framework\TestCase { $e = new ErrorException(); - $this->assertTrue($e instanceof Exception); - $this->assertTrue($e instanceof \ErrorException); - $this->assertTrue($e instanceof ErrorException); + $this->assertInstanceOf('Psy\Exception\Exception', $e); + $this->assertInstanceOf('ErrorException', $e); + $this->assertInstanceOf('Psy\Exception\ErrorException', $e); } public function testMessage() @@ -30,7 +29,7 @@ class ErrorExceptionTest extends \PHPUnit\Framework\TestCase $e = new ErrorException('foo'); $this->assertContains('foo', $e->getMessage()); - $this->assertEquals('foo', $e->getRawMessage()); + $this->assertSame('foo', $e->getRawMessage()); } /** @@ -59,14 +58,17 @@ class ErrorExceptionTest extends \PHPUnit\Framework\TestCase public function getLevels() { - return array( - array(E_WARNING, 'Warning'), - array(E_CORE_WARNING, 'Warning'), - array(E_COMPILE_WARNING, 'Warning'), - array(E_USER_WARNING, 'Warning'), - array(E_STRICT, 'Strict error'), - array(0, 'Error'), - ); + return [ + [E_WARNING, 'Warning'], + [E_CORE_WARNING, 'Warning'], + [E_COMPILE_WARNING, 'Warning'], + [E_USER_WARNING, 'Warning'], + [E_STRICT, 'Strict error'], + [E_DEPRECATED, 'Deprecated'], + [E_USER_DEPRECATED, 'Deprecated'], + [E_RECOVERABLE_ERROR, 'Recoverable fatal error'], + [0, 'Error'], + ]; } /** @@ -74,7 +76,7 @@ class ErrorExceptionTest extends \PHPUnit\Framework\TestCase */ public function testThrowExceptionAsErrorHandler($level, $type) { - set_error_handler(array('Psy\Exception\ErrorException', 'throwException')); + set_error_handler(['Psy\Exception\ErrorException', 'throwException']); try { trigger_error('{whot}', $level); } catch (ErrorException $e) { @@ -86,23 +88,38 @@ class ErrorExceptionTest extends \PHPUnit\Framework\TestCase public function getUserLevels() { - return array( - array(E_USER_ERROR, 'Error'), - array(E_USER_WARNING, 'Warning'), - array(E_USER_NOTICE, 'Notice'), - array(E_USER_DEPRECATED, 'Deprecated'), - ); + return [ + [E_USER_ERROR, 'Error'], + [E_USER_WARNING, 'Warning'], + [E_USER_NOTICE, 'Notice'], + [E_USER_DEPRECATED, 'Deprecated'], + ]; } public function testIgnoreExecutionLoopFilename() { - $e = new ErrorException('{{message}}', 0, 1, '/fake/path/to/Psy/ExecutionLoop/Loop.php'); + $e = new ErrorException('{{message}}', 0, 1, '/fake/path/to/Psy/ExecutionLoop.php'); $this->assertEmpty($e->getFile()); - $e = new ErrorException('{{message}}', 0, 1, 'c:\fake\path\to\Psy\ExecutionLoop\Loop.php'); + $e = new ErrorException('{{message}}', 0, 1, 'c:\fake\path\to\Psy\ExecutionLoop.php'); $this->assertEmpty($e->getFile()); $e = new ErrorException('{{message}}', 0, 1, '/fake/path/to/Psy/File.php'); $this->assertNotEmpty($e->getFile()); } + + public function testFromError() + { + if (version_compare(PHP_VERSION, '7.0.0', '<')) { + $this->markTestSkipped(); + } + + $error = new \Error('{{message}}', 0); + $exception = ErrorException::fromError($error); + + $this->assertContains('PHP Error: {{message}}', $exception->getMessage()); + $this->assertEquals(0, $exception->getCode()); + $this->assertEquals($error->getFile(), $exception->getFile()); + $this->assertSame($exception->getPrevious(), $error); + } } diff --git a/vendor/psy/psysh/test/Psy/Test/Exception/FatalErrorExceptionTest.php b/vendor/psy/psysh/test/Exception/FatalErrorExceptionTest.php similarity index 64% rename from vendor/psy/psysh/test/Psy/Test/Exception/FatalErrorExceptionTest.php rename to vendor/psy/psysh/test/Exception/FatalErrorExceptionTest.php index 9ff66b95..36c7dd8c 100644 --- a/vendor/psy/psysh/test/Psy/Test/Exception/FatalErrorExceptionTest.php +++ b/vendor/psy/psysh/test/Exception/FatalErrorExceptionTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,7 +11,6 @@ namespace Psy\Test\Exception; -use Psy\Exception\Exception; use Psy\Exception\FatalErrorException; class FatalErrorExceptionTest extends \PHPUnit\Framework\TestCase @@ -20,16 +19,16 @@ class FatalErrorExceptionTest extends \PHPUnit\Framework\TestCase { $e = new FatalErrorException(); - $this->assertTrue($e instanceof Exception); - $this->assertTrue($e instanceof \ErrorException); - $this->assertTrue($e instanceof FatalErrorException); + $this->assertInstanceOf('Psy\Exception\Exception', $e); + $this->assertInstanceOf('ErrorException', $e); + $this->assertInstanceOf('Psy\Exception\FatalErrorException', $e); } public function testMessage() { $e = new FatalErrorException('{msg}', 0, 0, '{filename}', 13); - $this->assertEquals('{msg}', $e->getRawMessage()); + $this->assertSame('{msg}', $e->getRawMessage()); $this->assertContains('{msg}', $e->getMessage()); $this->assertContains('{filename}', $e->getMessage()); $this->assertContains('line 13', $e->getMessage()); @@ -39,8 +38,14 @@ class FatalErrorExceptionTest extends \PHPUnit\Framework\TestCase { $e = new FatalErrorException('{msg}'); - $this->assertEquals('{msg}', $e->getRawMessage()); + $this->assertSame('{msg}', $e->getRawMessage()); $this->assertContains('{msg}', $e->getMessage()); $this->assertContains('eval()\'d code', $e->getMessage()); } + + public function testNegativeOneLineNumberIgnored() + { + $e = new FatalErrorException('{msg}', 0, 1, null, -1); + $this->assertEquals(0, $e->getLine()); + } } diff --git a/vendor/psy/psysh/test/Psy/Test/Exception/ParseErrorExceptionTest.php b/vendor/psy/psysh/test/Exception/ParseErrorExceptionTest.php similarity index 79% rename from vendor/psy/psysh/test/Psy/Test/Exception/ParseErrorExceptionTest.php rename to vendor/psy/psysh/test/Exception/ParseErrorExceptionTest.php index 9fa9750d..446b9389 100644 --- a/vendor/psy/psysh/test/Psy/Test/Exception/ParseErrorExceptionTest.php +++ b/vendor/psy/psysh/test/Exception/ParseErrorExceptionTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,7 +11,6 @@ namespace Psy\Test\Exception; -use Psy\Exception\Exception; use Psy\Exception\ParseErrorException; class ParseErrorExceptionTest extends \PHPUnit\Framework\TestCase @@ -20,9 +19,9 @@ class ParseErrorExceptionTest extends \PHPUnit\Framework\TestCase { $e = new ParseErrorException(); - $this->assertTrue($e instanceof Exception); - $this->assertTrue($e instanceof \PhpParser\Error); - $this->assertTrue($e instanceof ParseErrorException); + $this->assertInstanceOf('Psy\Exception\Exception', $e); + $this->assertInstanceOf('PhpParser\Error', $e); + $this->assertInstanceOf('Psy\Exception\ParseErrorException', $e); } public function testMessage() diff --git a/vendor/psy/psysh/test/Psy/Test/Exception/RuntimeExceptionTest.php b/vendor/psy/psysh/test/Exception/RuntimeExceptionTest.php similarity index 56% rename from vendor/psy/psysh/test/Psy/Test/Exception/RuntimeExceptionTest.php rename to vendor/psy/psysh/test/Exception/RuntimeExceptionTest.php index 8eca1348..1121ea4e 100644 --- a/vendor/psy/psysh/test/Psy/Test/Exception/RuntimeExceptionTest.php +++ b/vendor/psy/psysh/test/Exception/RuntimeExceptionTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,7 +11,6 @@ namespace Psy\Test\Exception; -use Psy\Exception\Exception; use Psy\Exception\RuntimeException; class RuntimeExceptionTest extends \PHPUnit\Framework\TestCase @@ -21,11 +20,11 @@ class RuntimeExceptionTest extends \PHPUnit\Framework\TestCase $msg = 'bananas'; $e = new RuntimeException($msg); - $this->assertTrue($e instanceof Exception); - $this->assertTrue($e instanceof \RuntimeException); - $this->assertTrue($e instanceof RuntimeException); + $this->assertInstanceOf('Psy\Exception\Exception', $e); + $this->assertInstanceOf('RuntimeException', $e); + $this->assertInstanceOf('Psy\Exception\RuntimeException', $e); - $this->assertEquals($msg, $e->getMessage()); - $this->assertEquals($msg, $e->getRawMessage()); + $this->assertSame($msg, $e->getMessage()); + $this->assertSame($msg, $e->getRawMessage()); } } diff --git a/vendor/psy/psysh/test/Exception/ThrowUpExceptionTest.php b/vendor/psy/psysh/test/Exception/ThrowUpExceptionTest.php new file mode 100644 index 00000000..f44ab873 --- /dev/null +++ b/vendor/psy/psysh/test/Exception/ThrowUpExceptionTest.php @@ -0,0 +1,66 @@ +assertInstanceOf('Psy\Exception\Exception', $e); + $this->assertInstanceOf('Psy\Exception\ThrowUpException', $e); + + $this->assertEquals("Throwing Exception with message '{{message}}'", $e->getMessage()); + $this->assertEquals('{{message}}', $e->getRawMessage()); + $this->assertEquals(123, $e->getCode()); + $this->assertSame($previous, $e->getPrevious()); + } + + public function testFromThrowable() + { + $previous = new \Exception('{{message}}'); + $e = ThrowUpException::fromThrowable($previous); + + $this->assertInstanceOf('Psy\Exception\ThrowUpException', $e); + $this->assertSame($previous, $e->getPrevious()); + } + + public function testFromThrowableWithError() + { + if (version_compare(PHP_VERSION, '7.0.0', '<')) { + $this->markTestSkipped(); + } + + $previous = new \Error('{{message}}'); + $e = ThrowUpException::fromThrowable($previous); + + $this->assertInstanceOf('Psy\Exception\ThrowUpException', $e); + $this->assertInstanceOf('Psy\Exception\ErrorException', $e->getPrevious()); + + $this->assertNotSame($previous, $e->getPrevious()); + $this->assertSame($previous, $e->getPrevious()->getPrevious()); + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage throw-up can only throw Exceptions and Errors + */ + public function testFromThrowableThrowsError() + { + $notThrowable = new \StdClass(); + ThrowUpException::fromThrowable($notThrowable); + } +} diff --git a/vendor/psy/psysh/test/Exception/TypeErrorExceptionTest.php b/vendor/psy/psysh/test/Exception/TypeErrorExceptionTest.php new file mode 100644 index 00000000..7bf27af9 --- /dev/null +++ b/vendor/psy/psysh/test/Exception/TypeErrorExceptionTest.php @@ -0,0 +1,52 @@ +assertInstanceOf('Psy\Exception\Exception', $e); + $this->assertInstanceOf('Psy\Exception\TypeErrorException', $e); + + $this->assertEquals('TypeError: {{message}}', $e->getMessage()); + $this->assertEquals('{{message}}', $e->getRawMessage()); + $this->assertEquals(13, $e->getCode()); + } + + public function testStripsEvalFromMessage() + { + $message = 'Something or other, called in line 10: eval()\'d code'; + $e = new TypeErrorException($message); + $this->assertEquals($message, $e->getRawMessage()); + $this->assertEquals('TypeError: Something or other', $e->getMessage()); + } + + public function testFromTypeError() + { + if (version_compare(PHP_VERSION, '7.0.0', '<')) { + $this->markTestSkipped(); + } + + $previous = new \TypeError('{{message}}', 13); + $e = TypeErrorException::fromTypeError($previous); + + $this->assertInstanceOf('Psy\Exception\TypeErrorException', $e); + $this->assertEquals('TypeError: {{message}}', $e->getMessage()); + $this->assertEquals('{{message}}', $e->getRawMessage()); + $this->assertEquals(13, $e->getCode()); + } +} diff --git a/vendor/psy/psysh/test/FakeShell.php b/vendor/psy/psysh/test/FakeShell.php new file mode 100644 index 00000000..9f6fa97f --- /dev/null +++ b/vendor/psy/psysh/test/FakeShell.php @@ -0,0 +1,29 @@ +matchers = $matchers; + } +} diff --git a/vendor/psy/psysh/test/Formatter/CodeFormatterTest.php b/vendor/psy/psysh/test/Formatter/CodeFormatterTest.php new file mode 100644 index 00000000..ee213f1c --- /dev/null +++ b/vendor/psy/psysh/test/Formatter/CodeFormatterTest.php @@ -0,0 +1,129 @@ +assertEquals($expected, self::trimLines($formattedWithoutColors)); + $this->assertNotEquals($expected, self::trimLines($formatted)); + } + + public function reflectors() + { + $expectClass = <<<'EOS' + > 14| class SomeClass + 15| { + 16| const SOME_CONST = 'some const'; + 17| private $someProp = 'some prop'; + 18| + 19| public function someMethod($someParam) + 20| { + 21| return 'some method'; + 22| } + 23| + 24| public static function someClosure() + 25| { + 26| return function () { + 27| return 'some closure'; + 28| }; + 29| } + 30| } +EOS; + + $expectMethod = <<<'EOS' + > 19| public function someMethod($someParam) + 20| { + 21| return 'some method'; + 22| } +EOS; + + $expectClosure = <<<'EOS' + > 26| return function () { + 27| return 'some closure'; + 28| }; +EOS; + + return [ + [new \ReflectionClass('Psy\Test\Formatter\Fixtures\SomeClass'), $expectClass], + [new \ReflectionObject(new SomeClass()), $expectClass], + [new \ReflectionMethod('Psy\Test\Formatter\Fixtures\SomeClass', 'someMethod'), $expectMethod], + [new \ReflectionFunction(SomeClass::someClosure()), $expectClosure], + ]; + } + + /** + * @dataProvider invalidReflectors + * @expectedException \Psy\Exception\RuntimeException + */ + public function testCodeFormatterThrowsExceptionForReflectorsItDoesntUnderstand($reflector) + { + CodeFormatter::format($reflector); + } + + public function invalidReflectors() + { + $reflectors = [ + [new \ReflectionExtension('json')], + [new \ReflectionParameter(['Psy\Test\Formatter\Fixtures\SomeClass', 'someMethod'], 'someParam')], + [new \ReflectionProperty('Psy\Test\Formatter\Fixtures\SomeClass', 'someProp')], + ]; + + if (version_compare(PHP_VERSION, '7.1.0', '>=')) { + $reflectors[] = [new \ReflectionClassConstant('Psy\Test\Formatter\Fixtures\SomeClass', 'SOME_CONST')]; + } + + return $reflectors; + } + + /** + * @dataProvider filenames + * @expectedException \Psy\Exception\RuntimeException + */ + public function testCodeFormatterThrowsExceptionForMissingFile($filename) + { + $reflector = $this->getMockBuilder('ReflectionClass') + ->disableOriginalConstructor() + ->getMock(); + + $reflector + ->expects($this->once()) + ->method('getFileName') + ->will($this->returnValue($filename)); + + CodeFormatter::format($reflector); + } + + public function filenames() + { + if (defined('HHVM_VERSION')) { + $this->markTestSkipped('We have issues with PHPUnit mocks on HHVM.'); + } + + return [[null], ['not a file']]; + } + + private static function trimLines($code) + { + return rtrim(implode("\n", array_map('rtrim', explode("\n", $code)))); + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/Formatter/DocblockFormatterTest.php b/vendor/psy/psysh/test/Formatter/DocblockFormatterTest.php similarity index 96% rename from vendor/psy/psysh/test/Psy/Test/Formatter/DocblockFormatterTest.php rename to vendor/psy/psysh/test/Formatter/DocblockFormatterTest.php index fa742b08..134c76d0 100644 --- a/vendor/psy/psysh/test/Psy/Test/Formatter/DocblockFormatterTest.php +++ b/vendor/psy/psysh/test/Formatter/DocblockFormatterTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -55,7 +55,7 @@ class DocblockFormatterTest extends \PHPUnit\Framework\TestCase Author: Justin Hileman \ EOS; - $this->assertEquals( + $this->assertSame( $expected, DocblockFormatter::format(new \ReflectionMethod($this, 'methodWithDocblock')) ); diff --git a/vendor/psy/psysh/test/Formatter/Fixtures/BoringTrait.php b/vendor/psy/psysh/test/Formatter/Fixtures/BoringTrait.php new file mode 100644 index 00000000..9f13ab93 --- /dev/null +++ b/vendor/psy/psysh/test/Formatter/Fixtures/BoringTrait.php @@ -0,0 +1,20 @@ +assertEquals($expected, strip_tags(SignatureFormatter::format($reflector))); + $this->assertSame($expected, strip_tags(SignatureFormatter::format($reflector))); } public function signatureReflectors() { - return array( - array( + return [ + [ new \ReflectionFunction('implode'), defined('HHVM_VERSION') ? 'function implode($arg1, $arg2 = null)' : 'function implode($glue, $pieces)', - ), - array( - new ReflectionConstant($this, 'FOO'), + ], + [ + ReflectionClassConstant::create($this, 'FOO'), 'const FOO = "foo value"', - ), - array( + ], + [ new \ReflectionMethod($this, 'someFakeMethod'), 'private function someFakeMethod(array $one, $two = \'TWO\', Reflector $three = null)', - ), - array( + ], + [ new \ReflectionProperty($this, 'bar'), 'private static $bar', - ), - array( + ], + [ new \ReflectionClass('Psy\CodeCleaner\CodeCleanerPass'), 'abstract class Psy\CodeCleaner\CodeCleanerPass ' . 'extends PhpParser\NodeVisitorAbstract ' . 'implements PhpParser\NodeVisitor', - ), - ); + ], + [ + new \ReflectionFunction('array_chunk'), + 'function array_chunk($arg, $size, $preserve_keys = unknown)', + ], + [ + new \ReflectionClass('Psy\Test\Formatter\Fixtures\BoringTrait'), + 'trait Psy\Test\Formatter\Fixtures\BoringTrait', + ], + [ + new \ReflectionMethod('Psy\Test\Formatter\Fixtures\BoringTrait', 'boringMethod'), + 'public function boringMethod($one = 1)', + ], + [ + new ReflectionConstant_('E_ERROR'), + 'define("E_ERROR", 1)', + ], + [ + new ReflectionConstant_('PHP_VERSION'), + 'define("PHP_VERSION", "' . PHP_VERSION . '")', + ], + [ + new ReflectionConstant_('__LINE__'), + 'define("__LINE__", null)', // @todo show this as `unknown` in red or something? + ], + ]; } /** diff --git a/vendor/psy/psysh/test/Psy/Test/Input/CodeArgumentTest.php b/vendor/psy/psysh/test/Input/CodeArgumentTest.php similarity index 67% rename from vendor/psy/psysh/test/Psy/Test/Input/CodeArgumentTest.php rename to vendor/psy/psysh/test/Input/CodeArgumentTest.php index 4329a032..c3961520 100644 --- a/vendor/psy/psysh/test/Psy/Test/Input/CodeArgumentTest.php +++ b/vendor/psy/psysh/test/Input/CodeArgumentTest.php @@ -3,13 +3,13 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -namespace Psy\Tests\Input; +namespace Psy\Test\Input; use Psy\Input\CodeArgument; use Symfony\Component\Console\Input\InputArgument; @@ -27,11 +27,11 @@ class CodeArgumentTest extends \PHPUnit\Framework\TestCase public function getInvalidModes() { - return array( - array(InputArgument::IS_ARRAY), - array(InputArgument::IS_ARRAY | InputArgument::REQUIRED), - array(InputArgument::IS_ARRAY | InputArgument::OPTIONAL), - ); + return [ + [InputArgument::IS_ARRAY], + [InputArgument::IS_ARRAY | InputArgument::REQUIRED], + [InputArgument::IS_ARRAY | InputArgument::OPTIONAL], + ]; } /** @@ -44,9 +44,9 @@ class CodeArgumentTest extends \PHPUnit\Framework\TestCase public function getValidModes() { - return array( - array(InputArgument::REQUIRED), - array(InputArgument::OPTIONAL), - ); + return [ + [InputArgument::REQUIRED], + [InputArgument::OPTIONAL], + ]; } } diff --git a/vendor/psy/psysh/test/Input/FilterOptionsTest.php b/vendor/psy/psysh/test/Input/FilterOptionsTest.php new file mode 100644 index 00000000..7ed8919b --- /dev/null +++ b/vendor/psy/psysh/test/Input/FilterOptionsTest.php @@ -0,0 +1,105 @@ +assertCount(3, $opts); + } + + /** + * @dataProvider validInputs + */ + public function testBindValidInput($input, $hasFilter = true) + { + $input = $this->getInput($input); + $filterOptions = new FilterOptions(); + $filterOptions->bind($input); + + $this->assertEquals($hasFilter, $filterOptions->hasFilter()); + } + + public function validInputs() + { + return [ + ['--grep="bar"'], + ['--grep="bar" --invert'], + ['--grep="bar" --insensitive'], + ['--grep="bar" --invert --insensitive'], + ['', false], + ]; + } + + /** + * @dataProvider invalidInputs + * @expectedException \Psy\Exception\RuntimeException + */ + public function testBindInvalidInput($input) + { + $input = $this->getInput($input); + $filterOptions = new FilterOptions(); + $filterOptions->bind($input); + } + + public function invalidInputs() + { + return [ + ['--invert'], + ['--insensitive'], + ['--invert --insensitive'], + + // invalid because regex + ['--grep /*/'], + ]; + } + + /** + * @dataProvider matchData + */ + public function testMatch($input, $str, $matches) + { + $input = $this->getInput($input); + $filterOptions = new FilterOptions(); + $filterOptions->bind($input); + + $this->assertEquals($matches, $filterOptions->match($str)); + } + + public function matchData() + { + return [ + ['', 'whatever', true], + ['--grep FOO', 'foo', false], + ['--grep foo', 'foo', true], + ['--grep foo', 'food', true], + ['--grep oo', 'Food', true], + ['--grep oo -i', 'FOOD', true], + ['--grep foo -v', 'food', false], + ['--grep foo -v', 'whatever', true], + ]; + } + + private function getInput($input) + { + $input = new StringInput($input); + $input->bind(new InputDefinition(FilterOptions::getOptions())); + + return $input; + } +} diff --git a/vendor/psy/psysh/test/Input/ShellInputTest.php b/vendor/psy/psysh/test/Input/ShellInputTest.php new file mode 100644 index 00000000..f19d1261 --- /dev/null +++ b/vendor/psy/psysh/test/Input/ShellInputTest.php @@ -0,0 +1,254 @@ +bind($definition); + } + + public function testInputOptionWithGivenString() + { + $definition = new InputDefinition([ + new InputOption('foo', null, InputOption::VALUE_REQUIRED), + new CodeArgument('code', null, CodeArgument::REQUIRED), + ]); + + $input = new ShellInput('--foo=bar echo "baz\\\\n";'); + $input->bind($definition); + $this->assertSame('bar', $input->getOption('foo')); + $this->assertSame('echo "baz\n";', $input->getArgument('code')); + } + + public function testInputOptionWithoutCodeArguments() + { + $definition = new InputDefinition([ + new InputOption('foo', null, InputOption::VALUE_REQUIRED), + new InputOption('qux', 'q', InputOption::VALUE_REQUIRED), + new InputArgument('bar', null, InputArgument::REQUIRED), + new InputArgument('baz', null, InputArgument::REQUIRED), + ]); + + $input = new ShellInput('--foo=foo -q qux bar "baz\\\\n"'); + $input->bind($definition); + $this->assertSame('foo', $input->getOption('foo')); + $this->assertSame('qux', $input->getOption('qux')); + $this->assertSame('bar', $input->getArgument('bar')); + $this->assertSame('baz\\n', $input->getArgument('baz')); + } + + public function testInputWithDashDash() + { + $definition = new InputDefinition([ + new InputOption('foo', null, InputOption::VALUE_REQUIRED), + new CodeArgument('code', null, CodeArgument::REQUIRED), + ]); + + $input = new ShellInput('-- echo --foo::$bar'); + $input->bind($definition); + $this->assertNull($input->getOption('foo')); + $this->assertSame('echo --foo::$bar', $input->getArgument('code')); + } + + public function testInputWithEmptyString() + { + $definition = new InputDefinition([ + new InputOption('foo', null, InputOption::VALUE_REQUIRED), + new CodeArgument('code', null, CodeArgument::REQUIRED), + ]); + + $input = new ShellInput('"" --foo bar'); + $input->bind($definition); + $this->assertSame('"" --foo bar', $input->getArgument('code')); + } + + /** + * @dataProvider getTokenizeData + */ + public function testTokenize($input, $tokens, $message) + { + $input = new ShellInput($input); + $r = new \ReflectionClass('Psy\Input\ShellInput'); + $p = $r->getProperty('tokenPairs'); + $p->setAccessible(true); + $this->assertSame($tokens, $p->getValue($input), $message); + } + + public function getTokenizeData() + { + // Test all the cases from StringInput test, ensuring they have an appropriate $rest token. + return [ + [ + '', + [], + '->tokenize() parses an empty string', + ], + [ + 'foo', + [['foo', 'foo']], + '->tokenize() parses arguments', + ], + [ + ' foo bar ', + [['foo', 'foo bar '], ['bar', 'bar ']], + '->tokenize() ignores whitespaces between arguments', + ], + [ + '"quoted"', + [['quoted', '"quoted"']], + '->tokenize() parses quoted arguments', + ], + [ + "'quoted'", + [['quoted', "'quoted'"]], + '->tokenize() parses quoted arguments', + ], + [ + "'a\rb\nc\td'", + [["a\rb\nc\td", "'a\rb\nc\td'"]], + '->tokenize() parses whitespace chars in strings', + ], + [ + "'a'\r'b'\n'c'\t'd'", + [ + ['a', "'a'\r'b'\n'c'\t'd'"], + ['b', "'b'\n'c'\t'd'"], + ['c', "'c'\t'd'"], + ['d', "'d'"], + ], + '->tokenize() parses whitespace chars between args as spaces', + ], + + /* + * These don't play nice with unescaping input, but the end result + * is correct, so disable the tests for now. + * + * @todo Sort this out and re-enable these test cases. + */ + // [ + // '\"quoted\"', + // [['"quoted"', '\"quoted\"']], + // '->tokenize() parses escaped-quoted arguments', + // ], + // [ + // "\'quoted\'", + // [['\'quoted\'', "\'quoted\'"]], + // '->tokenize() parses escaped-quoted arguments', + // ], + + [ + '-a', + [['-a', '-a']], + '->tokenize() parses short options', + ], + [ + '-azc', + [['-azc', '-azc']], + '->tokenize() parses aggregated short options', + ], + [ + '-awithavalue', + [['-awithavalue', '-awithavalue']], + '->tokenize() parses short options with a value', + ], + [ + '-a"foo bar"', + [['-afoo bar', '-a"foo bar"']], + '->tokenize() parses short options with a value', + ], + [ + '-a"foo bar""foo bar"', + [['-afoo barfoo bar', '-a"foo bar""foo bar"']], + '->tokenize() parses short options with a value', + ], + [ + '-a\'foo bar\'', + [['-afoo bar', '-a\'foo bar\'']], + '->tokenize() parses short options with a value', + ], + [ + '-a\'foo bar\'\'foo bar\'', + [['-afoo barfoo bar', '-a\'foo bar\'\'foo bar\'']], + '->tokenize() parses short options with a value', + ], + [ + '-a\'foo bar\'"foo bar"', + [['-afoo barfoo bar', '-a\'foo bar\'"foo bar"']], + '->tokenize() parses short options with a value', + ], + [ + '--long-option', + [['--long-option', '--long-option']], + '->tokenize() parses long options', + ], + [ + '--long-option=foo', + [['--long-option=foo', '--long-option=foo']], + '->tokenize() parses long options with a value', + ], + [ + '--long-option="foo bar"', + [['--long-option=foo bar', '--long-option="foo bar"']], + '->tokenize() parses long options with a value', + ], + [ + '--long-option="foo bar""another"', + [['--long-option=foo baranother', '--long-option="foo bar""another"']], + '->tokenize() parses long options with a value', + ], + [ + '--long-option=\'foo bar\'', + [['--long-option=foo bar', '--long-option=\'foo bar\'']], + '->tokenize() parses long options with a value', + ], + [ + "--long-option='foo bar''another'", + [['--long-option=foo baranother', "--long-option='foo bar''another'"]], + '->tokenize() parses long options with a value', + ], + [ + "--long-option='foo bar'\"another\"", + [['--long-option=foo baranother', "--long-option='foo bar'\"another\""]], + '->tokenize() parses long options with a value', + ], + [ + 'foo -a -ffoo --long bar', + [ + ['foo', 'foo -a -ffoo --long bar'], + ['-a', '-a -ffoo --long bar'], + ['-ffoo', '-ffoo --long bar'], + ['--long', '--long bar'], + ['bar', 'bar'], + ], + '->tokenize() parses when several arguments and options', + ], + ]; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/CodeCleanerTestCase.php b/vendor/psy/psysh/test/ParserTestCase.php similarity index 81% rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/CodeCleanerTestCase.php rename to vendor/psy/psysh/test/ParserTestCase.php index d1a30279..78055206 100644 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/CodeCleanerTestCase.php +++ b/vendor/psy/psysh/test/ParserTestCase.php @@ -3,34 +3,29 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -namespace Psy\Test\CodeCleaner; +namespace Psy\Test; -use PhpParser\NodeTraverser; use PhpParser\PrettyPrinter\Standard as Printer; -use Psy\CodeCleaner\CodeCleanerPass; use Psy\Exception\ParseErrorException; use Psy\ParserFactory; -class CodeCleanerTestCase extends \PHPUnit\Framework\TestCase +class ParserTestCase extends \PHPUnit\Framework\TestCase { - protected $pass; protected $traverser; private $parser; private $printer; - protected function setPass(CodeCleanerPass $pass) + public function tearDown() { - $this->pass = $pass; - if (!isset($this->traverser)) { - $this->traverser = new NodeTraverser(); - } - $this->traverser->addVisitor($this->pass); + $this->traverser = null; + $this->parser = null; + $this->printer = null; } protected function parse($code, $prefix = 'traverser)) { + throw new \RuntimeException('Test cases must provide a traverser'); + } + return $this->traverser->traverse($stmts); } @@ -66,7 +65,8 @@ class CodeCleanerTestCase extends \PHPUnit\Framework\TestCase { $stmts = $this->parse($from); $stmts = $this->traverse($stmts); - $this->assertEquals($to, $this->prettyPrint($stmts)); + $toStmts = $this->parse($to); + $this->assertSame($this->prettyPrint($toStmts), $this->prettyPrint($stmts)); } private function getParser() diff --git a/vendor/psy/psysh/test/Psy/Test/AutoloaderTest.php b/vendor/psy/psysh/test/Psy/Test/AutoloaderTest.php deleted file mode 100644 index fdd6d5f8..00000000 --- a/vendor/psy/psysh/test/Psy/Test/AutoloaderTest.php +++ /dev/null @@ -1,23 +0,0 @@ -assertTrue(spl_autoload_unregister(array('Psy\Autoloader', 'autoload'))); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/AbstractClassPassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/AbstractClassPassTest.php deleted file mode 100644 index 21d4f085..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/AbstractClassPassTest.php +++ /dev/null @@ -1,64 +0,0 @@ -pass = new AbstractClassPass(); - $this->traverser = new NodeTraverser(); - $this->traverser->addVisitor($this->pass); - } - - /** - * @dataProvider invalidStatements - * @expectedException \Psy\Exception\FatalErrorException - */ - public function testProcessStatementFails($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - public function invalidStatements() - { - return array( - array('class A { abstract function a(); }'), - array('abstract class B { abstract function b() {} }'), - array('abstract class B { abstract function b() { echo "yep"; } }'), - ); - } - - /** - * @dataProvider validStatements - */ - public function testProcessStatementPasses($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? - $this->assertTrue(true); - } - - public function validStatements() - { - return array( - array('abstract class C { function c() {} }'), - array('abstract class D { abstract function d(); }'), - ); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/CallTimePassByReferencePassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/CallTimePassByReferencePassTest.php deleted file mode 100644 index ff252794..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/CallTimePassByReferencePassTest.php +++ /dev/null @@ -1,76 +0,0 @@ -pass = new CallTimePassByReferencePass(); - $this->traverser = new NodeTraverser(); - $this->traverser->addVisitor($this->pass); - } - - /** - * @dataProvider invalidStatements - * @expectedException \Psy\Exception\FatalErrorException - */ - public function testProcessStatementFails($code) - { - if (version_compare(PHP_VERSION, '5.4', '<')) { - $this->markTestSkipped(); - } - - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - public function invalidStatements() - { - return array( - array('f(&$arg)'), - array('$object->method($first, &$arg)'), - array('$closure($first, &$arg, $last)'), - array('A::b(&$arg)'), - ); - } - - /** - * @dataProvider validStatements - */ - public function testProcessStatementPasses($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? - $this->assertTrue(true); - } - - public function validStatements() - { - $data = array( - array('array(&$var)'), - array('$a = &$b'), - array('f(array(&$b))'), - ); - - if (version_compare(PHP_VERSION, '5.4', '<')) { - $data = array_merge($data, $this->invalidStatements()); - } - - return $data; - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/CalledClassPassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/CalledClassPassTest.php deleted file mode 100644 index a581d7f3..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/CalledClassPassTest.php +++ /dev/null @@ -1,104 +0,0 @@ -pass = new CalledClassPass(); - $this->traverser = new NodeTraverser(); - $this->traverser->addVisitor($this->pass); - } - - /** - * @dataProvider invalidStatements - * @expectedException \Psy\Exception\ErrorException - */ - public function testProcessStatementFails($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - public function invalidStatements() - { - return array( - array('get_class()'), - array('get_class(null)'), - array('get_called_class()'), - array('get_called_class(null)'), - array('function foo() { return get_class(); }'), - array('function foo() { return get_class(null); }'), - array('function foo() { return get_called_class(); }'), - array('function foo() { return get_called_class(null); }'), - ); - } - - /** - * @dataProvider validStatements - */ - public function testProcessStatementPasses($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? - $this->assertTrue(true); - } - - public function validStatements() - { - return array( - array('get_class($foo)'), - array('get_class(bar())'), - array('get_called_class($foo)'), - array('get_called_class(bar())'), - array('function foo($bar) { return get_class($bar); }'), - array('function foo($bar) { return get_called_class($bar); }'), - array('class Foo { function bar() { return get_class(); } }'), - array('class Foo { function bar() { return get_class(null); } }'), - array('class Foo { function bar() { return get_called_class(); } }'), - array('class Foo { function bar() { return get_called_class(null); } }'), - array('$foo = function () {}; $foo()'), - ); - } - - /** - * @dataProvider validTraitStatements - */ - public function testProcessTraitStatementPasses($code) - { - if (version_compare(PHP_VERSION, '5.4', '<')) { - $this->markTestSkipped(); - } - - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? - $this->assertTrue(true); - } - - public function validTraitStatements() - { - return array( - array('trait Foo { function bar() { return get_class(); } }'), - array('trait Foo { function bar() { return get_class(null); } }'), - array('trait Foo { function bar() { return get_called_class(); } }'), - array('trait Foo { function bar() { return get_called_class(null); } }'), - ); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ExitPassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ExitPassTest.php deleted file mode 100644 index 43b55546..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/ExitPassTest.php +++ /dev/null @@ -1,59 +0,0 @@ -setPass(new ExitPass()); - } - - /** - * @dataProvider dataProviderExitStatement - */ - public function testExitStatement($from, $to) - { - $this->assertProcessesAs($from, $to); - } - - /** - * Data provider for testExitStatement. - * - * @return array - */ - public function dataProviderExitStatement() - { - return array( - array('exit;', "{$this->expectedExceptionString};"), - array('exit();', "{$this->expectedExceptionString};"), - array('die;', "{$this->expectedExceptionString};"), - array('exit(die(die));', "{$this->expectedExceptionString};"), - array('if (true) { exit; }', "if (true) {\n {$this->expectedExceptionString};\n}"), - array('if (false) { exit; }', "if (false) {\n {$this->expectedExceptionString};\n}"), - array('1 and exit();', "1 and {$this->expectedExceptionString};"), - array('foo() or die', "foo() or {$this->expectedExceptionString};"), - array('exit and 1;', "{$this->expectedExceptionString} and 1;"), - array('if (exit) { echo $wat; }', "if ({$this->expectedExceptionString}) {\n echo \$wat;\n}"), - array('exit or die;', "{$this->expectedExceptionString} or {$this->expectedExceptionString};"), - array('switch (die) { }', "switch ({$this->expectedExceptionString}) {\n}"), - array('for ($i = 1; $i < 10; die) {}', "for (\$i = 1; \$i < 10; {$this->expectedExceptionString}) {\n}"), - ); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/InstanceOfPassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/InstanceOfPassTest.php deleted file mode 100644 index fc4a5b6a..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/InstanceOfPassTest.php +++ /dev/null @@ -1,76 +0,0 @@ -setPass(new InstanceOfPass()); - } - - /** - * @dataProvider invalidStatements - * @expectedException \Psy\Exception\FatalErrorException - */ - public function testProcessInvalidStatement($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - public function invalidStatements() - { - return array( - array('null instanceof stdClass'), - array('true instanceof stdClass'), - array('9 instanceof stdClass'), - array('1.0 instanceof stdClass'), - array('"foo" instanceof stdClass'), - array('__DIR__ instanceof stdClass'), - array('PHP_SAPI instanceof stdClass'), - array('1+1 instanceof stdClass'), - array('true && false instanceof stdClass'), - array('"a"."b" instanceof stdClass'), - array('!5 instanceof stdClass'), - ); - } - - /** - * @dataProvider validStatements - */ - public function testProcessValidStatement($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? - $this->assertTrue(true); - } - - public function validStatements() - { - $data = array( - array('$a instanceof stdClass'), - array('strtolower("foo") instanceof stdClass'), - array('array(1) instanceof stdClass'), - array('(string) "foo" instanceof stdClass'), - array('(1+1) instanceof stdClass'), - array('"foo ${foo} $bar" instanceof stdClass'), - array('DateTime::ISO8601 instanceof stdClass'), - ); - - return $data; - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/LoopContextPassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/LoopContextPassTest.php deleted file mode 100644 index 7f261dfa..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/LoopContextPassTest.php +++ /dev/null @@ -1,137 +0,0 @@ -pass = new LoopContextPass(); - $this->traverser = new NodeTraverser(); - $this->traverser->addVisitor($this->pass); - } - - /** - * @dataProvider invalidStatements - * @expectedException \Psy\Exception\FatalErrorException - */ - public function testProcessStatementFails($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - public function invalidStatements() - { - return array( - array('continue'), - array('break'), - array('if (true) { continue; }'), - array('if (true) { break; }'), - array('if (false) { continue; }'), - array('if (false) { break; }'), - array('function foo() { break; }'), - array('function foo() { continue; }'), - - // actually enforce break/continue depth argument - array('do { break 2; } while (true)'), - array('do { continue 2; } while (true)'), - array('for ($a; $b; $c) { break 2; }'), - array('for ($a; $b; $c) { continue 2; }'), - array('foreach ($a as $b) { break 2; }'), - array('foreach ($a as $b) { continue 2; }'), - array('switch (true) { default: break 2; }'), - array('switch (true) { default: continue 2; }'), - array('while (true) { break 2; }'), - array('while (true) { continue 2; }'), - - // invalid in 5.4+ because they're floats - // ... in 5.3 because the number is too big - array('while (true) { break 2.0; }'), - array('while (true) { continue 2.0; }'), - - // and once with nested loops, just for good measure - array('while (true) { while (true) { break 3; } }'), - array('while (true) { while (true) { continue 3; } }'), - ); - } - - /** - * @dataProvider invalidPHP54Statements - * @expectedException \Psy\Exception\FatalErrorException - */ - public function testPHP54ProcessStatementFails($code) - { - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $this->markTestSkipped(); - } - - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - public function invalidPHP54Statements() - { - return array( - // In PHP 5.4+, only positive literal integers are allowed - array('while (true) { break $n; }'), - array('while (true) { continue $n; }'), - array('while (true) { break N; }'), - array('while (true) { continue N; }'), - array('while (true) { break 0; }'), - array('while (true) { continue 0; }'), - array('while (true) { break -1; }'), - array('while (true) { continue -1; }'), - array('while (true) { break 1.0; }'), - array('while (true) { continue 1.0; }'), - ); - } - - /** - * @dataProvider validStatements - */ - public function testProcessStatementPasses($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? - $this->assertTrue(true); - } - - public function validStatements() - { - return array( - array('do { break; } while (true)'), - array('do { continue; } while (true)'), - array('for ($a; $b; $c) { break; }'), - array('for ($a; $b; $c) { continue; }'), - array('foreach ($a as $b) { break; }'), - array('foreach ($a as $b) { continue; }'), - array('switch (true) { default: break; }'), - array('switch (true) { default: continue; }'), - array('while (true) { break; }'), - array('while (true) { continue; }'), - - // `break 1` is redundant, but not invalid - array('while (true) { break 1; }'), - array('while (true) { continue 1; }'), - - // and once with nested loops just for good measure - array('while (true) { while (true) { break 2; } }'), - array('while (true) { while (true) { continue 2; } }'), - ); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/NamespacePassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/NamespacePassTest.php deleted file mode 100644 index 553a699a..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/NamespacePassTest.php +++ /dev/null @@ -1,56 +0,0 @@ -cleaner = new CodeCleaner(); - $this->setPass(new NamespacePass($this->cleaner)); - } - - public function testProcess() - { - $this->process('array_merge()'); - $this->assertNull($this->cleaner->getNamespace()); - - // A non-block namespace statement should set the current namespace. - $this->process('namespace Alpha'); - $this->assertEquals(array('Alpha'), $this->cleaner->getNamespace()); - - // A new non-block namespace statement should override the current namespace. - $this->process('namespace Beta; class B {}'); - $this->assertEquals(array('Beta'), $this->cleaner->getNamespace()); - - // @todo Figure out if we can detect when the last namespace block is - // bracketed or unbracketed, because this should really clear the - // namespace at the end... - $this->process('namespace Gamma { array_merge(); }'); - $this->assertEquals(array('Gamma'), $this->cleaner->getNamespace()); - - // A null namespace clears out the current namespace. - $this->process('namespace { array_merge(); }'); - $this->assertNull($this->cleaner->getNamespace()); - } - - private function process($code) - { - $stmts = $this->parse($code); - $this->traverse($stmts); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/PassableByReferencePassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/PassableByReferencePassTest.php deleted file mode 100644 index 94843d99..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/PassableByReferencePassTest.php +++ /dev/null @@ -1,115 +0,0 @@ -pass = new PassableByReferencePass(); - $this->traverser = new NodeTraverser(); - $this->traverser->addVisitor($this->pass); - } - - /** - * @dataProvider invalidStatements - * @expectedException \Psy\Exception\FatalErrorException - */ - public function testProcessStatementFails($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - public function invalidStatements() - { - return array( - array('array_pop(array())'), - array('array_pop(array($foo))'), - array('array_shift(array())'), - ); - } - - /** - * @dataProvider validStatements - */ - public function testProcessStatementPasses($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? - $this->assertTrue(true); - } - - public function validStatements() - { - return array( - array('array_pop(json_decode("[]"))'), - array('array_pop($foo)'), - array('array_pop($foo->bar)'), - array('array_pop($foo::baz)'), - array('array_pop(Foo::qux)'), - ); - } - - /** - * @dataProvider validArrayMultisort - */ - public function testArrayMultisort($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? - $this->assertTrue(true); - } - - public function validArrayMultisort() - { - return array( - array('array_multisort($a)'), - array('array_multisort($a, $b)'), - array('array_multisort($a, SORT_NATURAL, $b)'), - array('array_multisort($a, SORT_NATURAL | SORT_FLAG_CASE, $b)'), - array('array_multisort($a, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE, $b)'), - array('array_multisort($a, SORT_NATURAL | SORT_FLAG_CASE, SORT_ASC, $b)'), - array('array_multisort($a, $b, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE)'), - array('array_multisort($a, SORT_NATURAL | SORT_FLAG_CASE, $b, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE)'), - array('array_multisort($a, 1, $b)'), - array('array_multisort($a, 1 + 2, $b)'), - array('array_multisort($a, getMultisortFlags(), $b)'), - ); - } - - /** - * @dataProvider invalidArrayMultisort - * @expectedException \Psy\Exception\FatalErrorException - */ - public function testInvalidArrayMultisort($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - public function invalidArrayMultisort() - { - return array( - array('array_multisort(1)'), - array('array_multisort(array(1, 2, 3))'), - array('array_multisort($a, SORT_NATURAL, SORT_ASC, SORT_NATURAL, $b)'), - ); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/StaticConstructorPassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/StaticConstructorPassTest.php deleted file mode 100644 index 0ba72380..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/StaticConstructorPassTest.php +++ /dev/null @@ -1,94 +0,0 @@ -setPass(new StaticConstructorPass()); - } - - /** - * @dataProvider invalidStatements - * @expectedException \Psy\Exception\FatalErrorException - */ - public function testProcessInvalidStatement($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - /** - * @dataProvider invalidParserStatements - * @expectedException \Psy\Exception\ParseErrorException - */ - public function testProcessInvalidStatementCatchedByParser($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - } - - public function invalidStatements() - { - $statements = array( - array('class A { public static function A() {}}'), - array('class A { private static function A() {}}'), - ); - - if (version_compare(PHP_VERSION, '5.3.3', '<')) { - $statements[] = array('namespace B; class A { private static function A() {}}'); - } - - return $statements; - } - - public function invalidParserStatements() - { - $statements = array( - array('class A { public static function __construct() {}}'), - array('class A { private static function __construct() {}}'), - array('class A { private static function __construct() {} public function A() {}}'), - array('namespace B; class A { private static function __construct() {}}'), - ); - - return $statements; - } - - /** - * @dataProvider validStatements - */ - public function testProcessValidStatement($code) - { - $stmts = $this->parse($code); - $this->traverser->traverse($stmts); - - // @todo a better thing to assert here? - $this->assertTrue(true); - } - - public function validStatements() - { - $statements = array( - array('class A { public static function A() {} public function __construct() {}}'), - array('class A { private function __construct() {} public static function A() {}}'), - ); - - if (version_compare(PHP_VERSION, '5.3.3', '>=')) { - $statements[] = array('namespace B; class A { private static function A() {}}'); - } - - return $statements; - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/UseStatementPassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/UseStatementPassTest.php deleted file mode 100644 index 9c525efe..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/UseStatementPassTest.php +++ /dev/null @@ -1,52 +0,0 @@ -setPass(new UseStatementPass()); - } - - /** - * @dataProvider useStatements - */ - public function testProcess($from, $to) - { - $this->assertProcessesAs($from, $to); - } - - public function useStatements() - { - return array( - array( - "use StdClass as NotSoStd;\n\$std = new NotSoStd();", - '$std = new \\StdClass();', - ), - array( - "namespace Foo;\n\nuse StdClass as S;\n\$std = new S();", - "namespace Foo;\n\n\$std = new \\StdClass();", - ), - array( - "namespace Foo;\n\nuse \\StdClass as S;\n\$std = new S();", - "namespace Foo;\n\n\$std = new \\StdClass();", - ), - array( - "use Foo\\Bar as fb;\n\$baz = new fb\\Baz();", - '$baz = new \\Foo\\Bar\\Baz();', - ), - ); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleanerTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleanerTest.php deleted file mode 100644 index f46b6da1..00000000 --- a/vendor/psy/psysh/test/Psy/Test/CodeCleanerTest.php +++ /dev/null @@ -1,132 +0,0 @@ -assertEquals($expected, $cc->clean($lines, $requireSemicolons)); - } - - public function semicolonCodeProvider() - { - $values = array( - array(array('true'), false, 'return true;'), - array(array('true;'), false, 'return true;'), - array(array('true;'), true, 'return true;'), - array(array('true'), true, false), - - array(array('echo "foo";', 'true'), true, false), - ); - - if (version_compare(PHP_VERSION, '5.4', '<')) { - $values[] = array(array('echo "foo";', 'true'), false, "echo 'foo';\nreturn true;"); - } else { - $values[] = array(array('echo "foo";', 'true'), false, "echo \"foo\";\nreturn true;"); - } - - return $values; - } - - /** - * @dataProvider unclosedStatementsProvider - */ - public function testUnclosedStatements(array $lines, $isUnclosed) - { - $cc = new CodeCleaner(); - $res = $cc->clean($lines); - - if ($isUnclosed) { - $this->assertFalse($res); - } else { - $this->assertNotFalse($res); - } - } - - public function unclosedStatementsProvider() - { - return array( - array(array('echo "'), true), - array(array('echo \''), true), - array(array('if (1) {'), true), - - array(array('echo ""'), false), - array(array("echo ''"), false), - array(array('if (1) {}'), false), - - array(array('// closed comment'), false), - array(array('function foo() { /**'), true), - - array(array('var_dump(1, 2,'), true), - array(array('var_dump(1, 2,', '3)'), false), - ); - } - - /** - * @dataProvider moreUnclosedStatementsProvider - */ - public function testMoreUnclosedStatements(array $lines) - { - if (defined('HHVM_VERSION')) { - $this->markTestSkipped('HHVM not supported.'); - } - - $cc = new CodeCleaner(); - $res = $cc->clean($lines); - - $this->assertFalse($res); - } - - public function moreUnclosedStatementsProvider() - { - return array( - array(array("\$content = <<clean(array($code)); - } - - public function invalidStatementsProvider() - { - return array( - array('function "what'), - array("function 'what"), - array('echo }'), - array('echo {'), - array('if (1) }'), - array('echo """'), - array("echo '''"), - array('$foo "bar'), - array('$foo \'bar'), - array('var_dump(1,2,)'), - ); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/Formatter/CodeFormatterTest.php b/vendor/psy/psysh/test/Psy/Test/Formatter/CodeFormatterTest.php deleted file mode 100644 index 7f1635e5..00000000 --- a/vendor/psy/psysh/test/Psy/Test/Formatter/CodeFormatterTest.php +++ /dev/null @@ -1,65 +0,0 @@ - 18| private function ignoreThisMethod($arg) - 19| { - 20| echo 'whot!'; - 21| } -EOS; - - $formatted = CodeFormatter::format(new \ReflectionMethod($this, 'ignoreThisMethod')); - $formattedWithoutColors = preg_replace('#' . chr(27) . '\[\d\d?m#', '', $formatted); - - $this->assertEquals($expected, rtrim($formattedWithoutColors)); - $this->assertNotEquals($expected, rtrim($formatted)); - } - - /** - * @dataProvider filenames - * @expectedException \Psy\Exception\RuntimeException - */ - public function testCodeFormatterThrowsException($filename) - { - $reflector = $this->getMockBuilder('ReflectionClass') - ->disableOriginalConstructor() - ->getMock(); - - $reflector - ->expects($this->once()) - ->method('getFileName') - ->will($this->returnValue($filename)); - - CodeFormatter::format($reflector); - } - - public function filenames() - { - if (defined('HHVM_VERSION')) { - $this->markTestSkipped('We have issues with PHPUnit mocks on HHVM.'); - } - - return array(array(null), array('not a file')); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/Input/ShellInputTest.php b/vendor/psy/psysh/test/Psy/Test/Input/ShellInputTest.php deleted file mode 100644 index 98a89779..00000000 --- a/vendor/psy/psysh/test/Psy/Test/Input/ShellInputTest.php +++ /dev/null @@ -1,204 +0,0 @@ -getProperty('tokenPairs'); - $p->setAccessible(true); - $this->assertEquals($tokens, $p->getValue($input), $message); - } - - public function testInputOptionWithGivenString() - { - $definition = new InputDefinition(array( - new InputOption('foo', null, InputOption::VALUE_REQUIRED), - new CodeArgument('code', null, InputOption::VALUE_REQUIRED), - )); - - $input = new ShellInput('--foo=bar echo "baz\n";'); - $input->bind($definition); - $this->assertEquals('bar', $input->getOption('foo')); - $this->assertEquals('echo "baz\n";', $input->getArgument('code')); - } - - public function testInputOptionWithoutCodeArguments() - { - $definition = new InputDefinition(array( - new InputOption('foo', null, InputOption::VALUE_REQUIRED), - new InputArgument('bar', null, InputOption::VALUE_REQUIRED), - new InputArgument('baz', null, InputOption::VALUE_REQUIRED), - )); - - $input = new ShellInput('--foo=foo bar "baz\n"'); - $input->bind($definition); - $this->assertEquals('foo', $input->getOption('foo')); - $this->assertEquals('bar', $input->getArgument('bar')); - $this->assertEquals("baz\n", $input->getArgument('baz')); - } - - public function getTokenizeData() - { - // Test all the cases from StringInput test, ensuring they have an appropriate $rest token. - return array( - array( - '', - array(), - '->tokenize() parses an empty string', - ), - array( - 'foo', - array(array('foo', 'foo')), - '->tokenize() parses arguments', - ), - array( - ' foo bar ', - array(array('foo', 'foo bar '), array('bar', 'bar ')), - '->tokenize() ignores whitespaces between arguments', - ), - array( - '"quoted"', - array(array('quoted', '"quoted"')), - '->tokenize() parses quoted arguments', - ), - array( - "'quoted'", - array(array('quoted', "'quoted'")), - '->tokenize() parses quoted arguments', - ), - array( - "'a\rb\nc\td'", - array(array("a\rb\nc\td", "'a\rb\nc\td'")), - '->tokenize() parses whitespace chars in strings', - ), - array( - "'a'\r'b'\n'c'\t'd'", - array( - array('a', "'a'\r'b'\n'c'\t'd'"), - array('b', "'b'\n'c'\t'd'"), - array('c', "'c'\t'd'"), - array('d', "'d'"), - ), - '->tokenize() parses whitespace chars between args as spaces', - ), - array( - '\"quoted\"', - array(array('"quoted"', '\"quoted\"')), - '->tokenize() parses escaped-quoted arguments', - ), - array( - "\'quoted\'", - array(array('\'quoted\'', "\'quoted\'")), - '->tokenize() parses escaped-quoted arguments', - ), - array( - '-a', - array(array('-a', '-a')), - '->tokenize() parses short options', - ), - array( - '-azc', - array(array('-azc', '-azc')), - '->tokenize() parses aggregated short options', - ), - array( - '-awithavalue', - array(array('-awithavalue', '-awithavalue')), - '->tokenize() parses short options with a value', - ), - array( - '-a"foo bar"', - array(array('-afoo bar', '-a"foo bar"')), - '->tokenize() parses short options with a value', - ), - array( - '-a"foo bar""foo bar"', - array(array('-afoo barfoo bar', '-a"foo bar""foo bar"')), - '->tokenize() parses short options with a value', - ), - array( - '-a\'foo bar\'', - array(array('-afoo bar', '-a\'foo bar\'')), - '->tokenize() parses short options with a value', - ), - array( - '-a\'foo bar\'\'foo bar\'', - array(array('-afoo barfoo bar', '-a\'foo bar\'\'foo bar\'')), - '->tokenize() parses short options with a value', - ), - array( - '-a\'foo bar\'"foo bar"', - array(array('-afoo barfoo bar', '-a\'foo bar\'"foo bar"')), - '->tokenize() parses short options with a value', - ), - array( - '--long-option', - array(array('--long-option', '--long-option')), - '->tokenize() parses long options', - ), - array( - '--long-option=foo', - array(array('--long-option=foo', '--long-option=foo')), - '->tokenize() parses long options with a value', - ), - array( - '--long-option="foo bar"', - array(array('--long-option=foo bar', '--long-option="foo bar"')), - '->tokenize() parses long options with a value', - ), - array( - '--long-option="foo bar""another"', - array(array('--long-option=foo baranother', '--long-option="foo bar""another"')), - '->tokenize() parses long options with a value', - ), - array( - '--long-option=\'foo bar\'', - array(array('--long-option=foo bar', '--long-option=\'foo bar\'')), - '->tokenize() parses long options with a value', - ), - array( - "--long-option='foo bar''another'", - array(array('--long-option=foo baranother', "--long-option='foo bar''another'")), - '->tokenize() parses long options with a value', - ), - array( - "--long-option='foo bar'\"another\"", - array(array('--long-option=foo baranother', "--long-option='foo bar'\"another\"")), - '->tokenize() parses long options with a value', - ), - array( - 'foo -a -ffoo --long bar', - array( - array('foo', 'foo -a -ffoo --long bar'), - array('-a', '-a -ffoo --long bar'), - array('-ffoo', '-ffoo --long bar'), - array('--long', '--long bar'), - array('bar', 'bar'), - ), - '->tokenize() parses when several arguments and options', - ), - ); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/Reflection/ReflectionConstantTest.php b/vendor/psy/psysh/test/Psy/Test/Reflection/ReflectionConstantTest.php deleted file mode 100644 index 60164f71..00000000 --- a/vendor/psy/psysh/test/Psy/Test/Reflection/ReflectionConstantTest.php +++ /dev/null @@ -1,60 +0,0 @@ -getDeclaringClass(); - - $this->assertTrue($class instanceof \ReflectionClass); - $this->assertEquals('Psy\Test\Reflection\ReflectionConstantTest', $class->getName()); - $this->assertEquals('CONSTANT_ONE', $refl->getName()); - $this->assertEquals('CONSTANT_ONE', (string) $refl); - $this->assertEquals('one', $refl->getValue()); - $this->assertEquals(null, $refl->getFileName()); - $this->assertFalse($refl->getDocComment()); - } - - /** - * @expectedException \InvalidArgumentException - */ - public function testUnknownConstantThrowsException() - { - new ReflectionConstant($this, 'UNKNOWN_CONSTANT'); - } - - /** - * @expectedException \RuntimeException - * @dataProvider notYetImplemented - */ - public function testNotYetImplemented($method) - { - $refl = new ReflectionConstant($this, 'CONSTANT_ONE'); - $refl->$method(); - } - - public function notYetImplemented() - { - return array( - array('getStartLine'), - array('getEndLine'), - array('export'), - ); - } -} diff --git a/vendor/psy/psysh/test/Psy/Test/Readline/GNUReadlineTest.php b/vendor/psy/psysh/test/Readline/GNUReadlineTest.php similarity index 75% rename from vendor/psy/psysh/test/Psy/Test/Readline/GNUReadlineTest.php rename to vendor/psy/psysh/test/Readline/GNUReadlineTest.php index 95a40e7c..7f39197e 100644 --- a/vendor/psy/psysh/test/Psy/Test/Readline/GNUReadlineTest.php +++ b/vendor/psy/psysh/test/Readline/GNUReadlineTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -32,11 +32,11 @@ class GNUReadlineTest extends \PHPUnit\Framework\TestCase $readline = new GNUReadline($this->historyFile); $this->assertEmpty($readline->listHistory()); $readline->addHistory('foo'); - $this->assertEquals(array('foo'), $readline->listHistory()); + $this->assertSame(['foo'], $readline->listHistory()); $readline->addHistory('bar'); - $this->assertEquals(array('foo', 'bar'), $readline->listHistory()); + $this->assertSame(['foo', 'bar'], $readline->listHistory()); $readline->addHistory('baz'); - $this->assertEquals(array('foo', 'bar', 'baz'), $readline->listHistory()); + $this->assertSame(['foo', 'bar', 'baz'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } @@ -50,11 +50,11 @@ class GNUReadlineTest extends \PHPUnit\Framework\TestCase $this->assertEmpty($readline->listHistory()); $readline->addHistory('foo'); $readline->addHistory('bar'); - $this->assertEquals(array('foo', 'bar'), $readline->listHistory()); + $this->assertSame(['foo', 'bar'], $readline->listHistory()); $readline->addHistory('baz'); - $this->assertEquals(array('bar', 'baz'), $readline->listHistory()); + $this->assertSame(['bar', 'baz'], $readline->listHistory()); $readline->addHistory('w00t'); - $this->assertEquals(array('baz', 'w00t'), $readline->listHistory()); + $this->assertSame(['baz', 'w00t'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } @@ -69,11 +69,11 @@ class GNUReadlineTest extends \PHPUnit\Framework\TestCase $readline->addHistory('foo'); $readline->addHistory('bar'); $readline->addHistory('foo'); - $this->assertEquals(array('bar', 'foo'), $readline->listHistory()); + $this->assertSame(['bar', 'foo'], $readline->listHistory()); $readline->addHistory('baz'); $readline->addHistory('w00t'); $readline->addHistory('baz'); - $this->assertEquals(array('bar', 'foo', 'w00t', 'baz'), $readline->listHistory()); + $this->assertSame(['bar', 'foo', 'w00t', 'baz'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } diff --git a/vendor/psy/psysh/test/Psy/Test/Readline/HoaConsoleTest.php b/vendor/psy/psysh/test/Readline/HoaConsoleTest.php similarity index 73% rename from vendor/psy/psysh/test/Psy/Test/Readline/HoaConsoleTest.php rename to vendor/psy/psysh/test/Readline/HoaConsoleTest.php index 707837d8..ecf444f3 100644 --- a/vendor/psy/psysh/test/Psy/Test/Readline/HoaConsoleTest.php +++ b/vendor/psy/psysh/test/Readline/HoaConsoleTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -20,11 +20,11 @@ class HoaConsoleTest extends \PHPUnit\Framework\TestCase $readline = new HoaConsole(); $this->assertEmpty($readline->listHistory()); $readline->addHistory('foo'); - $this->assertEquals(array('foo'), $readline->listHistory()); + $this->assertSame(['foo'], $readline->listHistory()); $readline->addHistory('bar'); - $this->assertEquals(array('foo', 'bar'), $readline->listHistory()); + $this->assertSame(['foo', 'bar'], $readline->listHistory()); $readline->addHistory('baz'); - $this->assertEquals(array('foo', 'bar', 'baz'), $readline->listHistory()); + $this->assertSame(['foo', 'bar', 'baz'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } diff --git a/vendor/psy/psysh/test/Psy/Test/Readline/LibeditTest.php b/vendor/psy/psysh/test/Readline/LibeditTest.php similarity index 80% rename from vendor/psy/psysh/test/Psy/Test/Readline/LibeditTest.php rename to vendor/psy/psysh/test/Readline/LibeditTest.php index fb0aaa59..44a06c61 100644 --- a/vendor/psy/psysh/test/Psy/Test/Readline/LibeditTest.php +++ b/vendor/psy/psysh/test/Readline/LibeditTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -45,11 +45,11 @@ class LibeditTest extends \PHPUnit\Framework\TestCase $readline = new Libedit($this->historyFile); $this->assertEmpty($readline->listHistory()); $readline->addHistory('foo'); - $this->assertEquals(array('foo'), $readline->listHistory()); + $this->assertSame(['foo'], $readline->listHistory()); $readline->addHistory('bar'); - $this->assertEquals(array('foo', 'bar'), $readline->listHistory()); + $this->assertSame(['foo', 'bar'], $readline->listHistory()); $readline->addHistory('baz'); - $this->assertEquals(array('foo', 'bar', 'baz'), $readline->listHistory()); + $this->assertSame(['foo', 'bar', 'baz'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } @@ -63,11 +63,11 @@ class LibeditTest extends \PHPUnit\Framework\TestCase $this->assertEmpty($readline->listHistory()); $readline->addHistory('foo'); $readline->addHistory('bar'); - $this->assertEquals(array('foo', 'bar'), $readline->listHistory()); + $this->assertSame(['foo', 'bar'], $readline->listHistory()); $readline->addHistory('baz'); - $this->assertEquals(array('bar', 'baz'), $readline->listHistory()); + $this->assertSame(['bar', 'baz'], $readline->listHistory()); $readline->addHistory('w00t'); - $this->assertEquals(array('baz', 'w00t'), $readline->listHistory()); + $this->assertSame(['baz', 'w00t'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } @@ -82,11 +82,11 @@ class LibeditTest extends \PHPUnit\Framework\TestCase $readline->addHistory('foo'); $readline->addHistory('bar'); $readline->addHistory('foo'); - $this->assertEquals(array('bar', 'foo'), $readline->listHistory()); + $this->assertSame(['bar', 'foo'], $readline->listHistory()); $readline->addHistory('baz'); $readline->addHistory('w00t'); $readline->addHistory('baz'); - $this->assertEquals(array('bar', 'foo', 'w00t', 'baz'), $readline->listHistory()); + $this->assertSame(['bar', 'foo', 'w00t', 'baz'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } @@ -99,10 +99,10 @@ class LibeditTest extends \PHPUnit\Framework\TestCase "This is an entry\n\0This is a comment\nThis is an entry\0With a comment\n", FILE_APPEND ); - $this->assertEquals(array( + $this->assertSame([ 'This is an entry', 'This is an entry', - ), $readline->listHistory()); + ], $readline->listHistory()); $readline->clearHistory(); } @@ -118,11 +118,11 @@ class LibeditTest extends \PHPUnit\Framework\TestCase "foo\rbar\nbaz\r\nw00t", FILE_APPEND ); - $this->assertEquals(array( + $this->assertSame([ "foo\rbar", "baz\r", 'w00t', - ), $readline->listHistory()); + ], $readline->listHistory()); $readline->clearHistory(); } } diff --git a/vendor/psy/psysh/test/Psy/Test/Readline/TransientTest.php b/vendor/psy/psysh/test/Readline/TransientTest.php similarity index 74% rename from vendor/psy/psysh/test/Psy/Test/Readline/TransientTest.php rename to vendor/psy/psysh/test/Readline/TransientTest.php index 24eafbaf..24fcba0b 100644 --- a/vendor/psy/psysh/test/Psy/Test/Readline/TransientTest.php +++ b/vendor/psy/psysh/test/Readline/TransientTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -20,11 +20,11 @@ class TransientTest extends \PHPUnit\Framework\TestCase $readline = new Transient(); $this->assertEmpty($readline->listHistory()); $readline->addHistory('foo'); - $this->assertEquals(array('foo'), $readline->listHistory()); + $this->assertSame(['foo'], $readline->listHistory()); $readline->addHistory('bar'); - $this->assertEquals(array('foo', 'bar'), $readline->listHistory()); + $this->assertSame(['foo', 'bar'], $readline->listHistory()); $readline->addHistory('baz'); - $this->assertEquals(array('foo', 'bar', 'baz'), $readline->listHistory()); + $this->assertSame(['foo', 'bar', 'baz'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } @@ -38,11 +38,11 @@ class TransientTest extends \PHPUnit\Framework\TestCase $this->assertEmpty($readline->listHistory()); $readline->addHistory('foo'); $readline->addHistory('bar'); - $this->assertEquals(array('foo', 'bar'), $readline->listHistory()); + $this->assertSame(['foo', 'bar'], $readline->listHistory()); $readline->addHistory('baz'); - $this->assertEquals(array('bar', 'baz'), $readline->listHistory()); + $this->assertSame(['bar', 'baz'], $readline->listHistory()); $readline->addHistory('w00t'); - $this->assertEquals(array('baz', 'w00t'), $readline->listHistory()); + $this->assertSame(['baz', 'w00t'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } @@ -57,11 +57,11 @@ class TransientTest extends \PHPUnit\Framework\TestCase $readline->addHistory('foo'); $readline->addHistory('bar'); $readline->addHistory('foo'); - $this->assertEquals(array('bar', 'foo'), $readline->listHistory()); + $this->assertSame(['bar', 'foo'], $readline->listHistory()); $readline->addHistory('baz'); $readline->addHistory('w00t'); $readline->addHistory('baz'); - $this->assertEquals(array('bar', 'foo', 'w00t', 'baz'), $readline->listHistory()); + $this->assertSame(['bar', 'foo', 'w00t', 'baz'], $readline->listHistory()); $readline->clearHistory(); $this->assertEmpty($readline->listHistory()); } diff --git a/vendor/psy/psysh/test/Reflection/ReflectionClassConstantTest.php b/vendor/psy/psysh/test/Reflection/ReflectionClassConstantTest.php new file mode 100644 index 00000000..87d4f752 --- /dev/null +++ b/vendor/psy/psysh/test/Reflection/ReflectionClassConstantTest.php @@ -0,0 +1,81 @@ +getDeclaringClass(); + + $this->assertInstanceOf('ReflectionClass', $class); + $this->assertSame('Psy\Test\Reflection\ReflectionClassConstantTest', $class->getName()); + $this->assertSame('CONSTANT_ONE', $refl->getName()); + $this->assertSame('CONSTANT_ONE', (string) $refl); + $this->assertSame('one', $refl->getValue()); + $this->assertNull($refl->getFileName()); + $this->assertFalse($refl->getDocComment()); + } + + /** + * @expectedException \InvalidArgumentException + */ + public function testUnknownConstantThrowsException() + { + new ReflectionClassConstant($this, 'UNKNOWN_CONSTANT'); + } + + public function testExport() + { + $ret = ReflectionClassConstant::export($this, 'CONSTANT_ONE', true); + $this->assertEquals($ret, 'Constant [ public string CONSTANT_ONE ] { one }'); + } + + public function testExportOutput() + { + $this->expectOutputString("Constant [ public string CONSTANT_ONE ] { one }\n"); + ReflectionClassConstant::export($this, 'CONSTANT_ONE', false); + } + + public function testModifiers() + { + $refl = new ReflectionClassConstant($this, 'CONSTANT_ONE'); + + $this->assertEquals(\ReflectionMethod::IS_PUBLIC, $refl->getModifiers()); + $this->assertFalse($refl->isPrivate()); + $this->assertFalse($refl->isProtected()); + $this->assertTrue($refl->isPublic()); + } + + /** + * @expectedException \RuntimeException + * @dataProvider notYetImplemented + */ + public function testNotYetImplemented($method) + { + $refl = new ReflectionClassConstant($this, 'CONSTANT_ONE'); + $refl->$method(); + } + + public function notYetImplemented() + { + return [ + ['getStartLine'], + ['getEndLine'], + ]; + } +} diff --git a/vendor/psy/psysh/test/Reflection/ReflectionConstantBCTest.php b/vendor/psy/psysh/test/Reflection/ReflectionConstantBCTest.php new file mode 100644 index 00000000..69d27970 --- /dev/null +++ b/vendor/psy/psysh/test/Reflection/ReflectionConstantBCTest.php @@ -0,0 +1,26 @@ +assertInstanceOf('Psy\Reflection\ReflectionConstant', $refl); + $this->assertInstanceOf('Psy\Reflection\ReflectionClassConstant', $refl); + } +} diff --git a/vendor/psy/psysh/test/Reflection/ReflectionConstantTest.php b/vendor/psy/psysh/test/Reflection/ReflectionConstantTest.php new file mode 100644 index 00000000..95328ff8 --- /dev/null +++ b/vendor/psy/psysh/test/Reflection/ReflectionConstantTest.php @@ -0,0 +1,114 @@ +assertFalse($refl->getDocComment()); + $this->assertEquals('Psy\\Test\\Reflection\\SOME_CONSTANT', $refl->getName()); + $this->assertEquals('Psy\\Test\\Reflection', $refl->getNamespaceName()); + $this->assertEquals('yep', $refl->getValue()); + $this->assertTrue($refl->inNamespace()); + $this->assertEquals('Psy\\Test\\Reflection\\SOME_CONSTANT', (string) $refl); + $this->assertNull($refl->getFileName()); + } + + public function testBuiltInConstant() + { + $refl = new ReflectionConstant_('PHP_VERSION'); + + $this->assertEquals('PHP_VERSION', $refl->getName()); + $this->assertEquals('PHP_VERSION', (string) $refl); + $this->assertEquals(PHP_VERSION, $refl->getValue()); + $this->assertFalse($refl->inNamespace()); + $this->assertSame('', $refl->getNamespaceName()); + } + + /** + * @dataProvider magicConstants + */ + public function testIsMagicConstant($name, $is) + { + $this->assertEquals($is, ReflectionConstant_::isMagicConstant($name)); + } + + public function magicConstants() + { + return [ + ['__LINE__', true], + ['__FILE__', true], + ['__DIR__', true], + ['__FUNCTION__', true], + ['__CLASS__', true], + ['__TRAIT__', true], + ['__METHOD__', true], + ['__NAMESPACE__', true], + ['__COMPILER_HALT_OFFSET__', true], + ['PHP_VERSION', false], + ['PHP_EOL', false], + ['Psy\\Test\\Reflection\\SOME_CONSTANT', false], + ['What if it isn\'t even a valid constant name?', false], + ]; + } + + /** + * @expectedException \InvalidArgumentException + */ + public function testUnknownConstantThrowsException() + { + new ReflectionConstant_('UNKNOWN_CONSTANT'); + } + + public function testExport() + { + $ret = ReflectionConstant_::export('Psy\\Test\\Reflection\\SOME_CONSTANT', true); + $this->assertEquals($ret, 'Constant [ string Psy\\Test\\Reflection\\SOME_CONSTANT ] { yep }'); + } + + public function testExportOutput() + { + $this->expectOutputString("Constant [ string Psy\\Test\\Reflection\\SOME_CONSTANT ] { yep }\n"); + ReflectionConstant_::export('Psy\\Test\\Reflection\\SOME_CONSTANT', false); + } + + public function testGetFileName() + { + $refl = new ReflectionConstant_('Psy\\Test\\Reflection\\SOME_CONSTANT'); + $this->assertNull($refl->getFileName()); + } + + /** + * @expectedException \RuntimeException + * @dataProvider notYetImplemented + */ + public function testNotYetImplemented($method) + { + $refl = new ReflectionConstant_('Psy\\Test\\Reflection\\SOME_CONSTANT'); + $refl->$method(); + } + + public function notYetImplemented() + { + return [ + ['getStartLine'], + ['getEndLine'], + ]; + } +} diff --git a/vendor/psy/psysh/test/Reflection/ReflectionLanguageConstructParameterTest.php b/vendor/psy/psysh/test/Reflection/ReflectionLanguageConstructParameterTest.php new file mode 100644 index 00000000..223432f8 --- /dev/null +++ b/vendor/psy/psysh/test/Reflection/ReflectionLanguageConstructParameterTest.php @@ -0,0 +1,64 @@ + false, + 'defaultValue' => null, + 'isOptional' => false, + 'isPassedByReference' => false, + ]); + + $this->assertNull($refl->getClass()); + $this->assertEquals('one', $refl->getName()); + $this->assertFalse($refl->isArray()); + $this->assertTrue($refl->isDefaultValueAvailable()); + $this->assertNull($refl->getDefaultValue()); + $this->assertFalse($refl->isOptional()); + $this->assertFalse($refl->isPassedByReference()); + + $reflTwo = new ReflectionLanguageConstructParameter($keyword, 'two', [ + 'isArray' => true, + 'isOptional' => true, + 'isPassedByReference' => true, + ]); + + $this->assertNull($refl->getClass()); + $this->assertEquals('two', $reflTwo->getName()); + $this->assertTrue($reflTwo->isArray()); + $this->assertFalse($reflTwo->isDefaultValueAvailable()); + $this->assertNull($reflTwo->getDefaultValue()); + $this->assertTrue($reflTwo->isOptional()); + $this->assertTrue($reflTwo->isPassedByReference()); + + $refl = new ReflectionLanguageConstructParameter($keyword, 'three', [ + 'defaultValue' => 3, + ]); + + $this->assertNull($refl->getClass()); + $this->assertEquals('three', $refl->getName()); + $this->assertFalse($refl->isArray()); + $this->assertTrue($refl->isDefaultValueAvailable()); + $this->assertEquals(3, $refl->getDefaultValue()); + $this->assertFalse($refl->isOptional()); + $this->assertFalse($refl->isPassedByReference()); + } +} diff --git a/vendor/psy/psysh/test/Reflection/ReflectionLanguageConstructTest.php b/vendor/psy/psysh/test/Reflection/ReflectionLanguageConstructTest.php new file mode 100644 index 00000000..872a726d --- /dev/null +++ b/vendor/psy/psysh/test/Reflection/ReflectionLanguageConstructTest.php @@ -0,0 +1,102 @@ +assertEquals($keyword, $refl->getName()); + $this->assertEquals($keyword, (string) $refl); + } + + /** + * @dataProvider languageConstructs + */ + public function testKnownLanguageConstructs($keyword) + { + $this->assertTrue(ReflectionLanguageConstruct::isLanguageConstruct($keyword)); + } + + /** + * @dataProvider languageConstructs + */ + public function testFileName($keyword) + { + $refl = new ReflectionLanguageConstruct($keyword); + $this->assertFalse($refl->getFileName()); + } + + /** + * @dataProvider languageConstructs + */ + public function testReturnsReference($keyword) + { + $refl = new ReflectionLanguageConstruct($keyword); + $this->assertFalse($refl->returnsReference()); + } + + /** + * @dataProvider languageConstructs + */ + public function testGetParameters($keyword) + { + $refl = new ReflectionLanguageConstruct($keyword); + $this->assertNotEmpty($refl->getParameters()); + } + + /** + * @dataProvider languageConstructs + * @expectedException \RuntimeException + */ + public function testExportThrows($keyword) + { + ReflectionLanguageConstruct::export($keyword); + } + + public function languageConstructs() + { + return [ + ['isset'], + ['unset'], + ['empty'], + ['echo'], + ['print'], + ['die'], + ['exit'], + ]; + } + + /** + * @dataProvider unknownLanguageConstructs + * @expectedException \InvalidArgumentException + */ + public function testUnknownLanguageConstructsThrowExceptions($keyword) + { + new ReflectionLanguageConstruct($keyword); + } + + public function unknownLanguageConstructs() + { + return [ + ['async'], + ['await'], + ['comefrom'], + ]; + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/ShellTest.php b/vendor/psy/psysh/test/ShellTest.php similarity index 62% rename from vendor/psy/psysh/test/Psy/Test/ShellTest.php rename to vendor/psy/psysh/test/ShellTest.php index 01dddc8e..5b587d63 100644 --- a/vendor/psy/psysh/test/Psy/Test/ShellTest.php +++ b/vendor/psy/psysh/test/ShellTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -20,7 +20,7 @@ use Symfony\Component\Console\Output\StreamOutput; class ShellTest extends \PHPUnit\Framework\TestCase { - private $streams = array(); + private $streams = []; public function tearDown() { @@ -42,20 +42,20 @@ class ShellTest extends \PHPUnit\Framework\TestCase $shell->setScopeVariables(compact('one', 'two', 'three', '__psysh__', '_', '_e', 'this')); $this->assertNotContains('__psysh__', $shell->getScopeVariableNames()); - $this->assertEquals(array('one', 'two', 'three', '_'), $shell->getScopeVariableNames()); - $this->assertEquals('banana', $shell->getScopeVariable('one')); - $this->assertEquals(123, $shell->getScopeVariable('two')); + $this->assertSame(['one', 'two', 'three', '_'], $shell->getScopeVariableNames()); + $this->assertSame('banana', $shell->getScopeVariable('one')); + $this->assertSame(123, $shell->getScopeVariable('two')); $this->assertSame($three, $shell->getScopeVariable('three')); $this->assertNull($shell->getScopeVariable('_')); - $shell->setScopeVariables(array()); - $this->assertEquals(array('_'), $shell->getScopeVariableNames()); + $shell->setScopeVariables([]); + $this->assertSame(['_'], $shell->getScopeVariableNames()); $shell->setBoundObject($this); - $this->assertEquals(array('_', 'this'), $shell->getScopeVariableNames()); + $this->assertSame(['_', 'this'], $shell->getScopeVariableNames()); $this->assertSame($this, $shell->getScopeVariable('this')); - $this->assertEquals(array('_' => null), $shell->getScopeVariables(false)); - $this->assertEquals(array('_' => null, 'this' => $this), $shell->getScopeVariables()); + $this->assertSame(['_' => null], $shell->getScopeVariables(false)); + $this->assertSame(['_' => null, 'this' => $this], $shell->getScopeVariables()); } /** @@ -64,44 +64,82 @@ class ShellTest extends \PHPUnit\Framework\TestCase public function testUnknownScopeVariablesThrowExceptions() { $shell = new Shell($this->getConfig()); - $shell->setScopeVariables(array('foo' => 'FOO', 'bar' => 1)); + $shell->setScopeVariables(['foo' => 'FOO', 'bar' => 1]); $shell->getScopeVariable('baz'); } + public function testIncludesWithScopeVariables() + { + $one = 'banana'; + $two = 123; + $three = new \StdClass(); + $__psysh__ = 'ignore this'; + $_ = 'ignore this'; + $_e = 'ignore this'; + + $config = $this->getConfig(['usePcntl' => false]); + + $shell = new Shell($config); + $shell->setScopeVariables(compact('one', 'two', 'three', '__psysh__', '_', '_e', 'this')); + $shell->addInput('exit', true); + + // This is super slow and we shouldn't do this :( + $shell->run(null, $this->getOutput()); + + $this->assertNotContains('__psysh__', $shell->getScopeVariableNames()); + $this->assertSame(['one', 'two', 'three', '_', '_e'], $shell->getScopeVariableNames()); + $this->assertSame('banana', $shell->getScopeVariable('one')); + $this->assertSame(123, $shell->getScopeVariable('two')); + $this->assertSame($three, $shell->getScopeVariable('three')); + $this->assertNull($shell->getScopeVariable('_')); + } + public function testIncludes() { - $config = $this->getConfig(array('configFile' => __DIR__ . '/../../fixtures/empty.php')); + $config = $this->getConfig(['configFile' => __DIR__ . '/fixtures/empty.php']); $shell = new Shell($config); $this->assertEmpty($shell->getIncludes()); - $shell->setIncludes(array('foo', 'bar', 'baz')); - $this->assertEquals(array('foo', 'bar', 'baz'), $shell->getIncludes()); + $shell->setIncludes(['foo', 'bar', 'baz']); + $this->assertSame(['foo', 'bar', 'baz'], $shell->getIncludes()); } public function testIncludesConfig() { - $config = $this->getConfig(array( - 'defaultIncludes' => array('/file.php'), - 'configFile' => __DIR__ . '/../../fixtures/empty.php', - )); + $config = $this->getConfig([ + 'defaultIncludes' => ['/file.php'], + 'configFile' => __DIR__ . '/fixtures/empty.php', + ]); $shell = new Shell($config); $includes = $shell->getIncludes(); - $this->assertEquals('/file.php', $includes[0]); + $this->assertSame('/file.php', $includes[0]); } public function testAddMatchersViaConfig() { - $config = $this->getConfig(array( - 'tabCompletionMatchers' => array( - new ClassMethodsMatcher(), - ), - )); + $shell = new FakeShell(); + $matcher = new ClassMethodsMatcher(); - $matchers = $config->getTabCompletionMatchers(); + $config = $this->getConfig([ + 'matchers' => [$matcher], + ]); + $config->setShell($shell); - $this->assertTrue(array_pop($matchers) instanceof ClassMethodsMatcher); + $this->assertSame([$matcher], $shell->matchers); + } + + public function testAddMatchersViaConfigAfterShell() + { + $shell = new FakeShell(); + $matcher = new ClassMethodsMatcher(); + + $config = $this->getConfig([]); + $config->setShell($shell); + $config->addMatchers([$matcher]); + + $this->assertSame([$matcher], $shell->matchers); } public function testRenderingExceptions() @@ -200,7 +238,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase $this->assertFalse($shell->hasCode()); $code = preg_replace('/\s+/', ' ', $code); $this->assertNotNull($code); - $this->assertEquals('class a { } return new \\Psy\\CodeCleaner\\NoReturnValue();', $code); + $this->assertSame('class a { } return new \\Psy\\CodeCleaner\\NoReturnValue();', $code); } public function testKeepCodeBufferOpen() @@ -220,7 +258,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase $this->assertFalse($shell->hasCode()); $code = preg_replace('/\s+/', ' ', $code); $this->assertNotNull($code); - $this->assertEquals('return 1 + 1 + 1;', $code); + $this->assertSame('return 1 + 1 + 1;', $code); } /** @@ -241,7 +279,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase $shell->flushCode(); $code = '$test()'; $shell->addCode($code); - $this->assertEquals($shell->flushCode(), 'return $test();'); + $this->assertSame($shell->flushCode(), 'return $test();'); } public function testWriteStdout() @@ -256,7 +294,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase rewind($stream); $streamContents = stream_get_contents($stream); - $this->assertEquals('{{stdout}}' . PHP_EOL, $streamContents); + $this->assertSame('{{stdout}}' . PHP_EOL, $streamContents); } public function testWriteStdoutWithoutNewline() @@ -271,7 +309,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase rewind($stream); $streamContents = stream_get_contents($stream); - $this->assertEquals('{{stdout}}' . PHP_EOL, $streamContents); + $this->assertSame('{{stdout}}' . PHP_EOL, $streamContents); } /** @@ -291,10 +329,10 @@ class ShellTest extends \PHPUnit\Framework\TestCase public function getReturnValues() { - return array( - array('{{return value}}', "=> \"\033[32m{{return value}}\033[39m\"" . PHP_EOL), - array(1, "=> \033[35m1\033[39m" . PHP_EOL), - ); + return [ + ['{{return value}}', "=> \"\033[32m{{return value}}\033[39m\"" . PHP_EOL], + [1, "=> \033[35m1\033[39m" . PHP_EOL], + ]; } /** @@ -309,14 +347,69 @@ class ShellTest extends \PHPUnit\Framework\TestCase $shell->writeException($exception); rewind($stream); - $this->assertEquals($expected, stream_get_contents($stream)); + $this->assertSame($expected, stream_get_contents($stream)); } public function getRenderedExceptions() { - return array( - array(new \Exception('{{message}}'), "Exception with message '{{message}}'" . PHP_EOL), - ); + return [ + [new \Exception('{{message}}'), "Exception with message '{{message}}'" . PHP_EOL], + ]; + } + + /** + * @dataProvider getExecuteValues + */ + public function testShellExecute($input, $expected) + { + $output = $this->getOutput(); + $stream = $output->getStream(); + $shell = new Shell($this->getConfig()); + $shell->setOutput($output); + $this->assertEquals($expected, $shell->execute($input)); + rewind($stream); + $this->assertSame('', stream_get_contents($stream)); + } + + public function getExecuteValues() + { + return [ + ['return 12', 12], + ['"{{return value}}"', '{{return value}}'], + ['1', '1'], + ]; + } + + /** + * @dataProvider commandsToHas + */ + public function testHasCommand($command, $has) + { + $shell = new Shell($this->getConfig()); + + // :-/ + $refl = new \ReflectionClass('Psy\\Shell'); + $method = $refl->getMethod('hasCommand'); + $method->setAccessible(true); + + $this->assertEquals($method->invokeArgs($shell, [$command]), $has); + } + + public function commandsToHas() + { + return [ + ['help', true], + ['help help', true], + ['"help"', false], + ['"help help"', false], + ['ls -al ', true], + ['ls "-al" ', true], + ['ls"-al"', false], + [' q', true], + [' q --help', true], + ['"q"', false], + ['"q",', false], + ]; } private function getOutput() @@ -329,17 +422,17 @@ class ShellTest extends \PHPUnit\Framework\TestCase return $output; } - private function getConfig(array $config = array()) + private function getConfig(array $config = []) { // Mebbe there's a better way than this? $dir = tempnam(sys_get_temp_dir(), 'psysh_shell_test_'); unlink($dir); - $defaults = array( + $defaults = [ 'configDir' => $dir, 'dataDir' => $dir, 'runtimeDir' => $dir, - ); + ]; return new Configuration(array_merge($defaults, $config)); } diff --git a/vendor/psy/psysh/test/Sudo/SudoVisitorTest.php b/vendor/psy/psysh/test/Sudo/SudoVisitorTest.php new file mode 100644 index 00000000..1f2042c8 --- /dev/null +++ b/vendor/psy/psysh/test/Sudo/SudoVisitorTest.php @@ -0,0 +1,142 @@ +traverser = new NodeTraverser(); + $this->traverser->addVisitor(new SudoVisitor()); + } + + /** + * @dataProvider propertyFetches + */ + public function testPropertyFetch($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function propertyFetches() + { + return [ + ['$a->b', "\Psy\Sudo::fetchProperty(\$a, 'b');"], + ['$a->$b', '\Psy\Sudo::fetchProperty($a, $b);'], + ["\$a->{'b'}", "\Psy\Sudo::fetchProperty(\$a, 'b');"], + ]; + } + + /** + * @dataProvider propertyAssigns + */ + public function testPropertyAssign($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function propertyAssigns() + { + return [ + ['$a->b = $c', "\Psy\Sudo::assignProperty(\$a, 'b', \$c);"], + ['$a->$b = $c', '\Psy\Sudo::assignProperty($a, $b, $c);'], + ["\$a->{'b'} = \$c", "\Psy\Sudo::assignProperty(\$a, 'b', \$c);"], + ]; + } + + /** + * @dataProvider methodCalls + */ + public function testMethodCall($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function methodCalls() + { + return [ + ['$a->b()', "\Psy\Sudo::callMethod(\$a, 'b');"], + ['$a->$b()', '\Psy\Sudo::callMethod($a, $b);'], + ["\$a->b(\$c, 'd')", "\Psy\Sudo::callMethod(\$a, 'b', \$c, 'd');"], + ["\$a->\$b(\$c, 'd')", "\Psy\Sudo::callMethod(\$a, \$b, \$c, 'd');"], + ]; + } + + /** + * @dataProvider staticPropertyFetches + */ + public function testStaticPropertyFetch($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function staticPropertyFetches() + { + return [ + ['A::$b', "\Psy\Sudo::fetchStaticProperty('A', 'b');"], + ['$a::$b', "\Psy\Sudo::fetchStaticProperty(\$a, 'b');"], + ]; + } + + /** + * @dataProvider staticPropertyAssigns + */ + public function testStaticPropertyAssign($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function staticPropertyAssigns() + { + return [ + ['A::$b = $c', "\Psy\Sudo::assignStaticProperty('A', 'b', \$c);"], + ['$a::$b = $c', "\Psy\Sudo::assignStaticProperty(\$a, 'b', \$c);"], + ]; + } + + /** + * @dataProvider staticCalls + */ + public function testStaticCall($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function staticCalls() + { + return [ + ['A::b()', "\Psy\Sudo::callStatic('A', 'b');"], + ['A::$b()', "\Psy\Sudo::callStatic('A', \$b);"], + ["A::b(\$c, 'd')", "\Psy\Sudo::callStatic('A', 'b', \$c, 'd');"], + ["A::\$b(\$c, 'd')", "\Psy\Sudo::callStatic('A', \$b, \$c, 'd');"], + ]; + } + + /** + * @dataProvider classConstFetches + */ + public function testClassConstFetch($from, $to) + { + $this->assertProcessesAs($from, $to); + } + + public function classConstFetches() + { + return [ + ['A::B', "\Psy\Sudo::fetchClassConst('A', 'B');"], + ]; + } +} diff --git a/vendor/psy/psysh/test/SudoTest.php b/vendor/psy/psysh/test/SudoTest.php new file mode 100644 index 00000000..8ac07774 --- /dev/null +++ b/vendor/psy/psysh/test/SudoTest.php @@ -0,0 +1,80 @@ +markTestSkipped('YOLO'); + } + } + + public function testFetchProperty() + { + $obj = new ClassWithSecrets(); + $this->assertSame('private and prop', Sudo::fetchProperty($obj, 'privateProp')); + } + + public function testAssignProperty() + { + $obj = new ClassWithSecrets(); + $this->assertSame('private and prop', Sudo::fetchProperty($obj, 'privateProp')); + $this->assertSame('not so private now', Sudo::assignProperty($obj, 'privateProp', 'not so private now')); + $this->assertSame('not so private now', Sudo::fetchProperty($obj, 'privateProp')); + } + + public function testCallMethod() + { + $obj = new ClassWithSecrets(); + $this->assertSame('private and method', Sudo::callMethod($obj, 'privateMethod')); + $this->assertSame('private and method with 1', Sudo::callMethod($obj, 'privateMethod', 1)); + $this->assertSame( + 'private and method with ["foo",2]', + Sudo::callMethod($obj, 'privateMethod', ['foo', 2] + )); + } + + public function testFetchStaticProperty() + { + $obj = new ClassWithSecrets(); + $this->assertSame('private and static and prop', Sudo::fetchStaticProperty($obj, 'privateStaticProp')); + } + + public function testAssignStaticProperty() + { + $obj = new ClassWithSecrets(); + $this->assertSame('private and static and prop', Sudo::fetchStaticProperty($obj, 'privateStaticProp')); + $this->assertSame('not so private now', Sudo::assignStaticProperty($obj, 'privateStaticProp', 'not so private now')); + $this->assertSame('not so private now', Sudo::fetchStaticProperty($obj, 'privateStaticProp')); + } + + public function testCallStatic() + { + $obj = new ClassWithSecrets(); + $this->assertSame('private and static and method', Sudo::callStatic($obj, 'privateStaticMethod')); + $this->assertSame('private and static and method with 1', Sudo::callStatic($obj, 'privateStaticMethod', 1)); + $this->assertSame( + 'private and static and method with ["foo",2]', + Sudo::callStatic($obj, 'privateStaticMethod', ['foo', 2] + )); + } + + public function testFetchClassConst() + { + $obj = new ClassWithSecrets(); + $this->assertSame('private and const', Sudo::fetchClassConst($obj, 'PRIVATE_CONST')); + } +} diff --git a/vendor/psy/psysh/test/Psy/Test/TabCompletion/AutoCompleterTest.php b/vendor/psy/psysh/test/TabCompletion/AutoCompleterTest.php similarity index 60% rename from vendor/psy/psysh/test/Psy/Test/TabCompletion/AutoCompleterTest.php rename to vendor/psy/psysh/test/TabCompletion/AutoCompleterTest.php index 3f2fda90..25878046 100644 --- a/vendor/psy/psysh/test/Psy/Test/TabCompletion/AutoCompleterTest.php +++ b/vendor/psy/psysh/test/TabCompletion/AutoCompleterTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -21,21 +21,21 @@ use Psy\TabCompletion\Matcher; class AutoCompleterTest extends \PHPUnit\Framework\TestCase { /** - * @param $line - * @param $mustContain - * @param $mustNotContain + * @param string $line + * @param array $mustContain + * @param array $mustNotContain * @dataProvider classesInput */ public function testClassesCompletion($line, $mustContain, $mustNotContain) { $context = new Context(); - $commands = array( + $commands = [ new ShowCommand(), new ListCommand(), - ); + ]; - $matchers = array( + $matchers = [ new Matcher\VariablesMatcher(), new Matcher\ClassNamesMatcher(), new Matcher\ConstantsMatcher(), @@ -46,7 +46,7 @@ class AutoCompleterTest extends \PHPUnit\Framework\TestCase new Matcher\ClassAttributesMatcher(), new Matcher\ClassMethodsMatcher(), new Matcher\CommandsMatcher($commands), - ); + ]; $config = new Configuration(); $tabCompletion = $config->getAutoCompleter(); @@ -57,13 +57,13 @@ class AutoCompleterTest extends \PHPUnit\Framework\TestCase $tabCompletion->addMatcher($matcher); } - $context->setAll(array('foo' => 12, 'bar' => new \DOMDocument())); + $context->setAll(['foo' => 12, 'bar' => new \DOMDocument()]); - $code = $tabCompletion->processCallback('', 0, array( + $code = $tabCompletion->processCallback('', 0, [ 'line_buffer' => $line, 'point' => 0, 'end' => strlen($line), - )); + ]); foreach ($mustContain as $mc) { $this->assertContains($mc, $code); @@ -92,54 +92,54 @@ class AutoCompleterTest extends \PHPUnit\Framework\TestCase */ public function classesInput() { - return array( + return [ // input, must had, must not had - array('T_OPE', array('T_OPEN_TAG'), array()), - array('st', array('stdClass'), array()), - array('stdCla', array('stdClass'), array()), - array('new s', array('stdClass'), array()), - array( + ['T_OPE', ['T_OPEN_TAG'], []], + ['st', ['stdClass'], []], + ['stdCla', ['stdClass'], []], + ['new s', ['stdClass'], []], + [ 'new ', - array('stdClass', 'Psy\\Context', 'Psy\\Configuration'), - array('require', 'array_search', 'T_OPEN_TAG', '$foo'), - ), - array('new Psy\\C', array('Context'), array('CASE_LOWER')), - array('\s', array('stdClass'), array()), - array('array_', array('array_search', 'array_map', 'array_merge'), array()), - array('$bar->', array('load'), array()), - array('$b', array('bar'), array()), - array('6 + $b', array('bar'), array()), - array('$f', array('foo'), array()), - array('l', array('ls'), array()), - array('ls ', array(), array('ls')), - array('sho', array('show'), array()), - array('12 + clone $', array('foo'), array()), + ['stdClass', 'Psy\\Context', 'Psy\\Configuration'], + ['require', 'array_search', 'T_OPEN_TAG', '$foo'], + ], + ['new Psy\\C', ['Context'], ['CASE_LOWER']], + ['\s', ['stdClass'], []], + ['array_', ['array_search', 'array_map', 'array_merge'], []], + ['$bar->', ['load'], []], + ['$b', ['bar'], []], + ['6 + $b', ['bar'], []], + ['$f', ['foo'], []], + ['l', ['ls'], []], + ['ls ', [], ['ls']], + ['sho', ['show'], []], + ['12 + clone $', ['foo'], []], // array( // '$foo ', // array('+', 'clone'), // array('$foo', 'DOMDocument', 'array_map') // ), requires a operator matcher? - array('$', array('foo', 'bar'), array('require', 'array_search', 'T_OPEN_TAG', 'Psy')), - array( + ['$', ['foo', 'bar'], ['require', 'array_search', 'T_OPEN_TAG', 'Psy']], + [ 'Psy\\', - array('Context', 'TabCompletion\\Matcher\\AbstractMatcher'), - array('require', 'array_search'), - ), - array( + ['Context', 'TabCompletion\\Matcher\\AbstractMatcher'], + ['require', 'array_search'], + ], + [ 'Psy\Test\TabCompletion\StaticSample::CO', - array('Psy\Test\TabCompletion\StaticSample::CONSTANT_VALUE'), - array(), - ), - array( + ['StaticSample::CONSTANT_VALUE'], + [], + ], + [ 'Psy\Test\TabCompletion\StaticSample::', - array('Psy\Test\TabCompletion\StaticSample::$staticVariable'), - array(), - ), - array( + ['StaticSample::$staticVariable'], + [], + ], + [ 'Psy\Test\TabCompletion\StaticSample::', - array('Psy\Test\TabCompletion\StaticSample::staticFunction'), - array(), - ), - ); + ['StaticSample::staticFunction'], + [], + ], + ]; } } diff --git a/vendor/psy/psysh/test/Psy/Test/TabCompletion/StaticSample.php b/vendor/psy/psysh/test/TabCompletion/StaticSample.php similarity index 93% rename from vendor/psy/psysh/test/Psy/Test/TabCompletion/StaticSample.php rename to vendor/psy/psysh/test/TabCompletion/StaticSample.php index aea0031c..e0de2f0b 100644 --- a/vendor/psy/psysh/test/Psy/Test/TabCompletion/StaticSample.php +++ b/vendor/psy/psysh/test/TabCompletion/StaticSample.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/test/Psy/Test/Util/DocblockTest.php b/vendor/psy/psysh/test/Util/DocblockTest.php similarity index 65% rename from vendor/psy/psysh/test/Psy/Test/Util/DocblockTest.php rename to vendor/psy/psysh/test/Util/DocblockTest.php index 9ed3c029..6fa775d9 100644 --- a/vendor/psy/psysh/test/Psy/Test/Util/DocblockTest.php +++ b/vendor/psy/psysh/test/Util/DocblockTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -31,7 +31,7 @@ class DocblockTest extends \PHPUnit\Framework\TestCase $docblock = new Docblock($reflector); - $this->assertEquals($body, $docblock->desc); + $this->assertSame($body, $docblock->desc); foreach ($tags as $tag => $value) { $this->assertTrue($docblock->hasTag($tag)); @@ -45,20 +45,20 @@ class DocblockTest extends \PHPUnit\Framework\TestCase $this->markTestSkipped('We have issues with PHPUnit mocks on HHVM.'); } - return array( - array('', '', array()), - array( + return [ + ['', '', []], + [ '/** * This is a docblock * * @throws \Exception with a description */', 'This is a docblock', - array( - 'throws' => array(array('type' => '\Exception', 'desc' => 'with a description')), - ), - ), - array( + [ + 'throws' => [['type' => '\Exception', 'desc' => 'with a description']], + ], + ], + [ '/** * This is a slightly longer docblock * @@ -69,18 +69,18 @@ class DocblockTest extends \PHPUnit\Framework\TestCase * @return int At least it isn\'t a string */', 'This is a slightly longer docblock', - array( - 'param' => array( - array('type' => 'int', 'desc' => 'Is a Foo', 'var' => '$foo'), - array('type' => 'string', 'desc' => 'With some sort of description', 'var' => '$bar'), - array('type' => '\ClassName', 'desc' => 'is cool too', 'var' => '$baz'), - ), - 'return' => array( - array('type' => 'int', 'desc' => 'At least it isn\'t a string'), - ), - ), - ), - array( + [ + 'param' => [ + ['type' => 'int', 'desc' => 'Is a Foo', 'var' => '$foo'], + ['type' => 'string', 'desc' => 'With some sort of description', 'var' => '$bar'], + ['type' => '\ClassName', 'desc' => 'is cool too', 'var' => '$baz'], + ], + 'return' => [ + ['type' => 'int', 'desc' => 'At least it isn\'t a string'], + ], + ], + ], + [ '/** * This is a docblock! * @@ -91,10 +91,10 @@ class DocblockTest extends \PHPUnit\Framework\TestCase * @return */', "This is a docblock!\n\nIt spans lines, too!", - array( - 'tagname' => array('plus a description'), - ), - ), - ); + [ + 'tagname' => ['plus a description'], + ], + ], + ]; } } diff --git a/vendor/psy/psysh/test/Psy/Test/Util/MirrorTest.php b/vendor/psy/psysh/test/Util/MirrorTest.php similarity index 58% rename from vendor/psy/psysh/test/Psy/Test/Util/MirrorTest.php rename to vendor/psy/psysh/test/Util/MirrorTest.php index ab0b1726..09976bdf 100644 --- a/vendor/psy/psysh/test/Psy/Test/Util/MirrorTest.php +++ b/vendor/psy/psysh/test/Util/MirrorTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,7 +11,6 @@ namespace Psy\Test\Util; -use Psy\Reflection\ReflectionConstant; use Psy\Util\Mirror; class MirrorTest extends \PHPUnit\Framework\TestCase @@ -28,28 +27,35 @@ class MirrorTest extends \PHPUnit\Framework\TestCase public function testMirror() { $refl = Mirror::get('sort'); - $this->assertTrue($refl instanceof \ReflectionFunction); + $this->assertInstanceOf('ReflectionFunction', $refl); $refl = Mirror::get('Psy\Test\Util\MirrorTest'); - $this->assertTrue($refl instanceof \ReflectionClass); + $this->assertInstanceOf('ReflectionClass', $refl); $refl = Mirror::get($this); - $this->assertTrue($refl instanceof \ReflectionObject); + $this->assertInstanceOf('ReflectionObject', $refl); $refl = Mirror::get($this, 'FOO'); - $this->assertTrue($refl instanceof ReflectionConstant); + if (version_compare(PHP_VERSION, '7.1.0', '>=')) { + $this->assertInstanceOf('ReflectionClassConstant', $refl); + } else { + $this->assertInstanceOf('Psy\Reflection\ReflectionClassConstant', $refl); + } + + $refl = Mirror::get('PHP_VERSION'); + $this->assertInstanceOf('Psy\Reflection\ReflectionConstant_', $refl); $refl = Mirror::get($this, 'bar'); - $this->assertTrue($refl instanceof \ReflectionProperty); + $this->assertInstanceOf('ReflectionProperty', $refl); $refl = Mirror::get($this, 'baz'); - $this->assertTrue($refl instanceof \ReflectionProperty); + $this->assertInstanceOf('ReflectionProperty', $refl); $refl = Mirror::get($this, 'aPublicMethod'); - $this->assertTrue($refl instanceof \ReflectionMethod); + $this->assertInstanceOf('ReflectionMethod', $refl); $refl = Mirror::get($this, 'baz', Mirror::STATIC_PROPERTY); - $this->assertTrue($refl instanceof \ReflectionProperty); + $this->assertInstanceOf('ReflectionProperty', $refl); } /** @@ -71,10 +77,10 @@ class MirrorTest extends \PHPUnit\Framework\TestCase public function invalidArguments() { - return array( - array('not_a_function_or_class'), - array(array()), - array(1), - ); + return [ + ['not_a_function_or_class'], + [[]], + [1], + ]; } } diff --git a/vendor/psy/psysh/test/Psy/Test/Util/StrTest.php b/vendor/psy/psysh/test/Util/StrTest.php similarity index 62% rename from vendor/psy/psysh/test/Psy/Test/Util/StrTest.php rename to vendor/psy/psysh/test/Util/StrTest.php index 46cdb230..2a58d9f9 100644 --- a/vendor/psy/psysh/test/Psy/Test/Util/StrTest.php +++ b/vendor/psy/psysh/test/Util/StrTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -20,12 +20,12 @@ class StrTest extends \PHPUnit\Framework\TestCase */ public function testUnvis($input, $expected) { - $this->assertEquals($expected, Str::unvis($input)); + $this->assertSame($expected, Str::unvis($input)); } public function unvisProvider() { - //return require_once(__DIR__.'/../../../fixtures/unvis_fixtures.php'); - return json_decode(file_get_contents(__DIR__ . '/../../../fixtures/unvis_fixtures.json')); + //return require_once(__DIR__.'/../fixtures/unvis_fixtures.php'); + return json_decode(file_get_contents(__DIR__ . '/../fixtures/unvis_fixtures.json')); } } diff --git a/vendor/psy/psysh/test/Psy/Test/VersionUpdater/GitHubCheckerTest.php b/vendor/psy/psysh/test/VersionUpdater/GitHubCheckerTest.php similarity index 55% rename from vendor/psy/psysh/test/Psy/Test/VersionUpdater/GitHubCheckerTest.php rename to vendor/psy/psysh/test/VersionUpdater/GitHubCheckerTest.php index 07eb0c6e..bbbd69cf 100644 --- a/vendor/psy/psysh/test/Psy/Test/VersionUpdater/GitHubCheckerTest.php +++ b/vendor/psy/psysh/test/VersionUpdater/GitHubCheckerTest.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -20,12 +20,12 @@ class GitHubCheckerTest extends \PHPUnit\Framework\TestCase * @expectedException \InvalidArgumentException * @expectedExceptionMessage Unable to check for updates * - * @param $input + * @param mixed $input */ public function testExceptionInvocation($input) { $checker = $this->getMockBuilder('Psy\\VersionUpdater\\GitHubChecker') - ->setMethods(array('fetchLatestRelease')) + ->setMethods(['fetchLatestRelease']) ->getMock(); $checker->expects($this->once())->method('fetchLatestRelease')->willReturn($input); $checker->isLatest(); @@ -34,13 +34,13 @@ class GitHubCheckerTest extends \PHPUnit\Framework\TestCase /** * @dataProvider jsonResults * - * @param $assertion - * @param $input + * @param bool $assertion + * @param mixed $input */ public function testDataSetResults($assertion, $input) { $checker = $this->getMockBuilder('Psy\\VersionUpdater\\GitHubChecker') - ->setMethods(array('fetchLatestRelease')) + ->setMethods(['fetchLatestRelease']) ->getMock(); $checker->expects($this->once())->method('fetchLatestRelease')->willReturn($input); $this->assertSame($assertion, $checker->isLatest()); @@ -51,15 +51,15 @@ class GitHubCheckerTest extends \PHPUnit\Framework\TestCase */ public function jsonResults() { - return array( - array(false, json_decode('{"tag_name":"v9.0.0"}')), - array(true, json_decode('{"tag_name":"v' . Shell::VERSION . '"}')), - array(true, json_decode('{"tag_name":"v0.0.1"}')), - array(true, json_decode('{"tag_name":"v0.4.1-alpha"}')), - array(true, json_decode('{"tag_name":"v0.4.2-beta3"}')), - array(true, json_decode('{"tag_name":"v0.0.1"}')), - array(true, json_decode('{"tag_name":""}')), - ); + return [ + [false, json_decode('{"tag_name":"v9.0.0"}')], + [true, json_decode('{"tag_name":"v' . Shell::VERSION . '"}')], + [true, json_decode('{"tag_name":"v0.0.1"}')], + [true, json_decode('{"tag_name":"v0.4.1-alpha"}')], + [true, json_decode('{"tag_name":"v0.4.2-beta3"}')], + [true, json_decode('{"tag_name":"v0.0.1"}')], + [true, json_decode('{"tag_name":""}')], + ]; } /** @@ -67,16 +67,16 @@ class GitHubCheckerTest extends \PHPUnit\Framework\TestCase */ public function malformedResults() { - return array( - array(null), - array(false), - array(true), - array(json_decode('{"foo":"bar"}')), - array(json_decode('{}')), - array(json_decode('[]')), - array(array()), - array(json_decode('{"tag_name":false"}')), - array(json_decode('{"tag_name":true"}')), - ); + return [ + [null], + [false], + [true], + [json_decode('{"foo":"bar"}')], + [json_decode('{}')], + [json_decode('[]')], + [[]], + [json_decode('{"tag_name":false"}')], + [json_decode('{"tag_name":true"}')], + ]; } } diff --git a/vendor/psy/psysh/test/VersionUpdater/NoopCheckerTest.php b/vendor/psy/psysh/test/VersionUpdater/NoopCheckerTest.php new file mode 100644 index 00000000..b9ba568c --- /dev/null +++ b/vendor/psy/psysh/test/VersionUpdater/NoopCheckerTest.php @@ -0,0 +1,25 @@ +assertTrue($checker->isLatest()); + $this->assertEquals(Shell::VERSION, $checker->getLatest()); + } +} diff --git a/vendor/psy/psysh/test/fixtures/config.php b/vendor/psy/psysh/test/fixtures/config.php index 31a4ef54..4aa1f5fb 100644 --- a/vendor/psy/psysh/test/fixtures/config.php +++ b/vendor/psy/psysh/test/fixtures/config.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,8 +11,10 @@ $config->setRuntimeDir(sys_get_temp_dir() . '/psysh_test/withconfig/temp'); -return array( +return [ 'useReadline' => true, 'usePcntl' => false, + 'requireSemicolons' => false, + 'useUnicode' => true, 'errorLoggingLevel' => E_ALL & ~E_NOTICE, -); +]; diff --git a/vendor/psy/psysh/test/fixtures/empty.php b/vendor/psy/psysh/test/fixtures/empty.php index a385c6c9..ba4e5784 100644 --- a/vendor/psy/psysh/test/fixtures/empty.php +++ b/vendor/psy/psysh/test/fixtures/empty.php @@ -3,7 +3,7 @@ /* * This file is part of Psy Shell. * - * (c) 2012-2017 Justin Hileman + * (c) 2012-2018 Justin Hileman * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/vendor/psy/psysh/test/fixtures/project/.psysh.php b/vendor/psy/psysh/test/fixtures/project/.psysh.php index a6ac121e..8ba668c8 100644 --- a/vendor/psy/psysh/test/fixtures/project/.psysh.php +++ b/vendor/psy/psysh/test/fixtures/project/.psysh.php @@ -10,6 +10,8 @@ */ return array( - 'useReadline' => false, - 'usePcntl' => true, + 'useReadline' => false, + 'usePcntl' => true, + 'requireSemicolons' => true, + 'useUnicode' => false, ); diff --git a/vendor/psy/psysh/vendor-bin/box/composer.json b/vendor/psy/psysh/vendor-bin/box/composer.json new file mode 100644 index 00000000..a5ef2062 --- /dev/null +++ b/vendor/psy/psysh/vendor-bin/box/composer.json @@ -0,0 +1,7 @@ +{ + "minimum-stability": "dev", + "prefer-stable": true, + "require": { + "humbug/box": "^3.0@alpha" + } +} diff --git a/vendor/psy/psysh/vendor-bin/box/composer.lock b/vendor/psy/psysh/vendor-bin/box/composer.lock new file mode 100644 index 00000000..3c449638 --- /dev/null +++ b/vendor/psy/psysh/vendor-bin/box/composer.lock @@ -0,0 +1,2524 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "d98ffe050f0ba4e81c2d1a98ca945200", + "packages": [ + { + "name": "amphp/amp", + "version": "v2.0.7", + "source": { + "type": "git", + "url": "https://github.com/amphp/amp.git", + "reference": "d561cc9736bc18dd94a2fc9cdae98b616bd92c43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/amp/zipball/d561cc9736bc18dd94a2fc9cdae98b616bd92c43", + "reference": "d561cc9736bc18dd94a2fc9cdae98b616bd92c43", + "shasum": "" + }, + "require": { + "php": ">=7" + }, + "require-dev": { + "amphp/phpunit-util": "^1", + "friendsofphp/php-cs-fixer": "^2.3", + "phpstan/phpstan": "^0.8.5", + "phpunit/phpunit": "^6.0.9", + "react/promise": "^2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Amp\\": "lib" + }, + "files": [ + "lib/functions.php", + "lib/Internal/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bob Weinand", + "email": "bobwei9@hotmail.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + }, + { + "name": "Daniel Lowrey", + "email": "rdlowrey@php.net" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + } + ], + "description": "A non-blocking concurrency framework for PHP applications.", + "homepage": "http://amphp.org/amp", + "keywords": [ + "async", + "asynchronous", + "awaitable", + "concurrency", + "event", + "event-loop", + "future", + "non-blocking", + "promise" + ], + "time": "2018-04-30T20:49:57+00:00" + }, + { + "name": "amphp/byte-stream", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/amphp/byte-stream.git", + "reference": "1b75b122e6f069e7d102eef065dc192119d99ca7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/1b75b122e6f069e7d102eef065dc192119d99ca7", + "reference": "1b75b122e6f069e7d102eef065dc192119d99ca7", + "shasum": "" + }, + "require": { + "amphp/amp": "^2" + }, + "require-dev": { + "amphp/phpunit-util": "^1", + "friendsofphp/php-cs-fixer": "^2.3", + "phpunit/phpunit": "^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Amp\\ByteStream\\": "lib" + }, + "files": [ + "lib/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + } + ], + "description": "A stream abstraction to make working with non-blocking I/O simple.", + "homepage": "http://amphp.org/byte-stream", + "keywords": [ + "amp", + "amphp", + "async", + "io", + "non-blocking", + "stream" + ], + "time": "2018-04-04T05:33:09+00:00" + }, + { + "name": "amphp/parallel", + "version": "v0.2.5", + "source": { + "type": "git", + "url": "https://github.com/amphp/parallel.git", + "reference": "732694688461936bec02c0ccf020dfee10c4f7ee" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/parallel/zipball/732694688461936bec02c0ccf020dfee10c4f7ee", + "reference": "732694688461936bec02c0ccf020dfee10c4f7ee", + "shasum": "" + }, + "require": { + "amphp/amp": "^2", + "amphp/byte-stream": "^1.2", + "amphp/parser": "^1", + "amphp/process": "^0.2 || ^0.3", + "amphp/sync": "^1.0.1" + }, + "require-dev": { + "amphp/phpunit-util": "^1", + "friendsofphp/php-cs-fixer": "^2.3", + "phpunit/phpunit": "^6" + }, + "suggest": { + "ext-pthreads": "Required for thread contexts" + }, + "type": "library", + "autoload": { + "psr-4": { + "Amp\\Parallel\\": "lib" + }, + "files": [ + "lib/Worker/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stephen Coakley", + "email": "me@stephencoakley.com" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + } + ], + "description": "Parallel processing component for Amp.", + "homepage": "https://github.com/amphp/parallel", + "keywords": [ + "async", + "asynchronous", + "concurrent", + "multi-processing", + "multi-threading" + ], + "time": "2018-03-21T14:37:51+00:00" + }, + { + "name": "amphp/parallel-functions", + "version": "v0.1.2", + "source": { + "type": "git", + "url": "https://github.com/amphp/parallel-functions.git", + "reference": "999ba8a00adaf4d1fd3a7cb40bf7e565e507ff48" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/parallel-functions/zipball/999ba8a00adaf4d1fd3a7cb40bf7e565e507ff48", + "reference": "999ba8a00adaf4d1fd3a7cb40bf7e565e507ff48", + "shasum": "" + }, + "require": { + "amphp/amp": "^2.0.3", + "amphp/parallel": "^0.1.8 || ^0.2", + "opis/closure": "^3.0.7", + "php": ">=7" + }, + "require-dev": { + "amphp/phpunit-util": "^1.0", + "friendsofphp/php-cs-fixer": "^2.9", + "phpunit/phpunit": "^6.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Amp\\ParallelFunctions\\": "src" + }, + "files": [ + "src/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "Parallel processing made simple.", + "time": "2017-12-17T18:33:29+00:00" + }, + { + "name": "amphp/parser", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/amphp/parser.git", + "reference": "f83e68f03d5b8e8e0365b8792985a7f341c57ae1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/parser/zipball/f83e68f03d5b8e8e0365b8792985a7f341c57ae1", + "reference": "f83e68f03d5b8e8e0365b8792985a7f341c57ae1", + "shasum": "" + }, + "require": { + "php": ">=7" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.3", + "phpunit/phpunit": "^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Amp\\Parser\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + } + ], + "description": "A generator parser to make streaming parsers simple.", + "homepage": "https://github.com/amphp/parser", + "keywords": [ + "async", + "non-blocking", + "parser", + "stream" + ], + "time": "2017-06-06T05:29:10+00:00" + }, + { + "name": "amphp/process", + "version": "v0.3.3", + "source": { + "type": "git", + "url": "https://github.com/amphp/process.git", + "reference": "b795d20a7f6d5a0637128a02be613f520f1705fc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/process/zipball/b795d20a7f6d5a0637128a02be613f520f1705fc", + "reference": "b795d20a7f6d5a0637128a02be613f520f1705fc", + "shasum": "" + }, + "require": { + "amphp/amp": "^2", + "amphp/byte-stream": "^1", + "php": ">=7" + }, + "require-dev": { + "amphp/phpunit-util": "^1", + "friendsofphp/php-cs-fixer": "^2.3", + "phpunit/phpunit": "^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Amp\\Process\\": "lib" + }, + "files": [ + "lib/constants.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bob Weinand", + "email": "bobwei9@hotmail.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + } + ], + "description": "Asynchronous process manager.", + "homepage": "https://github.com/amphp/process", + "time": "2018-04-08T18:55:42+00:00" + }, + { + "name": "amphp/sync", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/amphp/sync.git", + "reference": "a1d8f244eb19e3e2a96abc4686cebc80995bbc90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/sync/zipball/a1d8f244eb19e3e2a96abc4686cebc80995bbc90", + "reference": "a1d8f244eb19e3e2a96abc4686cebc80995bbc90", + "shasum": "" + }, + "require": { + "amphp/amp": "^2" + }, + "require-dev": { + "amphp/phpunit-util": "^1", + "friendsofphp/php-cs-fixer": "^2.3", + "phpunit/phpunit": "^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Amp\\Sync\\": "lib" + }, + "files": [ + "lib/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stephen Coakley", + "email": "me@stephencoakley.com" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + } + ], + "description": "Mutex, Semaphore, and other synchronization tools for Amp.", + "homepage": "https://github.com/amphp/sync", + "keywords": [ + "async", + "asynchronous", + "mutex", + "semaphore", + "synchronization" + ], + "time": "2017-11-29T21:48:53+00:00" + }, + { + "name": "beberlei/assert", + "version": "v2.9.5", + "source": { + "type": "git", + "url": "https://github.com/beberlei/assert.git", + "reference": "c07fe163d6a3b3e4b1275981ec004397954afa89" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/beberlei/assert/zipball/c07fe163d6a3b3e4b1275981ec004397954afa89", + "reference": "c07fe163d6a3b3e4b1275981ec004397954afa89", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.1.1", + "phpunit/phpunit": "^4.8.35|^5.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "Assert\\": "lib/Assert" + }, + "files": [ + "lib/Assert/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de", + "role": "Lead Developer" + }, + { + "name": "Richard Quadling", + "email": "rquadling@gmail.com", + "role": "Collaborator" + } + ], + "description": "Thin assertion library for input validation in business models.", + "keywords": [ + "assert", + "assertion", + "validation" + ], + "time": "2018-04-16T11:18:27+00:00" + }, + { + "name": "composer/ca-bundle", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/composer/ca-bundle.git", + "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169", + "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "ext-pcre": "*", + "php": "^5.3.2 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", + "psr/log": "^1.0", + "symfony/process": "^2.5 || ^3.0 || ^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\CaBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", + "keywords": [ + "cabundle", + "cacert", + "certificate", + "ssl", + "tls" + ], + "time": "2018-03-29T19:57:20+00:00" + }, + { + "name": "composer/composer", + "version": "1.6.5", + "source": { + "type": "git", + "url": "https://github.com/composer/composer.git", + "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/composer/zipball/b184a92419cc9a9c4c6a09db555a94d441cb11c9", + "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9", + "shasum": "" + }, + "require": { + "composer/ca-bundle": "^1.0", + "composer/semver": "^1.0", + "composer/spdx-licenses": "^1.2", + "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", + "php": "^5.3.2 || ^7.0", + "psr/log": "^1.0", + "seld/cli-prompt": "^1.0", + "seld/jsonlint": "^1.4", + "seld/phar-utils": "^1.0", + "symfony/console": "^2.7 || ^3.0 || ^4.0", + "symfony/filesystem": "^2.7 || ^3.0 || ^4.0", + "symfony/finder": "^2.7 || ^3.0 || ^4.0", + "symfony/process": "^2.7 || ^3.0 || ^4.0" + }, + "conflict": { + "symfony/console": "2.8.38" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7", + "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" + }, + "suggest": { + "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", + "ext-zip": "Enabling the zip extension allows you to unzip archives", + "ext-zlib": "Allow gzip compression of HTTP requests" + }, + "bin": [ + "bin/composer" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\": "src/Composer" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.", + "homepage": "https://getcomposer.org/", + "keywords": [ + "autoload", + "dependency", + "package" + ], + "time": "2018-05-04T09:44:59+00:00" + }, + { + "name": "composer/semver", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573", + "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.5 || ^5.0.5", + "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "time": "2016-08-30T16:08:34+00:00" + }, + { + "name": "composer/spdx-licenses", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/composer/spdx-licenses.git", + "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b", + "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", + "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Spdx\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "SPDX licenses list and validation library.", + "keywords": [ + "license", + "spdx", + "validator" + ], + "time": "2018-04-30T10:33:04+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/c919dc6c62e221fc6406f861ea13433c0aa24f08", + "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0", + "psr/log": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "time": "2018-04-11T15:42:36+00:00" + }, + { + "name": "doctrine/annotations", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "php": "^7.1" + }, + "require-dev": { + "doctrine/cache": "1.*", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "time": "2017-12-06T07:11:42+00:00" + }, + { + "name": "doctrine/lexer", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/lexer.git", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "lexer", + "parser" + ], + "time": "2014-09-09T13:34:57+00:00" + }, + { + "name": "herrera-io/annotations", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/kherge-abandoned/php-annotations.git", + "reference": "7d8b9a536da7f12aad8de7f28b2cb5266bde8da1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kherge-abandoned/php-annotations/zipball/7d8b9a536da7f12aad8de7f28b2cb5266bde8da1", + "reference": "7d8b9a536da7f12aad8de7f28b2cb5266bde8da1", + "shasum": "" + }, + "require": { + "doctrine/annotations": "~1.0", + "php": ">=5.3.3" + }, + "require-dev": { + "herrera-io/phpunit-test-case": "1.*", + "phpunit/phpunit": "3.7.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Herrera\\Annotations": "src/lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kevin Herrera", + "email": "kevin@herrera.io", + "homepage": "http://kevin.herrera.io" + } + ], + "description": "A tokenizer for Doctrine annotations.", + "homepage": "https://github.com/herrera-io/php-annotations", + "keywords": [ + "annotations", + "doctrine", + "tokenizer" + ], + "abandoned": true, + "time": "2014-02-03T17:34:08+00:00" + }, + { + "name": "humbug/box", + "version": "3.0.0-alpha.5", + "source": { + "type": "git", + "url": "https://github.com/humbug/box.git", + "reference": "26b3f481e3b375f55c0644f501b831f7c05d8058" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/humbug/box/zipball/26b3f481e3b375f55c0644f501b831f7c05d8058", + "reference": "26b3f481e3b375f55c0644f501b831f7c05d8058", + "shasum": "" + }, + "require": { + "amphp/parallel-functions": "^0.1.2", + "beberlei/assert": "^2.8", + "composer/composer": "^1.6", + "composer/xdebug-handler": "^1.1.0", + "ext-phar": "*", + "herrera-io/annotations": "~1.0", + "humbug/php-scoper": "^1.0@dev", + "justinrainbow/json-schema": "^5.2", + "nikic/iter": "^1.6", + "php": "^7.1", + "phpseclib/phpseclib": "~2.0", + "seld/jsonlint": "^1.6", + "symfony/console": "^3.4 || ^4.0", + "symfony/filesystem": "^3.4 || ^4.0", + "symfony/finder": "^3.4 || ^4.0", + "symfony/var-dumper": "^3.4 || ^4.0", + "webmozart/path-util": "^2.3" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.2", + "infection/infection": "^0.8", + "mikey179/vfsstream": "^1.1", + "phpunit/phpunit": "^7.0" + }, + "suggest": { + "ext-openssl": "To accelerate private key generation." + }, + "bin": [ + "bin/box" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + }, + "bamarni-bin": { + "bin-links": false + } + }, + "autoload": { + "psr-4": { + "KevinGH\\Box\\": "src" + }, + "files": [ + "src/FileSystem/file_system.php", + "src/functions.php" + ], + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kevin Herrera", + "email": "kevin@herrera.io", + "homepage": "http://kevin.herrera.io" + }, + { + "name": "Théo Fidry", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Fast, zero config application bundler with PHARs.", + "keywords": [ + "phar" + ], + "time": "2018-05-04T22:04:10+00:00" + }, + { + "name": "humbug/php-scoper", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/humbug/php-scoper.git", + "reference": "450fe36a7457847d0cb431e7379b5df9d05992a4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/humbug/php-scoper/zipball/450fe36a7457847d0cb431e7379b5df9d05992a4", + "reference": "450fe36a7457847d0cb431e7379b5df9d05992a4", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^3.0", + "ocramius/package-versions": "^1.1", + "padraic/phar-updater": "^1.0", + "php": "^7.1", + "roave/better-reflection": "^2.0", + "symfony/console": "^3.2 || ^4.0", + "symfony/filesystem": "^3.2 || ^4.0", + "symfony/finder": "^3.2 || ^4.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.1", + "phpunit/phpunit": "^6.1" + }, + "bin": [ + "bin/php-scoper" + ], + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": false + }, + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Humbug\\PhpScoper\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + }, + { + "name": "Théo Fidry", + "email": "theo.fidry@gmail.com" + }, + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com" + } + ], + "description": "Prefixes all PHP namespaces in a file or directory.", + "time": "2018-04-25T21:59:07+00:00" + }, + { + "name": "justinrainbow/json-schema", + "version": "5.2.7", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "8560d4314577199ba51bf2032f02cd1315587c23" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23", + "reference": "8560d4314577199ba51bf2032f02cd1315587c23", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.1", + "json-schema/json-schema-test-suite": "1.2.0", + "phpunit/phpunit": "^4.8.35" + }, + "bin": [ + "bin/validate-json" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" + } + ], + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ], + "time": "2018-02-14T22:26:30+00:00" + }, + { + "name": "nikic/iter", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/iter.git", + "reference": "fed36b417ea93fe9b4b7cb2e2abf98d91092564c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/iter/zipball/fed36b417ea93fe9b4b7cb2e2abf98d91092564c", + "reference": "fed36b417ea93fe9b4b7cb2e2abf98d91092564c", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0|~5.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov", + "email": "nikic@php.net" + } + ], + "description": "Iteration primitives using generators", + "keywords": [ + "functional", + "generator", + "iterator" + ], + "time": "2017-11-10T22:56:03+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v3.1.5", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce", + "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "~4.0|~5.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2018-02-28T20:30:58+00:00" + }, + { + "name": "ocramius/package-versions", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/PackageVersions.git", + "reference": "4489d5002c49d55576fa0ba786f42dbb009be46f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/4489d5002c49d55576fa0ba786f42dbb009be46f", + "reference": "4489d5002c49d55576fa0ba786f42dbb009be46f", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0.0", + "php": "^7.1.0" + }, + "require-dev": { + "composer/composer": "^1.6.3", + "ext-zip": "*", + "infection/infection": "^0.7.1", + "phpunit/phpunit": "^7.0.0" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "time": "2018-02-05T13:05:30+00:00" + }, + { + "name": "opis/closure", + "version": "3.0.12", + "source": { + "type": "git", + "url": "https://github.com/opis/closure.git", + "reference": "507a28d15e79258d404ba76e73976ba895d0eb11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opis/closure/zipball/507a28d15e79258d404ba76e73976ba895d0eb11", + "reference": "507a28d15e79258d404ba76e73976ba895d0eb11", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "jeremeamia/superclosure": "^2.0", + "phpunit/phpunit": "^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Opis\\Closure\\": "src/" + }, + "files": [ + "functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marius Sarca", + "email": "marius.sarca@gmail.com" + } + ], + "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.", + "homepage": "http://www.opis.io/closure", + "keywords": [ + "anonymous functions", + "closure", + "function", + "serializable", + "serialization", + "serialize" + ], + "time": "2018-02-23T08:08:14+00:00" + }, + { + "name": "padraic/humbug_get_contents", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/humbug/file_get_contents.git", + "reference": "dcb086060c9dd6b2f51d8f7a895500307110b7a7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/humbug/file_get_contents/zipball/dcb086060c9dd6b2f51d8f7a895500307110b7a7", + "reference": "dcb086060c9dd6b2f51d8f7a895500307110b7a7", + "shasum": "" + }, + "require": { + "composer/ca-bundle": "^1.0", + "ext-openssl": "*", + "php": "^5.3 || ^7.0 || ^7.1 || ^7.2" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.1", + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": false + }, + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "Humbug\\": "src/" + }, + "files": [ + "src/function.php", + "src/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Padraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "http://blog.astrumfutura.com" + }, + { + "name": "Théo Fidry", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Secure wrapper for accessing HTTPS resources with file_get_contents for PHP 5.3+", + "homepage": "https://github.com/padraic/file_get_contents", + "keywords": [ + "download", + "file_get_contents", + "http", + "https", + "ssl", + "tls" + ], + "time": "2018-02-12T18:47:17+00:00" + }, + { + "name": "padraic/phar-updater", + "version": "v1.0.6", + "source": { + "type": "git", + "url": "https://github.com/humbug/phar-updater.git", + "reference": "d01d3b8f26e541ac9b9eeba1e18d005d852f7ff1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/humbug/phar-updater/zipball/d01d3b8f26e541ac9b9eeba1e18d005d852f7ff1", + "reference": "d01d3b8f26e541ac9b9eeba1e18d005d852f7ff1", + "shasum": "" + }, + "require": { + "padraic/humbug_get_contents": "^1.0", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Humbug\\SelfUpdate\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "http://blog.astrumfutura.com" + } + ], + "description": "A thing to make PHAR self-updating easy and secure.", + "keywords": [ + "humbug", + "phar", + "self-update", + "update" + ], + "time": "2018-03-30T12:52:15+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2017-09-11T18:02:19+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "4.3.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08", + "shasum": "" + }, + "require": { + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2017-11-30T07:14:17+00:00" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.4.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "time": "2017-07-14T14:27:02+00:00" + }, + { + "name": "phpseclib/phpseclib", + "version": "2.0.11", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7053f06f91b3de78e143d430e55a8f7889efc08b", + "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phing/phing": "~2.7", + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", + "sami/sami": "~2.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "suggest": { + "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", + "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", + "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", + "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." + }, + "type": "library", + "autoload": { + "files": [ + "phpseclib/bootstrap.php" + ], + "psr-4": { + "phpseclib\\": "phpseclib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jim Wigginton", + "email": "terrafrost@php.net", + "role": "Lead Developer" + }, + { + "name": "Patrick Monnerat", + "email": "pm@datasphere.ch", + "role": "Developer" + }, + { + "name": "Andreas Fischer", + "email": "bantu@phpbb.com", + "role": "Developer" + }, + { + "name": "Hans-Jürgen Petrich", + "email": "petrich@tronic-media.com", + "role": "Developer" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com", + "role": "Developer" + } + ], + "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", + "homepage": "http://phpseclib.sourceforge.net", + "keywords": [ + "BigInteger", + "aes", + "asn.1", + "asn1", + "blowfish", + "crypto", + "cryptography", + "encryption", + "rsa", + "security", + "sftp", + "signature", + "signing", + "ssh", + "twofish", + "x.509", + "x509" + ], + "time": "2018-04-15T16:55:05+00:00" + }, + { + "name": "psr/log", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2016-10-10T12:19:37+00:00" + }, + { + "name": "roave/better-reflection", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/Roave/BetterReflection.git", + "reference": "efc45b50cb52d5eeaacab15741376e981e28738b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Roave/BetterReflection/zipball/efc45b50cb52d5eeaacab15741376e981e28738b", + "reference": "efc45b50cb52d5eeaacab15741376e981e28738b", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^3.1.1", + "php": ">=7.1.0,<7.3.0", + "phpdocumentor/reflection-docblock": "^4.1.1", + "phpdocumentor/type-resolver": "^0.4.0", + "roave/signature": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.3.0" + }, + "suggest": { + "composer/composer": "Required to use the ComposerSourceLocator" + }, + "type": "library", + "autoload": { + "psr-4": { + "Roave\\BetterReflection\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.io/" + }, + { + "name": "James Titcumb", + "email": "james@asgrim.com", + "homepage": "https://github.com/asgrim" + }, + { + "name": "Gary Hockin", + "email": "gary@roave.com", + "homepage": "https://github.com/geeh" + }, + { + "name": "Jaroslav Hanslík", + "email": "kukulich@kukulich.cz", + "homepage": "https://github.com/kukulich" + } + ], + "description": "Better Reflection - an improved code reflection API", + "time": "2018-02-05T08:08:57+00:00" + }, + { + "name": "roave/signature", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/Roave/Signature.git", + "reference": "bed4ecbdd7f312ab6bb39561ac191f520bcee386" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Roave/Signature/zipball/bed4ecbdd7f312ab6bb39561ac191f520bcee386", + "reference": "bed4ecbdd7f312ab6bb39561ac191f520bcee386", + "shasum": "" + }, + "require": { + "php": "^7.0|^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^5.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Roave\\Signature\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Sign and verify stuff", + "time": "2017-02-17T13:53:21+00:00" + }, + { + "name": "seld/cli-prompt", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/cli-prompt.git", + "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd", + "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\CliPrompt\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type", + "keywords": [ + "cli", + "console", + "hidden", + "input", + "prompt" + ], + "time": "2017-03-18T11:32:45+00:00" + }, + { + "name": "seld/jsonlint", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/jsonlint.git", + "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38", + "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38", + "shasum": "" + }, + "require": { + "php": "^5.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "bin": [ + "bin/jsonlint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Seld\\JsonLint\\": "src/Seld/JsonLint/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "JSON Linter", + "keywords": [ + "json", + "linter", + "parser", + "validator" + ], + "time": "2018-01-24T12:46:19+00:00" + }, + { + "name": "seld/phar-utils", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/phar-utils.git", + "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a", + "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\PharUtils\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "PHAR file format utilities, for when PHP phars you up", + "keywords": [ + "phra" + ], + "time": "2015-10-13T18:44:15+00:00" + }, + { + "name": "symfony/console", + "version": "v4.0.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "3e820bc2c520a87ca209ad8fa961c97f42e0b4ae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/3e820bc2c520a87ca209ad8fa961c97f42e0b4ae", + "reference": "3e820bc2c520a87ca209ad8fa961c97f42e0b4ae", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~3.4|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.4|~4.0" + }, + "suggest": { + "psr/log-implementation": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com", + "time": "2018-04-30T01:23:47+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v4.0.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", + "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "https://symfony.com", + "time": "2018-02-22T10:50:29+00:00" + }, + { + "name": "symfony/finder", + "version": "v4.0.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", + "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "https://symfony.com", + "time": "2018-04-04T05:10:37+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "3296adf6a6454a050679cde90f95350ad604b171" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2018-04-26T10:06:28+00:00" + }, + { + "name": "symfony/polyfill-php72", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/a4576e282d782ad82397f3e4ec1df8e0f0cafb46", + "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-04-26T10:06:28+00:00" + }, + { + "name": "symfony/process", + "version": "v4.0.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", + "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com", + "time": "2018-04-03T05:24:00+00:00" + }, + { + "name": "symfony/var-dumper", + "version": "v4.0.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "3c34cf3f4bbac9e003d9325225e9ef1a49180a18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3c34cf3f4bbac9e003d9325225e9ef1a49180a18", + "reference": "3c34cf3f4bbac9e003d9325225e9ef1a49180a18", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php72": "~1.5" + }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + }, + "require-dev": { + "ext-iconv": "*", + "twig/twig": "~1.34|~2.4" + }, + "suggest": { + "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", + "ext-intl": "To show region name in time zone dump" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony mechanism for exploring and dumping PHP variables", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "time": "2018-04-26T16:12:06+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "0df1908962e7a3071564e857d86874dad1ef204a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", + "reference": "0df1908962e7a3071564e857d86874dad1ef204a", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2018-01-29T19:49:41+00:00" + }, + { + "name": "webmozart/path-util", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/path-util.git", + "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725", + "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "webmozart/assert": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\PathUtil\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", + "time": "2015-12-17T08:42:14+00:00" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "dev", + "stability-flags": { + "humbug/box": 15 + }, + "prefer-stable": true, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} diff --git a/vendor/symfony/console/Command/Command.php b/vendor/symfony/console/Command/Command.php index 06930425..627da5ec 100644 --- a/vendor/symfony/console/Command/Command.php +++ b/vendor/symfony/console/Command/Command.php @@ -218,12 +218,11 @@ class Command if (null !== $this->processTitle) { if (function_exists('cli_set_process_title')) { - if (false === @cli_set_process_title($this->processTitle)) { + if (!@cli_set_process_title($this->processTitle)) { if ('Darwin' === PHP_OS) { $output->writeln('Running "cli_get_process_title" as an unprivileged user is not supported on MacOS.'); } else { - $error = error_get_last(); - trigger_error($error['message'], E_USER_WARNING); + cli_set_process_title($this->processTitle); } } } elseif (function_exists('setproctitle')) { diff --git a/vendor/symfony/console/Descriptor/DescriptorInterface.php b/vendor/symfony/console/Descriptor/DescriptorInterface.php index 3929b6d9..5d3339a9 100644 --- a/vendor/symfony/console/Descriptor/DescriptorInterface.php +++ b/vendor/symfony/console/Descriptor/DescriptorInterface.php @@ -21,7 +21,7 @@ use Symfony\Component\Console\Output\OutputInterface; interface DescriptorInterface { /** - * Describes an InputArgument instance. + * Describes an object if supported. * * @param OutputInterface $output * @param object $object diff --git a/vendor/symfony/console/Descriptor/JsonDescriptor.php b/vendor/symfony/console/Descriptor/JsonDescriptor.php index 35c87c22..f60323be 100644 --- a/vendor/symfony/console/Descriptor/JsonDescriptor.php +++ b/vendor/symfony/console/Descriptor/JsonDescriptor.php @@ -121,7 +121,7 @@ class JsonDescriptor extends Descriptor { return array( 'name' => '--'.$option->getName(), - 'shortcut' => $option->getShortcut() ? '-'.implode('|-', explode('|', $option->getShortcut())) : '', + 'shortcut' => $option->getShortcut() ? '-'.str_replace('|', '|-', $option->getShortcut()) : '', 'accept_value' => $option->acceptValue(), 'is_value_required' => $option->isValueRequired(), 'is_multiple' => $option->isArray(), diff --git a/vendor/symfony/console/Descriptor/MarkdownDescriptor.php b/vendor/symfony/console/Descriptor/MarkdownDescriptor.php index 106bff51..d52ba553 100644 --- a/vendor/symfony/console/Descriptor/MarkdownDescriptor.php +++ b/vendor/symfony/console/Descriptor/MarkdownDescriptor.php @@ -70,7 +70,7 @@ class MarkdownDescriptor extends Descriptor { $name = '--'.$option->getName(); if ($option->getShortcut()) { - $name .= '|-'.implode('|-', explode('|', $option->getShortcut())).''; + $name .= '|-'.str_replace('|', '|-', $option->getShortcut()).''; } $this->write( diff --git a/vendor/symfony/console/Descriptor/XmlDescriptor.php b/vendor/symfony/console/Descriptor/XmlDescriptor.php index f05756ca..1a105352 100644 --- a/vendor/symfony/console/Descriptor/XmlDescriptor.php +++ b/vendor/symfony/console/Descriptor/XmlDescriptor.php @@ -224,7 +224,7 @@ class XmlDescriptor extends Descriptor $pos = strpos($option->getShortcut(), '|'); if (false !== $pos) { $objectXML->setAttribute('shortcut', '-'.substr($option->getShortcut(), 0, $pos)); - $objectXML->setAttribute('shortcuts', '-'.implode('|-', explode('|', $option->getShortcut()))); + $objectXML->setAttribute('shortcuts', '-'.str_replace('|', '|-', $option->getShortcut())); } else { $objectXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : ''); } diff --git a/vendor/symfony/console/EventListener/ErrorListener.php b/vendor/symfony/console/EventListener/ErrorListener.php index 3774f9e6..909d6ea3 100644 --- a/vendor/symfony/console/EventListener/ErrorListener.php +++ b/vendor/symfony/console/EventListener/ErrorListener.php @@ -40,10 +40,10 @@ class ErrorListener implements EventSubscriberInterface $error = $event->getError(); if (!$inputString = $this->getInputString($event)) { - return $this->logger->error('An error occurred while using the console. Message: "{message}"', array('error' => $error, 'message' => $error->getMessage())); + return $this->logger->error('An error occurred while using the console. Message: "{message}"', array('exception' => $error, 'message' => $error->getMessage())); } - $this->logger->error('Error thrown while running command "{command}". Message: "{message}"', array('error' => $error, 'command' => $inputString, 'message' => $error->getMessage())); + $this->logger->error('Error thrown while running command "{command}". Message: "{message}"', array('exception' => $error, 'command' => $inputString, 'message' => $error->getMessage())); } public function onConsoleTerminate(ConsoleTerminateEvent $event) diff --git a/vendor/symfony/console/Helper/QuestionHelper.php b/vendor/symfony/console/Helper/QuestionHelper.php index 5bcd96b3..e793256f 100644 --- a/vendor/symfony/console/Helper/QuestionHelper.php +++ b/vendor/symfony/console/Helper/QuestionHelper.php @@ -305,7 +305,7 @@ class QuestionHelper extends Helper foreach ($autocomplete as $value) { // If typed characters match the beginning chunk of value (e.g. [AcmeDe]moBundle) - if (0 === strpos($value, $ret) && $i !== strlen($value)) { + if (0 === strpos($value, $ret)) { $matches[$numMatches++] = $value; } } diff --git a/vendor/symfony/console/Input/ArgvInput.php b/vendor/symfony/console/Input/ArgvInput.php index 1a430f1f..fd819810 100644 --- a/vendor/symfony/console/Input/ArgvInput.php +++ b/vendor/symfony/console/Input/ArgvInput.php @@ -282,7 +282,11 @@ class ArgvInput extends Input return false; } foreach ($values as $value) { - if ($token === $value || 0 === strpos($token, $value.'=')) { + // Options with values: + // For long options, test for '--option=' at beginning + // For short options, test for '-o' at beginning + $leading = 0 === strpos($value, '--') ? $value.'=' : $value; + if ($token === $value || '' !== $leading && 0 === strpos($token, $leading)) { return true; } } @@ -306,13 +310,16 @@ class ArgvInput extends Input } foreach ($values as $value) { - if ($token === $value || 0 === strpos($token, $value.'=')) { - if (false !== $pos = strpos($token, '=')) { - return substr($token, $pos + 1); - } - + if ($token === $value) { return array_shift($tokens); } + // Options with values: + // For long options, test for '--option=' at beginning + // For short options, test for '-o' at beginning + $leading = 0 === strpos($value, '--') ? $value.'=' : $value; + if ('' !== $leading && 0 === strpos($token, $leading)) { + return substr($token, strlen($leading)); + } } } diff --git a/vendor/symfony/console/Input/ArrayInput.php b/vendor/symfony/console/Input/ArrayInput.php index e6c28de9..4d9797ba 100644 --- a/vendor/symfony/console/Input/ArrayInput.php +++ b/vendor/symfony/console/Input/ArrayInput.php @@ -114,7 +114,7 @@ class ArrayInput extends Input $params[] = $param.('' != $val ? '='.$this->escapeToken($val) : ''); } } else { - $params[] = is_array($val) ? array_map(array($this, 'escapeToken'), $val) : $this->escapeToken($val); + $params[] = is_array($val) ? implode(' ', array_map(array($this, 'escapeToken'), $val)) : $this->escapeToken($val); } } diff --git a/vendor/symfony/console/Input/InputInterface.php b/vendor/symfony/console/Input/InputInterface.php index b9e0651f..43810f7a 100644 --- a/vendor/symfony/console/Input/InputInterface.php +++ b/vendor/symfony/console/Input/InputInterface.php @@ -33,6 +33,8 @@ interface InputInterface * * This method is to be used to introspect the input parameters * before they have been validated. It must be used carefully. + * Does not necessarily return the correct result for short options + * when multiple flags are combined in the same option. * * @param string|array $values The values to look for in the raw parameters (can be an array) * @param bool $onlyParams Only check real parameters, skip those following an end of options (--) signal @@ -46,6 +48,8 @@ interface InputInterface * * This method is to be used to introspect the input parameters * before they have been validated. It must be used carefully. + * Does not necessarily return the correct result for short options + * when multiple flags are combined in the same option. * * @param string|array $values The value(s) to look for in the raw parameters (can be an array) * @param mixed $default The default value to return if no result is found diff --git a/vendor/symfony/console/Input/InputOption.php b/vendor/symfony/console/Input/InputOption.php index 3af8077c..c9da966a 100644 --- a/vendor/symfony/console/Input/InputOption.php +++ b/vendor/symfony/console/Input/InputOption.php @@ -195,7 +195,7 @@ class InputOption * * @return bool */ - public function equals(InputOption $option) + public function equals(self $option) { return $option->getName() === $this->getName() && $option->getShortcut() === $this->getShortcut() diff --git a/vendor/symfony/console/Output/StreamOutput.php b/vendor/symfony/console/Output/StreamOutput.php index 51cad9b1..5fc5d01e 100644 --- a/vendor/symfony/console/Output/StreamOutput.php +++ b/vendor/symfony/console/Output/StreamOutput.php @@ -83,21 +83,34 @@ class StreamOutput extends Output * * Colorization is disabled if not supported by the stream: * - * - Windows != 10.0.10586 without Ansicon, ConEmu or Mintty - * - non tty consoles + * This is tricky on Windows, because Cygwin, Msys2 etc emulate pseudo + * terminals via named pipes, so we can only check the environment. + * + * Reference: Composer\XdebugHandler\Process::supportsColor + * https://github.com/composer/xdebug-handler * * @return bool true if the stream supports colorization, false otherwise */ protected function hasColorSupport() { if (DIRECTORY_SEPARATOR === '\\') { - return - '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD + return (function_exists('sapi_windows_vt100_support') + && @sapi_windows_vt100_support($this->stream)) || false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') || 'xterm' === getenv('TERM'); } - return function_exists('posix_isatty') && @posix_isatty($this->stream); + if (function_exists('stream_isatty')) { + return @stream_isatty($this->stream); + } + + if (function_exists('posix_isatty')) { + return @posix_isatty($this->stream); + } + + $stat = @fstat($this->stream); + // Check if formatted mode is S_IFCHR + return $stat ? 0020000 === ($stat['mode'] & 0170000) : false; } } diff --git a/vendor/symfony/console/Tests/EventListener/ErrorListenerTest.php b/vendor/symfony/console/Tests/EventListener/ErrorListenerTest.php index 17eaae09..3794a266 100644 --- a/vendor/symfony/console/Tests/EventListener/ErrorListenerTest.php +++ b/vendor/symfony/console/Tests/EventListener/ErrorListenerTest.php @@ -34,7 +34,7 @@ class ErrorListenerTest extends TestCase $logger ->expects($this->once()) ->method('error') - ->with('Error thrown while running command "{command}". Message: "{message}"', array('error' => $error, 'command' => 'test:run --foo=baz buzz', 'message' => 'An error occurred')) + ->with('Error thrown while running command "{command}". Message: "{message}"', array('exception' => $error, 'command' => 'test:run --foo=baz buzz', 'message' => 'An error occurred')) ; $listener = new ErrorListener($logger); @@ -49,7 +49,7 @@ class ErrorListenerTest extends TestCase $logger ->expects($this->once()) ->method('error') - ->with('An error occurred while using the console. Message: "{message}"', array('error' => $error, 'message' => 'An error occurred')) + ->with('An error occurred while using the console. Message: "{message}"', array('exception' => $error, 'message' => 'An error occurred')) ; $listener = new ErrorListener($logger); diff --git a/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php b/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php index 78ec1d3c..cf12acdb 100644 --- a/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php +++ b/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php @@ -157,6 +157,29 @@ class QuestionHelperTest extends AbstractQuestionHelperTest $this->assertEquals('AsseticBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question)); } + public function testAskWithAutocompleteWithExactMatch() + { + if (!$this->hasSttyAvailable()) { + $this->markTestSkipped('`stty` is required to test autocomplete functionality'); + } + + $inputStream = $this->getInputStream("b\n"); + + $possibleChoices = array( + 'a' => 'berlin', + 'b' => 'copenhagen', + 'c' => 'amsterdam', + ); + + $dialog = new QuestionHelper(); + $dialog->setHelperSet(new HelperSet(array(new FormatterHelper()))); + + $question = new ChoiceQuestion('Please select a city', $possibleChoices); + $question->setMaxAttempts(1); + + $this->assertSame('b', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question)); + } + public function testAutocompleteWithTrailingBackslash() { if (!$this->hasSttyAvailable()) { diff --git a/vendor/symfony/console/Tests/Input/ArgvInputTest.php b/vendor/symfony/console/Tests/Input/ArgvInputTest.php index 8287bce5..61d1723e 100644 --- a/vendor/symfony/console/Tests/Input/ArgvInputTest.php +++ b/vendor/symfony/console/Tests/Input/ArgvInputTest.php @@ -314,6 +314,10 @@ class ArgvInputTest extends TestCase $input = new ArgvInput(array('cli.php', '-f', 'foo')); $this->assertTrue($input->hasParameterOption('-f'), '->hasParameterOption() returns true if the given short option is in the raw input'); + $input = new ArgvInput(array('cli.php', '-etest')); + $this->assertTrue($input->hasParameterOption('-e'), '->hasParameterOption() returns true if the given short option is in the raw input'); + $this->assertFalse($input->hasParameterOption('-s'), '->hasParameterOption() returns true if the given short option is in the raw input'); + $input = new ArgvInput(array('cli.php', '--foo', 'foo')); $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if the given short option is in the raw input'); @@ -339,6 +343,46 @@ class ArgvInputTest extends TestCase $this->assertFalse($input->hasParameterOption('--foo', true), '->hasParameterOption() returns false if the given option is in the raw input but after an end of options signal'); } + public function testHasParameterOptionEdgeCasesAndLimitations() + { + $input = new ArgvInput(array('cli.php', '-fh')); + // hasParameterOption does not know if the previous short option, -f, + // takes a value or not. If -f takes a value, then -fh does NOT include + // -h; Otherwise it does. Since we do not know which short options take + // values, hasParameterOption does not support this use-case. + $this->assertFalse($input->hasParameterOption('-h'), '->hasParameterOption() returns true if the given short option is in the raw input'); + // hasParameterOption does detect that `-fh` contains `-f`, since + // `-f` is the first short option in the set. + $this->assertTrue($input->hasParameterOption('-f'), '->hasParameterOption() returns true if the given short option is in the raw input'); + // The test below happens to pass, although it might make more sense + // to disallow it, and require the use of + // $input->hasParameterOption('-f') && $input->hasParameterOption('-h') + // instead. + $this->assertTrue($input->hasParameterOption('-fh'), '->hasParameterOption() returns true if the given short option is in the raw input'); + // In theory, if -fh is supported, then -hf should also work. + // However, this is not supported. + $this->assertFalse($input->hasParameterOption('-hf'), '->hasParameterOption() returns true if the given short option is in the raw input'); + + $input = new ArgvInput(array('cli.php', '-f', '-h')); + // If hasParameterOption('-fh') is supported for 'cli.php -fh', then + // one might also expect that it should also be supported for + // 'cli.php -f -h'. However, this is not supported. + $this->assertFalse($input->hasParameterOption('-fh'), '->hasParameterOption() returns true if the given short option is in the raw input'); + } + + public function testNoWarningOnInvalidParameterOption() + { + $input = new ArgvInput(array('cli.php', '-edev')); + + $this->assertTrue($input->hasParameterOption(array('-e', ''))); + // No warning thrown + $this->assertFalse($input->hasParameterOption(array('-m', ''))); + + $this->assertEquals('dev', $input->getParameterOption(array('-e', ''))); + // No warning thrown + $this->assertFalse($input->getParameterOption(array('-m', ''))); + } + public function testToString() { $input = new ArgvInput(array('cli.php', '-f', 'foo')); diff --git a/vendor/symfony/console/Tests/Input/ArrayInputTest.php b/vendor/symfony/console/Tests/Input/ArrayInputTest.php index 3e858435..6b443e0b 100644 --- a/vendor/symfony/console/Tests/Input/ArrayInputTest.php +++ b/vendor/symfony/console/Tests/Input/ArrayInputTest.php @@ -170,5 +170,8 @@ class ArrayInputTest extends TestCase $input = new ArrayInput(array('-b' => array('bval_1', 'bval_2'), '--f' => array('fval_1', 'fval_2'))); $this->assertSame('-b=bval_1 -b=bval_2 --f=fval_1 --f=fval_2', (string) $input); + + $input = new ArrayInput(array('array_arg' => array('val_1', 'val_2'))); + $this->assertSame('val_1 val_2', (string) $input); } } diff --git a/vendor/symfony/console/composer.json b/vendor/symfony/console/composer.json index e9d10e0c..ab348abd 100644 --- a/vendor/symfony/console/composer.json +++ b/vendor/symfony/console/composer.json @@ -32,7 +32,7 @@ "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "", - "psr/log": "For using the console logger" + "psr/log-implementation": "For using the console logger" }, "conflict": { "symfony/dependency-injection": "<3.4", diff --git a/vendor/symfony/css-selector/CssSelectorConverter.php b/vendor/symfony/css-selector/CssSelectorConverter.php index 8d66dbd0..d1aeb7eb 100644 --- a/vendor/symfony/css-selector/CssSelectorConverter.php +++ b/vendor/symfony/css-selector/CssSelectorConverter.php @@ -31,7 +31,7 @@ class CssSelectorConverter /** * @param bool $html Whether HTML support should be enabled. Disable it for XML documents */ - public function __construct($html = true) + public function __construct(bool $html = true) { $this->translator = new Translator(); diff --git a/vendor/symfony/css-selector/Node/AbstractNode.php b/vendor/symfony/css-selector/Node/AbstractNode.php index 7477e911..123ef1b1 100644 --- a/vendor/symfony/css-selector/Node/AbstractNode.php +++ b/vendor/symfony/css-selector/Node/AbstractNode.php @@ -31,7 +31,7 @@ abstract class AbstractNode implements NodeInterface /** * @return string */ - public function getNodeName() + public function getNodeName(): string { if (null === $this->nodeName) { $this->nodeName = preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', get_called_class()); diff --git a/vendor/symfony/css-selector/Node/AttributeNode.php b/vendor/symfony/css-selector/Node/AttributeNode.php index 1caccb6b..bf702d9c 100644 --- a/vendor/symfony/css-selector/Node/AttributeNode.php +++ b/vendor/symfony/css-selector/Node/AttributeNode.php @@ -29,14 +29,7 @@ class AttributeNode extends AbstractNode private $operator; private $value; - /** - * @param NodeInterface $selector - * @param string $namespace - * @param string $attribute - * @param string $operator - * @param string $value - */ - public function __construct(NodeInterface $selector, $namespace, $attribute, $operator, $value) + public function __construct(NodeInterface $selector, ?string $namespace, string $attribute, string $operator, ?string $value) { $this->selector = $selector; $this->namespace = $namespace; @@ -45,42 +38,27 @@ class AttributeNode extends AbstractNode $this->value = $value; } - /** - * @return NodeInterface - */ - public function getSelector() + public function getSelector(): NodeInterface { return $this->selector; } - /** - * @return string - */ - public function getNamespace() + public function getNamespace(): ?string { return $this->namespace; } - /** - * @return string - */ - public function getAttribute() + public function getAttribute(): string { return $this->attribute; } - /** - * @return string - */ - public function getOperator() + public function getOperator(): string { return $this->operator; } - /** - * @return string - */ - public function getValue() + public function getValue(): ?string { return $this->value; } @@ -88,7 +66,7 @@ class AttributeNode extends AbstractNode /** * {@inheritdoc} */ - public function getSpecificity() + public function getSpecificity(): Specificity { return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0)); } @@ -96,7 +74,7 @@ class AttributeNode extends AbstractNode /** * {@inheritdoc} */ - public function __toString() + public function __toString(): string { $attribute = $this->namespace ? $this->namespace.'|'.$this->attribute : $this->attribute; diff --git a/vendor/symfony/css-selector/Node/ClassNode.php b/vendor/symfony/css-selector/Node/ClassNode.php index 69462e8e..1998b4bd 100644 --- a/vendor/symfony/css-selector/Node/ClassNode.php +++ b/vendor/symfony/css-selector/Node/ClassNode.php @@ -26,28 +26,18 @@ class ClassNode extends AbstractNode private $selector; private $name; - /** - * @param NodeInterface $selector - * @param string $name - */ - public function __construct(NodeInterface $selector, $name) + public function __construct(NodeInterface $selector, string $name) { $this->selector = $selector; $this->name = $name; } - /** - * @return NodeInterface - */ - public function getSelector() + public function getSelector(): NodeInterface { return $this->selector; } - /** - * @return string - */ - public function getName() + public function getName(): string { return $this->name; } @@ -55,7 +45,7 @@ class ClassNode extends AbstractNode /** * {@inheritdoc} */ - public function getSpecificity() + public function getSpecificity(): Specificity { return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0)); } @@ -63,7 +53,7 @@ class ClassNode extends AbstractNode /** * {@inheritdoc} */ - public function __toString() + public function __toString(): string { return sprintf('%s[%s.%s]', $this->getNodeName(), $this->selector, $this->name); } diff --git a/vendor/symfony/css-selector/Node/CombinedSelectorNode.php b/vendor/symfony/css-selector/Node/CombinedSelectorNode.php index 2aa583aa..f97fd21a 100644 --- a/vendor/symfony/css-selector/Node/CombinedSelectorNode.php +++ b/vendor/symfony/css-selector/Node/CombinedSelectorNode.php @@ -27,38 +27,24 @@ class CombinedSelectorNode extends AbstractNode private $combinator; private $subSelector; - /** - * @param NodeInterface $selector - * @param string $combinator - * @param NodeInterface $subSelector - */ - public function __construct(NodeInterface $selector, $combinator, NodeInterface $subSelector) + public function __construct(NodeInterface $selector, string $combinator, NodeInterface $subSelector) { $this->selector = $selector; $this->combinator = $combinator; $this->subSelector = $subSelector; } - /** - * @return NodeInterface - */ - public function getSelector() + public function getSelector(): NodeInterface { return $this->selector; } - /** - * @return string - */ - public function getCombinator() + public function getCombinator(): string { return $this->combinator; } - /** - * @return NodeInterface - */ - public function getSubSelector() + public function getSubSelector(): NodeInterface { return $this->subSelector; } @@ -66,7 +52,7 @@ class CombinedSelectorNode extends AbstractNode /** * {@inheritdoc} */ - public function getSpecificity() + public function getSpecificity(): Specificity { return $this->selector->getSpecificity()->plus($this->subSelector->getSpecificity()); } @@ -74,7 +60,7 @@ class CombinedSelectorNode extends AbstractNode /** * {@inheritdoc} */ - public function __toString() + public function __toString(): string { $combinator = ' ' === $this->combinator ? '' : $this->combinator; diff --git a/vendor/symfony/css-selector/Node/ElementNode.php b/vendor/symfony/css-selector/Node/ElementNode.php index bcdce7a7..7d405b31 100644 --- a/vendor/symfony/css-selector/Node/ElementNode.php +++ b/vendor/symfony/css-selector/Node/ElementNode.php @@ -30,7 +30,7 @@ class ElementNode extends AbstractNode * @param string|null $namespace * @param string|null $element */ - public function __construct($namespace = null, $element = null) + public function __construct(string $namespace = null, string $element = null) { $this->namespace = $namespace; $this->element = $element; @@ -55,7 +55,7 @@ class ElementNode extends AbstractNode /** * {@inheritdoc} */ - public function getSpecificity() + public function getSpecificity(): Specificity { return new Specificity(0, 0, $this->element ? 1 : 0); } @@ -63,7 +63,7 @@ class ElementNode extends AbstractNode /** * {@inheritdoc} */ - public function __toString() + public function __toString(): string { $element = $this->element ?: '*'; diff --git a/vendor/symfony/css-selector/Node/FunctionNode.php b/vendor/symfony/css-selector/Node/FunctionNode.php index 50268255..89b64378 100644 --- a/vendor/symfony/css-selector/Node/FunctionNode.php +++ b/vendor/symfony/css-selector/Node/FunctionNode.php @@ -34,25 +34,19 @@ class FunctionNode extends AbstractNode * @param string $name * @param Token[] $arguments */ - public function __construct(NodeInterface $selector, $name, array $arguments = array()) + public function __construct(NodeInterface $selector, string $name, array $arguments = array()) { $this->selector = $selector; $this->name = strtolower($name); $this->arguments = $arguments; } - /** - * @return NodeInterface - */ - public function getSelector() + public function getSelector(): NodeInterface { return $this->selector; } - /** - * @return string - */ - public function getName() + public function getName(): string { return $this->name; } @@ -68,7 +62,7 @@ class FunctionNode extends AbstractNode /** * {@inheritdoc} */ - public function getSpecificity() + public function getSpecificity(): Specificity { return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0)); } @@ -76,7 +70,7 @@ class FunctionNode extends AbstractNode /** * {@inheritdoc} */ - public function __toString() + public function __toString(): string { $arguments = implode(', ', array_map(function (Token $token) { return "'".$token->getValue()."'"; diff --git a/vendor/symfony/css-selector/Node/HashNode.php b/vendor/symfony/css-selector/Node/HashNode.php index ebf9a987..f73fa2e7 100644 --- a/vendor/symfony/css-selector/Node/HashNode.php +++ b/vendor/symfony/css-selector/Node/HashNode.php @@ -26,28 +26,18 @@ class HashNode extends AbstractNode private $selector; private $id; - /** - * @param NodeInterface $selector - * @param string $id - */ - public function __construct(NodeInterface $selector, $id) + public function __construct(NodeInterface $selector, string $id) { $this->selector = $selector; $this->id = $id; } - /** - * @return NodeInterface - */ - public function getSelector() + public function getSelector(): NodeInterface { return $this->selector; } - /** - * @return string - */ - public function getId() + public function getId(): string { return $this->id; } @@ -55,7 +45,7 @@ class HashNode extends AbstractNode /** * {@inheritdoc} */ - public function getSpecificity() + public function getSpecificity(): Specificity { return $this->selector->getSpecificity()->plus(new Specificity(1, 0, 0)); } @@ -63,7 +53,7 @@ class HashNode extends AbstractNode /** * {@inheritdoc} */ - public function __toString() + public function __toString(): string { return sprintf('%s[%s#%s]', $this->getNodeName(), $this->selector, $this->id); } diff --git a/vendor/symfony/css-selector/Node/NegationNode.php b/vendor/symfony/css-selector/Node/NegationNode.php index bf97caeb..9d3e9bc7 100644 --- a/vendor/symfony/css-selector/Node/NegationNode.php +++ b/vendor/symfony/css-selector/Node/NegationNode.php @@ -51,7 +51,7 @@ class NegationNode extends AbstractNode /** * {@inheritdoc} */ - public function getSpecificity() + public function getSpecificity(): Specificity { return $this->selector->getSpecificity()->plus($this->subSelector->getSpecificity()); } @@ -59,7 +59,7 @@ class NegationNode extends AbstractNode /** * {@inheritdoc} */ - public function __toString() + public function __toString(): string { return sprintf('%s[%s:not(%s)]', $this->getNodeName(), $this->selector, $this->subSelector); } diff --git a/vendor/symfony/css-selector/Node/NodeInterface.php b/vendor/symfony/css-selector/Node/NodeInterface.php index d919e20c..b078d26d 100644 --- a/vendor/symfony/css-selector/Node/NodeInterface.php +++ b/vendor/symfony/css-selector/Node/NodeInterface.php @@ -23,24 +23,9 @@ namespace Symfony\Component\CssSelector\Node; */ interface NodeInterface { - /** - * Returns node's name. - * - * @return string - */ - public function getNodeName(); + public function getNodeName(): string; - /** - * Returns node's specificity. - * - * @return Specificity - */ - public function getSpecificity(); + public function getSpecificity(): Specificity; - /** - * Returns node's string representation. - * - * @return string - */ - public function __toString(); + public function __toString(): string; } diff --git a/vendor/symfony/css-selector/Node/PseudoNode.php b/vendor/symfony/css-selector/Node/PseudoNode.php index 3842c695..7d4a011e 100644 --- a/vendor/symfony/css-selector/Node/PseudoNode.php +++ b/vendor/symfony/css-selector/Node/PseudoNode.php @@ -26,28 +26,18 @@ class PseudoNode extends AbstractNode private $selector; private $identifier; - /** - * @param NodeInterface $selector - * @param string $identifier - */ - public function __construct(NodeInterface $selector, $identifier) + public function __construct(NodeInterface $selector, string $identifier) { $this->selector = $selector; $this->identifier = strtolower($identifier); } - /** - * @return NodeInterface - */ - public function getSelector() + public function getSelector(): NodeInterface { return $this->selector; } - /** - * @return string - */ - public function getIdentifier() + public function getIdentifier(): string { return $this->identifier; } @@ -55,7 +45,7 @@ class PseudoNode extends AbstractNode /** * {@inheritdoc} */ - public function getSpecificity() + public function getSpecificity(): Specificity { return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0)); } @@ -63,7 +53,7 @@ class PseudoNode extends AbstractNode /** * {@inheritdoc} */ - public function __toString() + public function __toString(): string { return sprintf('%s[%s:%s]', $this->getNodeName(), $this->selector, $this->identifier); } diff --git a/vendor/symfony/css-selector/Node/SelectorNode.php b/vendor/symfony/css-selector/Node/SelectorNode.php index 5ef2be62..a76aa5bb 100644 --- a/vendor/symfony/css-selector/Node/SelectorNode.php +++ b/vendor/symfony/css-selector/Node/SelectorNode.php @@ -26,28 +26,18 @@ class SelectorNode extends AbstractNode private $tree; private $pseudoElement; - /** - * @param NodeInterface $tree - * @param null|string $pseudoElement - */ - public function __construct(NodeInterface $tree, $pseudoElement = null) + public function __construct(NodeInterface $tree, string $pseudoElement = null) { $this->tree = $tree; $this->pseudoElement = $pseudoElement ? strtolower($pseudoElement) : null; } - /** - * @return NodeInterface - */ - public function getTree() + public function getTree(): NodeInterface { return $this->tree; } - /** - * @return null|string - */ - public function getPseudoElement() + public function getPseudoElement(): ?string { return $this->pseudoElement; } @@ -55,7 +45,7 @@ class SelectorNode extends AbstractNode /** * {@inheritdoc} */ - public function getSpecificity() + public function getSpecificity(): Specificity { return $this->tree->getSpecificity()->plus(new Specificity(0, 0, $this->pseudoElement ? 1 : 0)); } @@ -63,7 +53,7 @@ class SelectorNode extends AbstractNode /** * {@inheritdoc} */ - public function __toString() + public function __toString(): string { return sprintf('%s[%s%s]', $this->getNodeName(), $this->tree, $this->pseudoElement ? '::'.$this->pseudoElement : ''); } diff --git a/vendor/symfony/css-selector/Node/Specificity.php b/vendor/symfony/css-selector/Node/Specificity.php index 6aa70d78..9b35cb41 100644 --- a/vendor/symfony/css-selector/Node/Specificity.php +++ b/vendor/symfony/css-selector/Node/Specificity.php @@ -33,32 +33,19 @@ class Specificity private $b; private $c; - /** - * @param int $a - * @param int $b - * @param int $c - */ - public function __construct($a, $b, $c) + public function __construct(int $a, int $b, int $c) { $this->a = $a; $this->b = $b; $this->c = $c; } - /** - * @return self - */ - public function plus(Specificity $specificity) + public function plus(self $specificity): self { return new self($this->a + $specificity->a, $this->b + $specificity->b, $this->c + $specificity->c); } - /** - * Returns global specificity value. - * - * @return int - */ - public function getValue() + public function getValue(): int { return $this->a * self::A_FACTOR + $this->b * self::B_FACTOR + $this->c * self::C_FACTOR; } @@ -69,7 +56,7 @@ class Specificity * * @return int */ - public function compareTo(Specificity $specificity) + public function compareTo(self $specificity) { if ($this->a !== $specificity->a) { return $this->a > $specificity->a ? 1 : -1; diff --git a/vendor/symfony/css-selector/Parser/Handler/CommentHandler.php b/vendor/symfony/css-selector/Parser/Handler/CommentHandler.php index a29775ca..93f31884 100644 --- a/vendor/symfony/css-selector/Parser/Handler/CommentHandler.php +++ b/vendor/symfony/css-selector/Parser/Handler/CommentHandler.php @@ -29,7 +29,7 @@ class CommentHandler implements HandlerInterface /** * {@inheritdoc} */ - public function handle(Reader $reader, TokenStream $stream) + public function handle(Reader $reader, TokenStream $stream): bool { if ('/*' !== $reader->getSubstring(2)) { return false; diff --git a/vendor/symfony/css-selector/Parser/Handler/HandlerInterface.php b/vendor/symfony/css-selector/Parser/Handler/HandlerInterface.php index de931f67..d7ac4d33 100644 --- a/vendor/symfony/css-selector/Parser/Handler/HandlerInterface.php +++ b/vendor/symfony/css-selector/Parser/Handler/HandlerInterface.php @@ -29,5 +29,5 @@ interface HandlerInterface /** * @return bool */ - public function handle(Reader $reader, TokenStream $stream); + public function handle(Reader $reader, TokenStream $stream): bool; } diff --git a/vendor/symfony/css-selector/Parser/Handler/HashHandler.php b/vendor/symfony/css-selector/Parser/Handler/HashHandler.php index 5f7f4d23..f40807cd 100644 --- a/vendor/symfony/css-selector/Parser/Handler/HashHandler.php +++ b/vendor/symfony/css-selector/Parser/Handler/HashHandler.php @@ -41,7 +41,7 @@ class HashHandler implements HandlerInterface /** * {@inheritdoc} */ - public function handle(Reader $reader, TokenStream $stream) + public function handle(Reader $reader, TokenStream $stream): bool { $match = $reader->findPattern($this->patterns->getHashPattern()); diff --git a/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php b/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php index aa6804ed..5ea0d5fd 100644 --- a/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php +++ b/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php @@ -41,7 +41,7 @@ class IdentifierHandler implements HandlerInterface /** * {@inheritdoc} */ - public function handle(Reader $reader, TokenStream $stream) + public function handle(Reader $reader, TokenStream $stream): bool { $match = $reader->findPattern($this->patterns->getIdentifierPattern()); diff --git a/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php b/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php index 7e561d1d..41e5844e 100644 --- a/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php +++ b/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php @@ -38,7 +38,7 @@ class NumberHandler implements HandlerInterface /** * {@inheritdoc} */ - public function handle(Reader $reader, TokenStream $stream) + public function handle(Reader $reader, TokenStream $stream): bool { $match = $reader->findPattern($this->patterns->getNumberPattern()); diff --git a/vendor/symfony/css-selector/Parser/Handler/StringHandler.php b/vendor/symfony/css-selector/Parser/Handler/StringHandler.php index f842e1ce..fe92c1fc 100644 --- a/vendor/symfony/css-selector/Parser/Handler/StringHandler.php +++ b/vendor/symfony/css-selector/Parser/Handler/StringHandler.php @@ -43,7 +43,7 @@ class StringHandler implements HandlerInterface /** * {@inheritdoc} */ - public function handle(Reader $reader, TokenStream $stream) + public function handle(Reader $reader, TokenStream $stream): bool { $quote = $reader->getSubstring(1); diff --git a/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php b/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php index 4c2d3354..ebf8a19f 100644 --- a/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php +++ b/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php @@ -30,7 +30,7 @@ class WhitespaceHandler implements HandlerInterface /** * {@inheritdoc} */ - public function handle(Reader $reader, TokenStream $stream) + public function handle(Reader $reader, TokenStream $stream): bool { $match = $reader->findPattern('~^[ \t\r\n\f]+~'); diff --git a/vendor/symfony/css-selector/Parser/Parser.php b/vendor/symfony/css-selector/Parser/Parser.php index 195e1071..dc84cc18 100644 --- a/vendor/symfony/css-selector/Parser/Parser.php +++ b/vendor/symfony/css-selector/Parser/Parser.php @@ -37,7 +37,7 @@ class Parser implements ParserInterface /** * {@inheritdoc} */ - public function parse($source) + public function parse(string $source): array { $reader = new Reader($source); $stream = $this->tokenizer->tokenize($reader); @@ -50,11 +50,9 @@ class Parser implements ParserInterface * * @param Token[] $tokens * - * @return array - * * @throws SyntaxErrorException */ - public static function parseSeries(array $tokens) + public static function parseSeries(array $tokens): array { foreach ($tokens as $token) { if ($token->isString()) { @@ -94,12 +92,7 @@ class Parser implements ParserInterface ); } - /** - * Parses selector nodes. - * - * @return array - */ - private function parseSelectorList(TokenStream $stream) + private function parseSelectorList(TokenStream $stream): array { $stream->skipWhitespace(); $selectors = array(); @@ -118,14 +111,7 @@ class Parser implements ParserInterface return $selectors; } - /** - * Parses next selector or combined node. - * - * @return Node\SelectorNode - * - * @throws SyntaxErrorException - */ - private function parserSelectorNode(TokenStream $stream) + private function parserSelectorNode(TokenStream $stream): Node\SelectorNode { list($result, $pseudoElement) = $this->parseSimpleSelector($stream); @@ -158,14 +144,9 @@ class Parser implements ParserInterface /** * Parses next simple node (hash, class, pseudo, negation). * - * @param TokenStream $stream - * @param bool $insideNegation - * - * @return array - * * @throws SyntaxErrorException */ - private function parseSimpleSelector(TokenStream $stream, $insideNegation = false) + private function parseSimpleSelector(TokenStream $stream, bool $insideNegation = false): array { $stream->skipWhitespace(); @@ -279,12 +260,7 @@ class Parser implements ParserInterface return array($result, $pseudoElement); } - /** - * Parses next element node. - * - * @return Node\ElementNode - */ - private function parseElementNode(TokenStream $stream) + private function parseElementNode(TokenStream $stream): Node\ElementNode { $peek = $stream->getPeek(); @@ -310,14 +286,7 @@ class Parser implements ParserInterface return new Node\ElementNode($namespace, $element); } - /** - * Parses next attribute node. - * - * @return Node\AttributeNode - * - * @throws SyntaxErrorException - */ - private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream) + private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream): Node\AttributeNode { $stream->skipWhitespace(); $attribute = $stream->getNextIdentifierOrStar(); diff --git a/vendor/symfony/css-selector/Parser/ParserInterface.php b/vendor/symfony/css-selector/Parser/ParserInterface.php index c5af2036..51c3d935 100644 --- a/vendor/symfony/css-selector/Parser/ParserInterface.php +++ b/vendor/symfony/css-selector/Parser/ParserInterface.php @@ -28,9 +28,7 @@ interface ParserInterface /** * Parses given selector source into an array of tokens. * - * @param string $source - * * @return SelectorNode[] */ - public function parse($source); + public function parse(string $source): array; } diff --git a/vendor/symfony/css-selector/Parser/Reader.php b/vendor/symfony/css-selector/Parser/Reader.php index 5a1be30c..adfd3c21 100644 --- a/vendor/symfony/css-selector/Parser/Reader.php +++ b/vendor/symfony/css-selector/Parser/Reader.php @@ -27,56 +27,33 @@ class Reader private $length; private $position = 0; - /** - * @param string $source - */ - public function __construct($source) + public function __construct(string $source) { $this->source = $source; $this->length = strlen($source); } - /** - * @return bool - */ - public function isEOF() + public function isEOF(): bool { return $this->position >= $this->length; } - /** - * @return int - */ - public function getPosition() + public function getPosition(): int { return $this->position; } - /** - * @return int - */ - public function getRemainingLength() + public function getRemainingLength(): int { return $this->length - $this->position; } - /** - * @param int $length - * @param int $offset - * - * @return string - */ - public function getSubstring($length, $offset = 0) + public function getSubstring(int $length, int $offset = 0): string { return substr($this->source, $this->position + $offset, $length); } - /** - * @param string $string - * - * @return int - */ - public function getOffset($string) + public function getOffset(string $string) { $position = strpos($this->source, $string, $this->position); @@ -84,11 +61,9 @@ class Reader } /** - * @param string $pattern - * * @return array|false */ - public function findPattern($pattern) + public function findPattern(string $pattern) { $source = substr($this->source, $this->position); @@ -99,10 +74,7 @@ class Reader return false; } - /** - * @param int $length - */ - public function moveForward($length) + public function moveForward(int $length) { $this->position += $length; } diff --git a/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php b/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php index c513de5f..ce7b20ef 100644 --- a/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php +++ b/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php @@ -31,7 +31,7 @@ class ClassParser implements ParserInterface /** * {@inheritdoc} */ - public function parse($source) + public function parse(string $source): array { // Matches an optional namespace, optional element, and required class // $source = 'test|input.ab6bd_field'; diff --git a/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php b/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php index c29f5e44..3b93f006 100644 --- a/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php +++ b/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php @@ -30,7 +30,7 @@ class ElementParser implements ParserInterface /** * {@inheritdoc} */ - public function parse($source) + public function parse(string $source): array { // Matches an optional namespace, required element or `*` // $source = 'testns|testel'; diff --git a/vendor/symfony/css-selector/Parser/Shortcut/EmptyStringParser.php b/vendor/symfony/css-selector/Parser/Shortcut/EmptyStringParser.php index 16d374af..e8a89cc4 100644 --- a/vendor/symfony/css-selector/Parser/Shortcut/EmptyStringParser.php +++ b/vendor/symfony/css-selector/Parser/Shortcut/EmptyStringParser.php @@ -34,7 +34,7 @@ class EmptyStringParser implements ParserInterface /** * {@inheritdoc} */ - public function parse($source) + public function parse(string $source): array { // Matches an empty string if ('' == $source) { diff --git a/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php b/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php index 3f3883bb..e94ce0a4 100644 --- a/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php +++ b/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php @@ -31,7 +31,7 @@ class HashParser implements ParserInterface /** * {@inheritdoc} */ - public function parse($source) + public function parse(string $source): array { // Matches an optional namespace, optional element, and required id // $source = 'test|input#ab6bd_field'; diff --git a/vendor/symfony/css-selector/Parser/Token.php b/vendor/symfony/css-selector/Parser/Token.php index 9baaa6dd..554deb8e 100644 --- a/vendor/symfony/css-selector/Parser/Token.php +++ b/vendor/symfony/css-selector/Parser/Token.php @@ -35,54 +35,34 @@ class Token private $value; private $position; - /** - * @param int $type - * @param string $value - * @param int $position - */ - public function __construct($type, $value, $position) + public function __construct(?string $type, ?string $value, ?int $position) { $this->type = $type; $this->value = $value; $this->position = $position; } - /** - * @return int - */ - public function getType() + public function getType(): ?int { return $this->type; } - /** - * @return string - */ - public function getValue() + public function getValue(): ?string { return $this->value; } - /** - * @return int - */ - public function getPosition() + public function getPosition(): ?int { return $this->position; } - /** - * @return bool - */ - public function isFileEnd() + public function isFileEnd(): bool { return self::TYPE_FILE_END === $this->type; } - /** - * @return bool - */ - public function isDelimiter(array $values = array()) + public function isDelimiter(array $values = array()): bool { if (self::TYPE_DELIMITER !== $this->type) { return false; @@ -95,50 +75,32 @@ class Token return in_array($this->value, $values); } - /** - * @return bool - */ - public function isWhitespace() + public function isWhitespace(): bool { return self::TYPE_WHITESPACE === $this->type; } - /** - * @return bool - */ - public function isIdentifier() + public function isIdentifier(): bool { return self::TYPE_IDENTIFIER === $this->type; } - /** - * @return bool - */ - public function isHash() + public function isHash(): bool { return self::TYPE_HASH === $this->type; } - /** - * @return bool - */ - public function isNumber() + public function isNumber(): bool { return self::TYPE_NUMBER === $this->type; } - /** - * @return bool - */ - public function isString() + public function isString(): bool { return self::TYPE_STRING === $this->type; } - /** - * @return string - */ - public function __toString() + public function __toString(): string { if ($this->value) { return sprintf('<%s "%s" at %s>', $this->type, $this->value, $this->position); diff --git a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php b/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php index c6f289aa..2df63f51 100644 --- a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php +++ b/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php @@ -30,36 +30,21 @@ class TokenizerEscaping $this->patterns = $patterns; } - /** - * @param string $value - * - * @return string - */ - public function escapeUnicode($value) + public function escapeUnicode(string $value): string { $value = $this->replaceUnicodeSequences($value); return preg_replace($this->patterns->getSimpleEscapePattern(), '$1', $value); } - /** - * @param string $value - * - * @return string - */ - public function escapeUnicodeAndNewLine($value) + public function escapeUnicodeAndNewLine(string $value): string { $value = preg_replace($this->patterns->getNewLineEscapePattern(), '', $value); return $this->escapeUnicode($value); } - /** - * @param string $value - * - * @return string - */ - private function replaceUnicodeSequences($value) + private function replaceUnicodeSequences(string $value): string { return preg_replace_callback($this->patterns->getUnicodeEscapePattern(), function ($match) { $c = hexdec($match[1]); diff --git a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php b/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php index 30584ca9..5f16ac48 100644 --- a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php +++ b/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php @@ -46,66 +46,43 @@ class TokenizerPatterns $this->nonAsciiPattern = '[^\x00-\x7F]'; $this->nmCharPattern = '[_a-z0-9-]|'.$this->escapePattern.'|'.$this->nonAsciiPattern; $this->nmStartPattern = '[_a-z]|'.$this->escapePattern.'|'.$this->nonAsciiPattern; - $this->identifierPattern = '(?:'.$this->nmStartPattern.')(?:'.$this->nmCharPattern.')*'; + $this->identifierPattern = '-?(?:'.$this->nmStartPattern.')(?:'.$this->nmCharPattern.')*'; $this->hashPattern = '#((?:'.$this->nmCharPattern.')+)'; $this->numberPattern = '[+-]?(?:[0-9]*\.[0-9]+|[0-9]+)'; $this->quotedStringPattern = '([^\n\r\f%s]|'.$this->stringEscapePattern.')*'; } - /** - * @return string - */ - public function getNewLineEscapePattern() + public function getNewLineEscapePattern(): string { return '~^'.$this->newLineEscapePattern.'~'; } - /** - * @return string - */ - public function getSimpleEscapePattern() + public function getSimpleEscapePattern(): string { return '~^'.$this->simpleEscapePattern.'~'; } - /** - * @return string - */ - public function getUnicodeEscapePattern() + public function getUnicodeEscapePattern(): string { return '~^'.$this->unicodeEscapePattern.'~i'; } - /** - * @return string - */ - public function getIdentifierPattern() + public function getIdentifierPattern(): string { return '~^'.$this->identifierPattern.'~i'; } - /** - * @return string - */ - public function getHashPattern() + public function getHashPattern(): string { return '~^'.$this->hashPattern.'~i'; } - /** - * @return string - */ - public function getNumberPattern() + public function getNumberPattern(): string { return '~^'.$this->numberPattern.'~'; } - /** - * @param string $quote - * - * @return string - */ - public function getQuotedStringPattern($quote) + public function getQuotedStringPattern(string $quote): string { return '~^'.sprintf($this->quotedStringPattern, $quote).'~i'; } diff --git a/vendor/symfony/css-selector/Tests/CssSelectorConverterTest.php b/vendor/symfony/css-selector/Tests/CssSelectorConverterTest.php index a27fadfe..a3eea7ad 100644 --- a/vendor/symfony/css-selector/Tests/CssSelectorConverterTest.php +++ b/vendor/symfony/css-selector/Tests/CssSelectorConverterTest.php @@ -59,7 +59,7 @@ class CssSelectorConverterTest extends TestCase array('h1', 'h1'), array('foo|h1', 'foo:h1'), array('h1, h2, h3', 'h1 | h2 | h3'), - array('h1:nth-child(3n+1)', "*/*[name() = 'h1' and (position() - 1 >= 0 and (position() - 1) mod 3 = 0)]"), + array('h1:nth-child(3n+1)', "*/*[(name() = 'h1') and (position() - 1 >= 0 and (position() - 1) mod 3 = 0)]"), array('h1 > p', 'h1/p'), array('h1#foo', "h1[@id = 'foo']"), array('h1.foo', "h1[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"), diff --git a/vendor/symfony/css-selector/Tests/Parser/ParserTest.php b/vendor/symfony/css-selector/Tests/Parser/ParserTest.php index 37a3ef1d..53b35a95 100644 --- a/vendor/symfony/css-selector/Tests/Parser/ParserTest.php +++ b/vendor/symfony/css-selector/Tests/Parser/ParserTest.php @@ -186,6 +186,7 @@ class ParserTest extends TestCase array('foo:after', 'Element[foo]', 'after'), array('foo::selection', 'Element[foo]', 'selection'), array('lorem#ipsum ~ a#b.c[href]:empty::selection', 'CombinedSelector[Hash[Element[lorem]#ipsum] ~ Pseudo[Attribute[Class[Hash[Element[a]#b].c][href]]:empty]]', 'selection'), + array('video::-webkit-media-controls', 'Element[video]', '-webkit-media-controls'), ); } diff --git a/vendor/symfony/css-selector/Tests/XPath/TranslatorTest.php b/vendor/symfony/css-selector/Tests/XPath/TranslatorTest.php index 218a3b43..51941783 100644 --- a/vendor/symfony/css-selector/Tests/XPath/TranslatorTest.php +++ b/vendor/symfony/css-selector/Tests/XPath/TranslatorTest.php @@ -102,18 +102,20 @@ class TranslatorTest extends TestCase array('e[foo^="bar"]', "e[@foo and starts-with(@foo, 'bar')]"), array('e[foo$="bar"]', "e[@foo and substring(@foo, string-length(@foo)-2) = 'bar']"), array('e[foo*="bar"]', "e[@foo and contains(@foo, 'bar')]"), + array('e[foo!="bar"]', "e[not(@foo) or @foo != 'bar']"), + array('e[foo!="bar"][foo!="baz"]', "e[(not(@foo) or @foo != 'bar') and (not(@foo) or @foo != 'baz')]"), array('e[hreflang|="en"]', "e[@hreflang and (@hreflang = 'en' or starts-with(@hreflang, 'en-'))]"), - array('e:nth-child(1)', "*/*[name() = 'e' and (position() = 1)]"), - array('e:nth-last-child(1)', "*/*[name() = 'e' and (position() = last() - 0)]"), - array('e:nth-last-child(2n+2)', "*/*[name() = 'e' and (last() - position() - 1 >= 0 and (last() - position() - 1) mod 2 = 0)]"), + array('e:nth-child(1)', "*/*[(name() = 'e') and (position() = 1)]"), + array('e:nth-last-child(1)', "*/*[(name() = 'e') and (position() = last() - 0)]"), + array('e:nth-last-child(2n+2)', "*/*[(name() = 'e') and (last() - position() - 1 >= 0 and (last() - position() - 1) mod 2 = 0)]"), array('e:nth-of-type(1)', '*/e[position() = 1]'), array('e:nth-last-of-type(1)', '*/e[position() = last() - 0]'), array('div e:nth-last-of-type(1) .aclass', "div/descendant-or-self::*/e[position() = last() - 0]/descendant-or-self::*/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' aclass ')]"), - array('e:first-child', "*/*[name() = 'e' and (position() = 1)]"), - array('e:last-child', "*/*[name() = 'e' and (position() = last())]"), + array('e:first-child', "*/*[(name() = 'e') and (position() = 1)]"), + array('e:last-child', "*/*[(name() = 'e') and (position() = last())]"), array('e:first-of-type', '*/e[position() = 1]'), array('e:last-of-type', '*/e[position() = last()]'), - array('e:only-child', "*/*[name() = 'e' and (last() = 1)]"), + array('e:only-child', "*/*[(name() = 'e') and (last() = 1)]"), array('e:only-of-type', 'e[last() = 1]'), array('e:empty', 'e[not(*) and not(string-length())]'), array('e:EmPTY', 'e[not(*) and not(string-length())]'), @@ -127,7 +129,7 @@ class TranslatorTest extends TestCase array('e:nOT(*)', 'e[0]'), array('e f', 'e/descendant-or-self::*/f'), array('e > f', 'e/f'), - array('e + f', "e/following-sibling::*[name() = 'f' and (position() = 1)]"), + array('e + f', "e/following-sibling::*[(name() = 'f') and (position() = 1)]"), array('e ~ f', 'e/following-sibling::f'), array('div#container p', "div[@id = 'container']/descendant-or-self::*/p"), ); diff --git a/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php b/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php index 6ace8b59..ee8976fd 100644 --- a/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php +++ b/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php @@ -43,38 +43,17 @@ class AttributeMatchingExtension extends AbstractExtension ); } - /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value - * - * @return XPathExpr - */ - public function translateExists(XPathExpr $xpath, $attribute, $value) + public function translateExists(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr { return $xpath->addCondition($attribute); } - /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value - * - * @return XPathExpr - */ - public function translateEquals(XPathExpr $xpath, $attribute, $value) + public function translateEquals(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr { return $xpath->addCondition(sprintf('%s = %s', $attribute, Translator::getXpathLiteral($value))); } - /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value - * - * @return XPathExpr - */ - public function translateIncludes(XPathExpr $xpath, $attribute, $value) + public function translateIncludes(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr { return $xpath->addCondition($value ? sprintf( '%1$s and contains(concat(\' \', normalize-space(%1$s), \' \'), %2$s)', @@ -83,14 +62,7 @@ class AttributeMatchingExtension extends AbstractExtension ) : '0'); } - /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value - * - * @return XPathExpr - */ - public function translateDashMatch(XPathExpr $xpath, $attribute, $value) + public function translateDashMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr { return $xpath->addCondition(sprintf( '%1$s and (%1$s = %2$s or starts-with(%1$s, %3$s))', @@ -100,14 +72,7 @@ class AttributeMatchingExtension extends AbstractExtension )); } - /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value - * - * @return XPathExpr - */ - public function translatePrefixMatch(XPathExpr $xpath, $attribute, $value) + public function translatePrefixMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr { return $xpath->addCondition($value ? sprintf( '%1$s and starts-with(%1$s, %2$s)', @@ -116,14 +81,7 @@ class AttributeMatchingExtension extends AbstractExtension ) : '0'); } - /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value - * - * @return XPathExpr - */ - public function translateSuffixMatch(XPathExpr $xpath, $attribute, $value) + public function translateSuffixMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr { return $xpath->addCondition($value ? sprintf( '%1$s and substring(%1$s, string-length(%1$s)-%2$s) = %3$s', @@ -133,14 +91,7 @@ class AttributeMatchingExtension extends AbstractExtension ) : '0'); } - /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value - * - * @return XPathExpr - */ - public function translateSubstringMatch(XPathExpr $xpath, $attribute, $value) + public function translateSubstringMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr { return $xpath->addCondition($value ? sprintf( '%1$s and contains(%1$s, %2$s)', @@ -149,14 +100,7 @@ class AttributeMatchingExtension extends AbstractExtension ) : '0'); } - /** - * @param XPathExpr $xpath - * @param string $attribute - * @param string $value - * - * @return XPathExpr - */ - public function translateDifferent(XPathExpr $xpath, $attribute, $value) + public function translateDifferent(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr { return $xpath->addCondition(sprintf( $value ? 'not(%1$s) or %1$s != %2$s' : '%s != %s', diff --git a/vendor/symfony/css-selector/XPath/Extension/CombinationExtension.php b/vendor/symfony/css-selector/XPath/Extension/CombinationExtension.php index 0c9cc032..85181fd9 100644 --- a/vendor/symfony/css-selector/XPath/Extension/CombinationExtension.php +++ b/vendor/symfony/css-selector/XPath/Extension/CombinationExtension.php @@ -28,7 +28,7 @@ class CombinationExtension extends AbstractExtension /** * {@inheritdoc} */ - public function getCombinationTranslators() + public function getCombinationTranslators(): array { return array( ' ' => array($this, 'translateDescendant'), @@ -41,7 +41,7 @@ class CombinationExtension extends AbstractExtension /** * @return XPathExpr */ - public function translateDescendant(XPathExpr $xpath, XPathExpr $combinedXpath) + public function translateDescendant(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr { return $xpath->join('/descendant-or-self::*/', $combinedXpath); } diff --git a/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php b/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php index c2606b5a..52b9c2f6 100644 --- a/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php +++ b/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php @@ -46,16 +46,9 @@ class FunctionExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param FunctionNode $function - * @param bool $last - * @param bool $addNameTest - * - * @return XPathExpr - * * @throws ExpressionErrorException */ - public function translateNthChild(XPathExpr $xpath, FunctionNode $function, $last = false, $addNameTest = true) + public function translateNthChild(XPathExpr $xpath, FunctionNode $function, bool $last = false, bool $addNameTest = true): XPathExpr { try { list($a, $b) = Parser::parseSeries($function->getArguments()); @@ -110,28 +103,20 @@ class FunctionExtension extends AbstractExtension // -1n+6 means elements 6 and previous } - /** - * @return XPathExpr - */ - public function translateNthLastChild(XPathExpr $xpath, FunctionNode $function) + public function translateNthLastChild(XPathExpr $xpath, FunctionNode $function): XPathExpr { return $this->translateNthChild($xpath, $function, true); } - /** - * @return XPathExpr - */ - public function translateNthOfType(XPathExpr $xpath, FunctionNode $function) + public function translateNthOfType(XPathExpr $xpath, FunctionNode $function): XPathExpr { return $this->translateNthChild($xpath, $function, false, false); } /** - * @return XPathExpr - * * @throws ExpressionErrorException */ - public function translateNthLastOfType(XPathExpr $xpath, FunctionNode $function) + public function translateNthLastOfType(XPathExpr $xpath, FunctionNode $function): XPathExpr { if ('*' === $xpath->getElement()) { throw new ExpressionErrorException('"*:nth-of-type()" is not implemented.'); @@ -141,11 +126,9 @@ class FunctionExtension extends AbstractExtension } /** - * @return XPathExpr - * * @throws ExpressionErrorException */ - public function translateContains(XPathExpr $xpath, FunctionNode $function) + public function translateContains(XPathExpr $xpath, FunctionNode $function): XPathExpr { $arguments = $function->getArguments(); foreach ($arguments as $token) { @@ -164,11 +147,9 @@ class FunctionExtension extends AbstractExtension } /** - * @return XPathExpr - * * @throws ExpressionErrorException */ - public function translateLang(XPathExpr $xpath, FunctionNode $function) + public function translateLang(XPathExpr $xpath, FunctionNode $function): XPathExpr { $arguments = $function->getArguments(); foreach ($arguments as $token) { diff --git a/vendor/symfony/css-selector/XPath/Extension/NodeExtension.php b/vendor/symfony/css-selector/XPath/Extension/NodeExtension.php index 715d9611..61442b6f 100644 --- a/vendor/symfony/css-selector/XPath/Extension/NodeExtension.php +++ b/vendor/symfony/css-selector/XPath/Extension/NodeExtension.php @@ -33,21 +33,15 @@ class NodeExtension extends AbstractExtension private $flags; - /** - * @param int $flags - */ - public function __construct($flags = 0) + public function __construct(int $flags = 0) { $this->flags = $flags; } /** - * @param int $flag - * @param bool $on - * * @return $this */ - public function setFlag($flag, $on) + public function setFlag(int $flag, bool $on) { if ($on && !$this->hasFlag($flag)) { $this->flags += $flag; @@ -60,12 +54,7 @@ class NodeExtension extends AbstractExtension return $this; } - /** - * @param int $flag - * - * @return bool - */ - public function hasFlag($flag) + public function hasFlag(int $flag): bool { return (bool) ($this->flags & $flag); } @@ -88,26 +77,17 @@ class NodeExtension extends AbstractExtension ); } - /** - * @return XPathExpr - */ - public function translateSelector(Node\SelectorNode $node, Translator $translator) + public function translateSelector(Node\SelectorNode $node, Translator $translator): XPathExpr { return $translator->nodeToXPath($node->getTree()); } - /** - * @return XPathExpr - */ - public function translateCombinedSelector(Node\CombinedSelectorNode $node, Translator $translator) + public function translateCombinedSelector(Node\CombinedSelectorNode $node, Translator $translator): XPathExpr { return $translator->addCombination($node->getCombinator(), $node->getSelector(), $node->getSubSelector()); } - /** - * @return XPathExpr - */ - public function translateNegation(Node\NegationNode $node, Translator $translator) + public function translateNegation(Node\NegationNode $node, Translator $translator): XPathExpr { $xpath = $translator->nodeToXPath($node->getSelector()); $subXpath = $translator->nodeToXPath($node->getSubSelector()); @@ -120,30 +100,21 @@ class NodeExtension extends AbstractExtension return $xpath->addCondition('0'); } - /** - * @return XPathExpr - */ - public function translateFunction(Node\FunctionNode $node, Translator $translator) + public function translateFunction(Node\FunctionNode $node, Translator $translator): XPathExpr { $xpath = $translator->nodeToXPath($node->getSelector()); return $translator->addFunction($xpath, $node); } - /** - * @return XPathExpr - */ - public function translatePseudo(Node\PseudoNode $node, Translator $translator) + public function translatePseudo(Node\PseudoNode $node, Translator $translator): XPathExpr { $xpath = $translator->nodeToXPath($node->getSelector()); return $translator->addPseudoClass($xpath, $node->getIdentifier()); } - /** - * @return XPathExpr - */ - public function translateAttribute(Node\AttributeNode $node, Translator $translator) + public function translateAttribute(Node\AttributeNode $node, Translator $translator): XPathExpr { $name = $node->getAttribute(); $safe = $this->isSafeName($name); @@ -168,30 +139,21 @@ class NodeExtension extends AbstractExtension return $translator->addAttributeMatching($xpath, $node->getOperator(), $attribute, $value); } - /** - * @return XPathExpr - */ - public function translateClass(Node\ClassNode $node, Translator $translator) + public function translateClass(Node\ClassNode $node, Translator $translator): XPathExpr { $xpath = $translator->nodeToXPath($node->getSelector()); return $translator->addAttributeMatching($xpath, '~=', '@class', $node->getName()); } - /** - * @return XPathExpr - */ - public function translateHash(Node\HashNode $node, Translator $translator) + public function translateHash(Node\HashNode $node, Translator $translator): XPathExpr { $xpath = $translator->nodeToXPath($node->getSelector()); return $translator->addAttributeMatching($xpath, '=', '@id', $node->getId()); } - /** - * @return XPathExpr - */ - public function translateElement(Node\ElementNode $node) + public function translateElement(Node\ElementNode $node): XPathExpr { $element = $node->getElement(); @@ -228,14 +190,7 @@ class NodeExtension extends AbstractExtension return 'node'; } - /** - * Tests if given name is safe. - * - * @param string $name - * - * @return bool - */ - private function isSafeName($name) + private function isSafeName(string $name): bool { return 0 < preg_match('~^[a-zA-Z_][a-zA-Z0-9_.-]*$~', $name); } diff --git a/vendor/symfony/css-selector/XPath/Translator.php b/vendor/symfony/css-selector/XPath/Translator.php index d20ad7dc..73b54821 100644 --- a/vendor/symfony/css-selector/XPath/Translator.php +++ b/vendor/symfony/css-selector/XPath/Translator.php @@ -61,12 +61,7 @@ class Translator implements TranslatorInterface ; } - /** - * @param string $element - * - * @return string - */ - public static function getXpathLiteral($element) + public static function getXpathLiteral(string $element): string { if (false === strpos($element, "'")) { return "'".$element."'"; @@ -95,7 +90,7 @@ class Translator implements TranslatorInterface /** * {@inheritdoc} */ - public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::') + public function cssToXPath(string $cssExpr, string $prefix = 'descendant-or-self::'): string { $selectors = $this->parseSelectors($cssExpr); @@ -114,17 +109,12 @@ class Translator implements TranslatorInterface /** * {@inheritdoc} */ - public function selectorToXPath(SelectorNode $selector, $prefix = 'descendant-or-self::') + public function selectorToXPath(SelectorNode $selector, string $prefix = 'descendant-or-self::'): string { return ($prefix ?: '').$this->nodeToXPath($selector); } - /** - * Registers an extension. - * - * @return $this - */ - public function registerExtension(Extension\ExtensionInterface $extension) + public function registerExtension(Extension\ExtensionInterface $extension): self { $this->extensions[$extension->getName()] = $extension; @@ -138,13 +128,9 @@ class Translator implements TranslatorInterface } /** - * @param string $name - * - * @return Extension\ExtensionInterface - * * @throws ExpressionErrorException */ - public function getExtension($name) + public function getExtension(string $name): Extension\ExtensionInterface { if (!isset($this->extensions[$name])) { throw new ExpressionErrorException(sprintf('Extension "%s" not registered.', $name)); @@ -153,12 +139,7 @@ class Translator implements TranslatorInterface return $this->extensions[$name]; } - /** - * Registers a shortcut parser. - * - * @return $this - */ - public function registerParserShortcut(ParserInterface $shortcut) + public function registerParserShortcut(ParserInterface $shortcut): self { $this->shortcutParsers[] = $shortcut; @@ -166,11 +147,9 @@ class Translator implements TranslatorInterface } /** - * @return XPathExpr - * * @throws ExpressionErrorException */ - public function nodeToXPath(NodeInterface $node) + public function nodeToXPath(NodeInterface $node): XPathExpr { if (!isset($this->nodeTranslators[$node->getNodeName()])) { throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName())); @@ -180,15 +159,9 @@ class Translator implements TranslatorInterface } /** - * @param string $combiner - * @param NodeInterface $xpath - * @param NodeInterface $combinedXpath - * - * @return XPathExpr - * * @throws ExpressionErrorException */ - public function addCombination($combiner, NodeInterface $xpath, NodeInterface $combinedXpath) + public function addCombination(string $combiner, NodeInterface $xpath, NodeInterface $combinedXpath): XPathExpr { if (!isset($this->combinationTranslators[$combiner])) { throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner)); @@ -198,11 +171,9 @@ class Translator implements TranslatorInterface } /** - * @return XPathExpr - * * @throws ExpressionErrorException */ - public function addFunction(XPathExpr $xpath, FunctionNode $function) + public function addFunction(XPathExpr $xpath, FunctionNode $function): XPathExpr { if (!isset($this->functionTranslators[$function->getName()])) { throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName())); @@ -212,14 +183,9 @@ class Translator implements TranslatorInterface } /** - * @param XPathExpr $xpath - * @param string $pseudoClass - * - * @return XPathExpr - * * @throws ExpressionErrorException */ - public function addPseudoClass(XPathExpr $xpath, $pseudoClass) + public function addPseudoClass(XPathExpr $xpath, string $pseudoClass): XPathExpr { if (!isset($this->pseudoClassTranslators[$pseudoClass])) { throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass)); @@ -229,16 +195,9 @@ class Translator implements TranslatorInterface } /** - * @param XPathExpr $xpath - * @param string $operator - * @param string $attribute - * @param string $value - * - * @return XPathExpr - * * @throws ExpressionErrorException */ - public function addAttributeMatching(XPathExpr $xpath, $operator, $attribute, $value) + public function addAttributeMatching(XPathExpr $xpath, string $operator, string $attribute, $value): XPathExpr { if (!isset($this->attributeMatchingTranslators[$operator])) { throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator)); @@ -248,11 +207,9 @@ class Translator implements TranslatorInterface } /** - * @param string $css - * * @return SelectorNode[] */ - private function parseSelectors($css) + private function parseSelectors(string $css) { foreach ($this->shortcutParsers as $shortcut) { $tokens = $shortcut->parse($css); diff --git a/vendor/symfony/css-selector/XPath/TranslatorInterface.php b/vendor/symfony/css-selector/XPath/TranslatorInterface.php index 0b5de83d..c19eefb9 100644 --- a/vendor/symfony/css-selector/XPath/TranslatorInterface.php +++ b/vendor/symfony/css-selector/XPath/TranslatorInterface.php @@ -27,21 +27,11 @@ interface TranslatorInterface { /** * Translates a CSS selector to an XPath expression. - * - * @param string $cssExpr - * @param string $prefix - * - * @return string */ - public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::'); + public function cssToXPath(string $cssExpr, string $prefix = 'descendant-or-self::'): string; /** * Translates a parsed selector node to an XPath expression. - * - * @param SelectorNode $selector - * @param string $prefix - * - * @return string */ - public function selectorToXPath(SelectorNode $selector, $prefix = 'descendant-or-self::'); + public function selectorToXPath(SelectorNode $selector, string $prefix = 'descendant-or-self::'): string; } diff --git a/vendor/symfony/css-selector/XPath/XPathExpr.php b/vendor/symfony/css-selector/XPath/XPathExpr.php index fa59bce2..638cbd0f 100644 --- a/vendor/symfony/css-selector/XPath/XPathExpr.php +++ b/vendor/symfony/css-selector/XPath/XPathExpr.php @@ -27,13 +27,7 @@ class XPathExpr private $element; private $condition; - /** - * @param string $path - * @param string $element - * @param string $condition - * @param bool $starPrefix - */ - public function __construct($path = '', $element = '*', $condition = '', $starPrefix = false) + public function __construct(string $path = '', string $element = '*', string $condition = '', bool $starPrefix = false) { $this->path = $path; $this->element = $element; @@ -44,38 +38,24 @@ class XPathExpr } } - /** - * @return string - */ - public function getElement() + public function getElement(): string { return $this->element; } - /** - * @param $condition - * - * @return $this - */ - public function addCondition($condition) + public function addCondition(string $condition): self { - $this->condition = $this->condition ? sprintf('%s and (%s)', $this->condition, $condition) : $condition; + $this->condition = $this->condition ? sprintf('(%s) and (%s)', $this->condition, $condition) : $condition; return $this; } - /** - * @return string - */ - public function getCondition() + public function getCondition(): string { return $this->condition; } - /** - * @return $this - */ - public function addNameTest() + public function addNameTest(): self { if ('*' !== $this->element) { $this->addCondition('name() = '.Translator::getXpathLiteral($this->element)); @@ -85,10 +65,7 @@ class XPathExpr return $this; } - /** - * @return $this - */ - public function addStarPrefix() + public function addStarPrefix(): self { $this->path .= '*/'; @@ -98,12 +75,9 @@ class XPathExpr /** * Joins another XPathExpr with a combiner. * - * @param string $combiner - * @param XPathExpr $expr - * * @return $this */ - public function join($combiner, XPathExpr $expr) + public function join(string $combiner, self $expr): self { $path = $this->__toString().$combiner; @@ -118,10 +92,7 @@ class XPathExpr return $this; } - /** - * @return string - */ - public function __toString() + public function __toString(): string { $path = $this->path.$this->element; $condition = null === $this->condition || '' === $this->condition ? '' : '['.$this->condition.']'; diff --git a/vendor/symfony/css-selector/composer.json b/vendor/symfony/css-selector/composer.json index 56ab35b8..e2ed078e 100644 --- a/vendor/symfony/css-selector/composer.json +++ b/vendor/symfony/css-selector/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "autoload": { "psr-4": { "Symfony\\Component\\CssSelector\\": "" }, @@ -31,7 +31,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } } } diff --git a/vendor/symfony/debug/Debug.php b/vendor/symfony/debug/Debug.php index e3665ae5..aaa54118 100644 --- a/vendor/symfony/debug/Debug.php +++ b/vendor/symfony/debug/Debug.php @@ -45,7 +45,7 @@ class Debug error_reporting(E_ALL); } - if ('cli' !== PHP_SAPI) { + if (!\in_array(PHP_SAPI, array('cli', 'phpdbg'), true)) { ini_set('display_errors', 0); ExceptionHandler::register(); } elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) { diff --git a/vendor/symfony/debug/DebugClassLoader.php b/vendor/symfony/debug/DebugClassLoader.php index 78bfb853..33e715a8 100644 --- a/vendor/symfony/debug/DebugClassLoader.php +++ b/vendor/symfony/debug/DebugClassLoader.php @@ -141,7 +141,7 @@ class DebugClassLoader if ($this->isFinder && !isset($this->loaded[$class])) { $this->loaded[$class] = true; if ($file = $this->classLoader[0]->findFile($class) ?: false) { - $wasCached = \function_exists('opcache_is_script_cached') && opcache_is_script_cached($file); + $wasCached = \function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file); require $file; diff --git a/vendor/symfony/debug/ErrorHandler.php b/vendor/symfony/debug/ErrorHandler.php index 90e5535d..bed0e04a 100644 --- a/vendor/symfony/debug/ErrorHandler.php +++ b/vendor/symfony/debug/ErrorHandler.php @@ -136,9 +136,20 @@ class ErrorHandler } if (!$replace && $prev) { restore_error_handler(); + $handlerIsRegistered = is_array($prev) && $handler === $prev[0]; + } else { + $handlerIsRegistered = true; } - if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] === $handler) { + if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] instanceof self) { restore_exception_handler(); + if (!$handlerIsRegistered) { + $handler = $prev[0]; + } elseif ($handler !== $prev[0] && $replace) { + set_exception_handler(array($handler, 'handleException')); + $p = $prev[0]->setExceptionHandler(null); + $handler->setExceptionHandler($p); + $prev[0]->setExceptionHandler($p); + } } else { $handler->setExceptionHandler($prev); } @@ -372,14 +383,16 @@ class ErrorHandler public function handleError($type, $message, $file, $line) { // Level is the current error reporting level to manage silent error. + $level = error_reporting(); + $silenced = 0 === ($level & $type); // Strong errors are not authorized to be silenced. - $level = error_reporting() | E_RECOVERABLE_ERROR | E_USER_ERROR | E_DEPRECATED | E_USER_DEPRECATED; + $level |= E_RECOVERABLE_ERROR | E_USER_ERROR | E_DEPRECATED | E_USER_DEPRECATED; $log = $this->loggedErrors & $type; $throw = $this->thrownErrors & $type & $level; $type &= $level | $this->screamedErrors; if (!$type || (!$log && !$throw)) { - return $type && $log; + return !$silenced && $type && $log; } $scope = $this->scopedErrors & $type; @@ -513,7 +526,7 @@ class ErrorHandler } } - return $type && $log; + return !$silenced && $type && $log; } /** @@ -568,15 +581,16 @@ class ErrorHandler } } } + $exceptionHandler = $this->exceptionHandler; + $this->exceptionHandler = null; try { - if (null !== $this->exceptionHandler) { - return \call_user_func($this->exceptionHandler, $exception); + if (null !== $exceptionHandler) { + return \call_user_func($exceptionHandler, $exception); } $handlerException = $handlerException ?: $exception; } catch (\Exception $handlerException) { } catch (\Throwable $handlerException) { } - $this->exceptionHandler = null; if ($exception === $handlerException) { self::$reservedMemory = null; // Disable the fatal error handler throw $exception; // Give back $exception to the native handler diff --git a/vendor/symfony/debug/Exception/FatalThrowableError.php b/vendor/symfony/debug/Exception/FatalThrowableError.php index 34f43b17..fafc9226 100644 --- a/vendor/symfony/debug/Exception/FatalThrowableError.php +++ b/vendor/symfony/debug/Exception/FatalThrowableError.php @@ -36,7 +36,8 @@ class FatalThrowableError extends FatalErrorException $e->getCode(), $severity, $e->getFile(), - $e->getLine() + $e->getLine(), + $e->getPrevious() ); $this->setTrace($e->getTrace()); diff --git a/vendor/symfony/debug/Exception/FlattenException.php b/vendor/symfony/debug/Exception/FlattenException.php index 24679dca..f491bf2a 100644 --- a/vendor/symfony/debug/Exception/FlattenException.php +++ b/vendor/symfony/debug/Exception/FlattenException.php @@ -157,7 +157,7 @@ class FlattenException return $this->previous; } - public function setPrevious(FlattenException $previous) + public function setPrevious(self $previous) { $this->previous = $previous; } diff --git a/vendor/symfony/debug/ExceptionHandler.php b/vendor/symfony/debug/ExceptionHandler.php index 97470cb6..f22b70f6 100644 --- a/vendor/symfony/debug/ExceptionHandler.php +++ b/vendor/symfony/debug/ExceptionHandler.php @@ -40,7 +40,7 @@ class ExceptionHandler { $this->debug = $debug; $this->charset = $charset ?: ini_get('default_charset') ?: 'UTF-8'; - $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format'); + $this->fileLinkFormat = $fileLinkFormat; } /** @@ -355,13 +355,29 @@ EOF; private function formatPath($path, $line) { $file = $this->escapeHtml(preg_match('#[^/\\\\]*+$#', $path, $file) ? $file[0] : $path); - $fmt = $this->fileLinkFormat; + $fmt = $this->fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format'); - if ($fmt && $link = is_string($fmt) ? strtr($fmt, array('%f' => $path, '%l' => $line)) : $fmt->format($path, $line)) { - return sprintf('in %s (line %d)', $this->escapeHtml($link), $file, $line); + if (!$fmt) { + return sprintf('in %s%s', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : ''); } - return sprintf('in %s (line %d)', $this->escapeHtml($path), $file, $line); + if (\is_string($fmt)) { + $i = strpos($f = $fmt, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: strlen($f); + $fmt = array(substr($f, 0, $i)) + preg_split('/&([^>]++)>/', substr($f, $i), -1, PREG_SPLIT_DELIM_CAPTURE); + + for ($i = 1; isset($fmt[$i]); ++$i) { + if (0 === strpos($path, $k = $fmt[$i++])) { + $path = substr_replace($path, $fmt[$i], 0, strlen($k)); + break; + } + } + + $link = strtr($fmt[0], array('%f' => $path, '%l' => $line)); + } else { + $link = $fmt->format($path, $line); + } + + return sprintf('in %s%s', $this->escapeHtml($link), $file, 0 < $line ? ' line '.$line : ''); } /** diff --git a/vendor/symfony/debug/Tests/ErrorHandlerTest.php b/vendor/symfony/debug/Tests/ErrorHandlerTest.php index a57e83ee..b354e641 100644 --- a/vendor/symfony/debug/Tests/ErrorHandlerTest.php +++ b/vendor/symfony/debug/Tests/ErrorHandlerTest.php @@ -35,7 +35,7 @@ class ErrorHandlerTest extends TestCase $newHandler = new ErrorHandler(); - $this->assertSame($newHandler, ErrorHandler::register($newHandler, false)); + $this->assertSame($handler, ErrorHandler::register($newHandler, false)); $h = set_error_handler('var_dump'); restore_error_handler(); $this->assertSame(array($handler, 'handleError'), $h); @@ -65,6 +65,30 @@ class ErrorHandlerTest extends TestCase } } + public function testErrorGetLast() + { + $handler = ErrorHandler::register(); + $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); + $handler->setDefaultLogger($logger); + $handler->screamAt(E_ALL); + + try { + @trigger_error('Hello', E_USER_WARNING); + $expected = array( + 'type' => E_USER_WARNING, + 'message' => 'Hello', + 'file' => __FILE__, + 'line' => __LINE__ - 5, + ); + $this->assertSame($expected, error_get_last()); + } catch (\Exception $e) { + restore_error_handler(); + restore_exception_handler(); + + throw $e; + } + } + public function testNotice() { ErrorHandler::register(); @@ -545,4 +569,18 @@ class ErrorHandlerTest extends TestCase restore_exception_handler(); } } + + /** + * @expectedException \Exception + * @group no-hhvm + */ + public function testCustomExceptionHandler() + { + $handler = new ErrorHandler(); + $handler->setExceptionHandler(function ($e) use ($handler) { + $handler->handleException($e); + }); + + $handler->handleException(new \Exception()); + } } diff --git a/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php b/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php index 8fd1c795..66171e3a 100644 --- a/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php +++ b/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php @@ -111,7 +111,7 @@ class FlattenExceptionTest extends TestCase /** * @dataProvider flattenDataProvider */ - public function testFlattenHttpException(\Exception $exception, $statusCode) + public function testFlattenHttpException(\Exception $exception) { $flattened = FlattenException::create($exception); $flattened2 = FlattenException::create($exception); @@ -126,7 +126,7 @@ class FlattenExceptionTest extends TestCase /** * @dataProvider flattenDataProvider */ - public function testPrevious(\Exception $exception, $statusCode) + public function testPrevious(\Exception $exception) { $flattened = FlattenException::create($exception); $flattened2 = FlattenException::create($exception); @@ -173,7 +173,7 @@ class FlattenExceptionTest extends TestCase /** * @dataProvider flattenDataProvider */ - public function testToArray(\Exception $exception, $statusCode) + public function testToArray(\Exception $exception) { $flattened = FlattenException::create($exception); $flattened->setTrace(array(), 'foo.php', 123); @@ -193,7 +193,7 @@ class FlattenExceptionTest extends TestCase public function flattenDataProvider() { return array( - array(new \Exception('test', 123), 500), + array(new \Exception('test', 123)), ); } diff --git a/vendor/symfony/event-dispatcher/CHANGELOG.md b/vendor/symfony/event-dispatcher/CHANGELOG.md index c6aa5389..b581d314 100644 --- a/vendor/symfony/event-dispatcher/CHANGELOG.md +++ b/vendor/symfony/event-dispatcher/CHANGELOG.md @@ -1,6 +1,19 @@ CHANGELOG ========= +4.1.0 +----- + + * added support for invokable event listeners tagged with `kernel.event_listener` by default + * The `TraceableEventDispatcher::getOrphanedEvents()` method has been added. + * The `TraceableEventDispatcherInterface` has been deprecated. + +4.0.0 +----- + + * removed the `ContainerAwareEventDispatcher` class + * added the `reset()` method to the `TraceableEventDispatcherInterface` + 3.4.0 ----- diff --git a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php b/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php deleted file mode 100644 index 81a1ff7c..00000000 --- a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php +++ /dev/null @@ -1,197 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\EventDispatcher; - -use Symfony\Component\DependencyInjection\ContainerInterface; - -/** - * Lazily loads listeners and subscribers from the dependency injection - * container. - * - * @author Fabien Potencier - * @author Bernhard Schussek - * @author Jordan Alliot - * - * @deprecated since 3.3, to be removed in 4.0. Use EventDispatcher with closure factories instead. - */ -class ContainerAwareEventDispatcher extends EventDispatcher -{ - private $container; - - /** - * The service IDs of the event listeners and subscribers. - */ - private $listenerIds = array(); - - /** - * The services registered as listeners. - */ - private $listeners = array(); - - public function __construct(ContainerInterface $container) - { - $this->container = $container; - - $class = get_class($this); - if ($this instanceof \PHPUnit_Framework_MockObject_MockObject || $this instanceof \Prophecy\Doubler\DoubleInterface) { - $class = get_parent_class($class); - } - if (__CLASS__ !== $class) { - @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), E_USER_DEPRECATED); - } - } - - /** - * Adds a service as event listener. - * - * @param string $eventName Event for which the listener is added - * @param array $callback The service ID of the listener service & the method - * name that has to be called - * @param int $priority The higher this value, the earlier an event listener - * will be triggered in the chain. - * Defaults to 0. - * - * @throws \InvalidArgumentException - */ - public function addListenerService($eventName, $callback, $priority = 0) - { - @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), E_USER_DEPRECATED); - - if (!is_array($callback) || 2 !== count($callback)) { - throw new \InvalidArgumentException('Expected an array("service", "method") argument'); - } - - $this->listenerIds[$eventName][] = array($callback[0], $callback[1], $priority); - } - - public function removeListener($eventName, $listener) - { - $this->lazyLoad($eventName); - - if (isset($this->listenerIds[$eventName])) { - foreach ($this->listenerIds[$eventName] as $i => list($serviceId, $method)) { - $key = $serviceId.'.'.$method; - if (isset($this->listeners[$eventName][$key]) && $listener === array($this->listeners[$eventName][$key], $method)) { - unset($this->listeners[$eventName][$key]); - if (empty($this->listeners[$eventName])) { - unset($this->listeners[$eventName]); - } - unset($this->listenerIds[$eventName][$i]); - if (empty($this->listenerIds[$eventName])) { - unset($this->listenerIds[$eventName]); - } - } - } - } - - parent::removeListener($eventName, $listener); - } - - /** - * {@inheritdoc} - */ - public function hasListeners($eventName = null) - { - if (null === $eventName) { - return $this->listenerIds || $this->listeners || parent::hasListeners(); - } - - if (isset($this->listenerIds[$eventName])) { - return true; - } - - return parent::hasListeners($eventName); - } - - /** - * {@inheritdoc} - */ - public function getListeners($eventName = null) - { - if (null === $eventName) { - foreach ($this->listenerIds as $serviceEventName => $args) { - $this->lazyLoad($serviceEventName); - } - } else { - $this->lazyLoad($eventName); - } - - return parent::getListeners($eventName); - } - - /** - * {@inheritdoc} - */ - public function getListenerPriority($eventName, $listener) - { - $this->lazyLoad($eventName); - - return parent::getListenerPriority($eventName, $listener); - } - - /** - * Adds a service as event subscriber. - * - * @param string $serviceId The service ID of the subscriber service - * @param string $class The service's class name (which must implement EventSubscriberInterface) - */ - public function addSubscriberService($serviceId, $class) - { - @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), E_USER_DEPRECATED); - - foreach ($class::getSubscribedEvents() as $eventName => $params) { - if (is_string($params)) { - $this->listenerIds[$eventName][] = array($serviceId, $params, 0); - } elseif (is_string($params[0])) { - $this->listenerIds[$eventName][] = array($serviceId, $params[0], isset($params[1]) ? $params[1] : 0); - } else { - foreach ($params as $listener) { - $this->listenerIds[$eventName][] = array($serviceId, $listener[0], isset($listener[1]) ? $listener[1] : 0); - } - } - } - } - - public function getContainer() - { - @trigger_error('The '.__METHOD__.'() method is deprecated since Symfony 3.3 as its class will be removed in 4.0. Inject the container or the services you need in your listeners/subscribers instead.', E_USER_DEPRECATED); - - return $this->container; - } - - /** - * Lazily loads listeners for this event from the dependency injection - * container. - * - * @param string $eventName The name of the event to dispatch. The name of - * the event is the name of the method that is - * invoked on listeners. - */ - protected function lazyLoad($eventName) - { - if (isset($this->listenerIds[$eventName])) { - foreach ($this->listenerIds[$eventName] as list($serviceId, $method, $priority)) { - $listener = $this->container->get($serviceId); - - $key = $serviceId.'.'.$method; - if (!isset($this->listeners[$eventName][$key])) { - $this->addListener($eventName, array($listener, $method), $priority); - } elseif ($this->listeners[$eventName][$key] !== $listener) { - parent::removeListener($eventName, array($this->listeners[$eventName][$key], $method)); - $this->addListener($eventName, array($listener, $method), $priority); - } - - $this->listeners[$eventName][$key] = $listener; - } - } - } -} diff --git a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php index 9b5c689a..3b6e7cc3 100644 --- a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php +++ b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php @@ -32,6 +32,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface private $called; private $dispatcher; private $wrappedListeners; + private $orphanedEvents; public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null) { @@ -40,6 +41,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface $this->logger = $logger; $this->called = array(); $this->wrappedListeners = array(); + $this->orphanedEvents = array(); } /** @@ -207,6 +209,11 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface return $notCalled; } + public function getOrphanedEvents(): array + { + return $this->orphanedEvents; + } + public function reset() { $this->called = array(); @@ -247,6 +254,12 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface private function preProcess($eventName) { + if (!$this->dispatcher->hasListeners($eventName)) { + $this->orphanedEvents[] = $eventName; + + return; + } + foreach ($this->dispatcher->getListeners($eventName) as $listener) { $priority = $this->getListenerPriority($eventName, $listener); $wrappedListener = new WrappedListener($listener, null, $this->stopwatch, $this); diff --git a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php index f0212753..d716f191 100644 --- a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php +++ b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php @@ -14,9 +14,9 @@ namespace Symfony\Component\EventDispatcher\Debug; use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** - * @author Fabien Potencier + * @deprecated since Symfony 4.1 * - * @method reset() Resets the trace. + * @author Fabien Potencier */ interface TraceableEventDispatcherInterface extends EventDispatcherInterface { @@ -33,4 +33,9 @@ interface TraceableEventDispatcherInterface extends EventDispatcherInterface * @return array An array of not called listeners */ public function getNotCalledListeners(); + + /** + * Resets the trace. + */ + public function reset(); } diff --git a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php b/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php index 9f9c09c5..17a89e7f 100644 --- a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php +++ b/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php @@ -31,12 +31,7 @@ class RegisterListenersPass implements CompilerPassInterface private $hotPathEvents = array(); private $hotPathTagName; - /** - * @param string $dispatcherService Service name of the event dispatcher in processed container - * @param string $listenerTag Tag name used for listener - * @param string $subscriberTag Tag name used for subscribers - */ - public function __construct($dispatcherService = 'event_dispatcher', $listenerTag = 'kernel.event_listener', $subscriberTag = 'kernel.event_subscriber') + public function __construct(string $dispatcherService = 'event_dispatcher', string $listenerTag = 'kernel.event_listener', string $subscriberTag = 'kernel.event_subscriber') { $this->dispatcherService = $dispatcherService; $this->listenerTag = $listenerTag; @@ -73,6 +68,10 @@ class RegisterListenersPass implements CompilerPassInterface '/[^a-z0-9]/i', ), function ($matches) { return strtoupper($matches[0]); }, $event['event']); $event['method'] = preg_replace('/[^a-z0-9]/i', '', $event['method']); + + if (null !== ($class = $container->getDefinition($id)->getClass()) && ($r = $container->getReflectionClass($class, false)) && !$r->hasMethod($event['method']) && $r->hasMethod('__invoke')) { + $event['method'] = '__invoke'; + } } $definition->addMethodCall('addListener', array($event['event'], array(new ServiceClosureArgument(new Reference($id)), $event['method']), $priority)); @@ -89,17 +88,15 @@ class RegisterListenersPass implements CompilerPassInterface $def = $container->getDefinition($id); // We must assume that the class value has been correctly filled, even if the service is created by a factory - $class = $container->getParameterBag()->resolveValue($def->getClass()); - $interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface'; + $class = $def->getClass(); - if (!is_subclass_of($class, $interface)) { - if (!class_exists($class, false)) { - throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id)); - } - - throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface)); + if (!$r = $container->getReflectionClass($class)) { + throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id)); } - $container->addObjectResource($class); + if (!$r->isSubclassOf(EventSubscriberInterface::class)) { + throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, EventSubscriberInterface::class)); + } + $class = $r->name; ExtractingEventDispatcher::$subscriber = $class; $extractingDispatcher->addSubscriber($extractingDispatcher); diff --git a/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php index 9443f216..9997a7b0 100644 --- a/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php +++ b/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php @@ -158,7 +158,7 @@ abstract class AbstractEventDispatcherTest extends TestCase // be executed // Manually set priority to enforce $this->listener to be called first $this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'), 10); - $this->dispatcher->addListener('post.foo', array($otherListener, 'preFoo')); + $this->dispatcher->addListener('post.foo', array($otherListener, 'postFoo')); $this->dispatcher->dispatch(self::postFoo); $this->assertTrue($this->listener->postFooInvoked); $this->assertFalse($otherListener->postFooInvoked); diff --git a/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php deleted file mode 100644 index 9d5eecc5..00000000 --- a/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php +++ /dev/null @@ -1,210 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\EventDispatcher\Tests; - -use Symfony\Component\DependencyInjection\Container; -use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; - -/** - * @group legacy - */ -class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest -{ - protected function createEventDispatcher() - { - $container = new Container(); - - return new ContainerAwareEventDispatcher($container); - } - - public function testAddAListenerService() - { - $event = new Event(); - - $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock(); - - $service - ->expects($this->once()) - ->method('onEvent') - ->with($event) - ; - - $container = new Container(); - $container->set('service.listener', $service); - - $dispatcher = new ContainerAwareEventDispatcher($container); - $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent')); - - $dispatcher->dispatch('onEvent', $event); - } - - public function testAddASubscriberService() - { - $event = new Event(); - - $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\SubscriberService')->getMock(); - - $service - ->expects($this->once()) - ->method('onEvent') - ->with($event) - ; - - $service - ->expects($this->once()) - ->method('onEventWithPriority') - ->with($event) - ; - - $service - ->expects($this->once()) - ->method('onEventNested') - ->with($event) - ; - - $container = new Container(); - $container->set('service.subscriber', $service); - - $dispatcher = new ContainerAwareEventDispatcher($container); - $dispatcher->addSubscriberService('service.subscriber', 'Symfony\Component\EventDispatcher\Tests\SubscriberService'); - - $dispatcher->dispatch('onEvent', $event); - $dispatcher->dispatch('onEventWithPriority', $event); - $dispatcher->dispatch('onEventNested', $event); - } - - public function testPreventDuplicateListenerService() - { - $event = new Event(); - - $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock(); - - $service - ->expects($this->once()) - ->method('onEvent') - ->with($event) - ; - - $container = new Container(); - $container->set('service.listener', $service); - - $dispatcher = new ContainerAwareEventDispatcher($container); - $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'), 5); - $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'), 10); - - $dispatcher->dispatch('onEvent', $event); - } - - public function testHasListenersOnLazyLoad() - { - $event = new Event(); - - $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock(); - - $container = new Container(); - $container->set('service.listener', $service); - - $dispatcher = new ContainerAwareEventDispatcher($container); - $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent')); - - $service - ->expects($this->once()) - ->method('onEvent') - ->with($event) - ; - - $this->assertTrue($dispatcher->hasListeners()); - - if ($dispatcher->hasListeners('onEvent')) { - $dispatcher->dispatch('onEvent'); - } - } - - public function testGetListenersOnLazyLoad() - { - $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock(); - - $container = new Container(); - $container->set('service.listener', $service); - - $dispatcher = new ContainerAwareEventDispatcher($container); - $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent')); - - $listeners = $dispatcher->getListeners(); - - $this->assertArrayHasKey('onEvent', $listeners); - - $this->assertCount(1, $dispatcher->getListeners('onEvent')); - } - - public function testRemoveAfterDispatch() - { - $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock(); - - $container = new Container(); - $container->set('service.listener', $service); - - $dispatcher = new ContainerAwareEventDispatcher($container); - $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent')); - - $dispatcher->dispatch('onEvent', new Event()); - $dispatcher->removeListener('onEvent', array($container->get('service.listener'), 'onEvent')); - $this->assertFalse($dispatcher->hasListeners('onEvent')); - } - - public function testRemoveBeforeDispatch() - { - $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock(); - - $container = new Container(); - $container->set('service.listener', $service); - - $dispatcher = new ContainerAwareEventDispatcher($container); - $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent')); - - $dispatcher->removeListener('onEvent', array($container->get('service.listener'), 'onEvent')); - $this->assertFalse($dispatcher->hasListeners('onEvent')); - } -} - -class Service -{ - public function onEvent(Event $e) - { - } -} - -class SubscriberService implements EventSubscriberInterface -{ - public static function getSubscribedEvents() - { - return array( - 'onEvent' => 'onEvent', - 'onEventWithPriority' => array('onEventWithPriority', 10), - 'onEventNested' => array(array('onEventNested')), - ); - } - - public function onEvent(Event $e) - { - } - - public function onEventWithPriority(Event $e) - { - } - - public function onEventNested(Event $e) - { - } -} diff --git a/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php index 53a3421a..2521f741 100644 --- a/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php +++ b/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php @@ -153,6 +153,31 @@ class TraceableEventDispatcherTest extends TestCase $this->assertCount(2, $dispatcher->getCalledListeners()); } + public function testItReturnsNoOrphanedEventsWhenCreated() + { + $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch()); + $events = $tdispatcher->getOrphanedEvents(); + $this->assertEmpty($events); + } + + public function testItReturnsOrphanedEventsAfterDispatch() + { + $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch()); + $tdispatcher->dispatch('foo'); + $events = $tdispatcher->getOrphanedEvents(); + $this->assertCount(1, $events); + $this->assertEquals(array('foo'), $events); + } + + public function testItDoesNotReturnHandledEvents() + { + $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch()); + $tdispatcher->addListener('foo', function () {}); + $tdispatcher->dispatch('foo'); + $events = $tdispatcher->getOrphanedEvents(); + $this->assertEmpty($events); + } + public function testLogger() { $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); diff --git a/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php index dbb1aa5c..a359bd7e 100644 --- a/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php +++ b/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php @@ -27,29 +27,10 @@ class RegisterListenersPassTest extends TestCase */ public function testEventSubscriberWithoutInterface() { - // one service, not implementing any interface - $services = array( - 'my_event_subscriber' => array(0 => array()), - ); - - $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock(); - $definition->expects($this->atLeastOnce()) - ->method('getClass') - ->will($this->returnValue('stdClass')); - - $builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock(); - $builder->expects($this->any()) - ->method('hasDefinition') - ->will($this->returnValue(true)); - - // We don't test kernel.event_listener here - $builder->expects($this->atLeastOnce()) - ->method('findTaggedServiceIds') - ->will($this->onConsecutiveCalls(array(), $services)); - - $builder->expects($this->atLeastOnce()) - ->method('getDefinition') - ->will($this->returnValue($definition)); + $builder = new ContainerBuilder(); + $builder->register('event_dispatcher'); + $builder->register('my_event_subscriber', 'stdClass') + ->addTag('kernel.event_subscriber'); $registerListenersPass = new RegisterListenersPass(); $registerListenersPass->process($builder); @@ -61,31 +42,25 @@ class RegisterListenersPassTest extends TestCase 'my_event_subscriber' => array(0 => array()), ); - $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock(); - $definition->expects($this->atLeastOnce()) - ->method('getClass') - ->will($this->returnValue('Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService')); - - $builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition', 'findDefinition'))->getMock(); - $builder->expects($this->any()) - ->method('hasDefinition') - ->will($this->returnValue(true)); - - // We don't test kernel.event_listener here - $builder->expects($this->atLeastOnce()) - ->method('findTaggedServiceIds') - ->will($this->onConsecutiveCalls(array(), $services)); - - $builder->expects($this->atLeastOnce()) - ->method('getDefinition') - ->will($this->returnValue($definition)); - - $builder->expects($this->atLeastOnce()) - ->method('findDefinition') - ->will($this->returnValue($definition)); + $builder = new ContainerBuilder(); + $eventDispatcherDefinition = $builder->register('event_dispatcher'); + $builder->register('my_event_subscriber', 'Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService') + ->addTag('kernel.event_subscriber'); $registerListenersPass = new RegisterListenersPass(); $registerListenersPass->process($builder); + + $expectedCalls = array( + array( + 'addListener', + array( + 'event', + array(new ServiceClosureArgument(new Reference('my_event_subscriber')), 'onEvent'), + 0, + ), + ), + ); + $this->assertEquals($expectedCalls, $eventDispatcherDefinition->getMethodCalls()); } /** @@ -166,6 +141,47 @@ class RegisterListenersPassTest extends TestCase $registerListenersPass = new RegisterListenersPass(); $registerListenersPass->process($container); } + + public function testInvokableEventListener() + { + $container = new ContainerBuilder(); + $container->register('foo', \stdClass::class)->addTag('kernel.event_listener', array('event' => 'foo.bar')); + $container->register('bar', InvokableListenerService::class)->addTag('kernel.event_listener', array('event' => 'foo.bar')); + $container->register('baz', InvokableListenerService::class)->addTag('kernel.event_listener', array('event' => 'event')); + $container->register('event_dispatcher', \stdClass::class); + + $registerListenersPass = new RegisterListenersPass(); + $registerListenersPass->process($container); + + $definition = $container->getDefinition('event_dispatcher'); + $expectedCalls = array( + array( + 'addListener', + array( + 'foo.bar', + array(new ServiceClosureArgument(new Reference('foo')), 'onFooBar'), + 0, + ), + ), + array( + 'addListener', + array( + 'foo.bar', + array(new ServiceClosureArgument(new Reference('bar')), '__invoke'), + 0, + ), + ), + array( + 'addListener', + array( + 'event', + array(new ServiceClosureArgument(new Reference('baz')), 'onEvent'), + 0, + ), + ), + ); + $this->assertEquals($expectedCalls, $definition->getMethodCalls()); + } } class SubscriberService implements \Symfony\Component\EventDispatcher\EventSubscriberInterface @@ -177,3 +193,14 @@ class SubscriberService implements \Symfony\Component\EventDispatcher\EventSubsc ); } } + +class InvokableListenerService +{ + public function __invoke() + { + } + + public function onEvent() + { + } +} diff --git a/vendor/symfony/event-dispatcher/composer.json b/vendor/symfony/event-dispatcher/composer.json index 75b881b9..12ee5327 100644 --- a/vendor/symfony/event-dispatcher/composer.json +++ b/vendor/symfony/event-dispatcher/composer.json @@ -16,17 +16,17 @@ } ], "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "require-dev": { - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/config": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0", "psr/log": "~1.0" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4" }, "suggest": { "symfony/dependency-injection": "", @@ -41,7 +41,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } } } diff --git a/vendor/symfony/finder/Finder.php b/vendor/symfony/finder/Finder.php index 07dce771..278b9841 100644 --- a/vendor/symfony/finder/Finder.php +++ b/vendor/symfony/finder/Finder.php @@ -297,6 +297,10 @@ class Finder implements \IteratorAggregate, \Countable /** * Excludes directories. * + * Directories passed as argument must be relative to the ones defined with the `in()` method. For example: + * + * $finder->in(__DIR__)->exclude('ruby'); + * * @param string|array $dirs A directory path or an array of directories * * @return $this @@ -313,6 +317,8 @@ class Finder implements \IteratorAggregate, \Countable /** * Excludes "hidden" directories and files (starting with a dot). * + * This option is enabled by default. + * * @param bool $ignoreDotFiles Whether to exclude "hidden" files or not * * @return $this @@ -333,6 +339,8 @@ class Finder implements \IteratorAggregate, \Countable /** * Forces the finder to ignore version control directories. * + * This option is enabled by default. + * * @param bool $ignoreVCS Whether to exclude VCS files or not * * @return $this @@ -532,9 +540,9 @@ class Finder implements \IteratorAggregate, \Countable foreach ((array) $dirs as $dir) { if (is_dir($dir)) { - $resolvedDirs[] = $dir; + $resolvedDirs[] = $this->normalizeDir($dir); } elseif ($glob = glob($dir, (defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR)) { - $resolvedDirs = array_merge($resolvedDirs, $glob); + $resolvedDirs = array_merge($resolvedDirs, array_map(array($this, 'normalizeDir'), $glob)); } else { throw new \InvalidArgumentException(sprintf('The "%s" directory does not exist.', $dir)); } @@ -720,4 +728,16 @@ class Finder implements \IteratorAggregate, \Countable return $iterator; } + + /** + * Normalizes given directory names by removing trailing slashes. + * + * @param string $dir + * + * @return string + */ + private function normalizeDir($dir) + { + return rtrim($dir, '/'.\DIRECTORY_SEPARATOR); + } } diff --git a/vendor/symfony/finder/SplFileInfo.php b/vendor/symfony/finder/SplFileInfo.php index 19f95e26..0f4e025b 100644 --- a/vendor/symfony/finder/SplFileInfo.php +++ b/vendor/symfony/finder/SplFileInfo.php @@ -66,12 +66,11 @@ class SplFileInfo extends \SplFileInfo */ public function getContents() { - $level = error_reporting(0); + set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; }); $content = file_get_contents($this->getPathname()); - error_reporting($level); + restore_error_handler(); if (false === $content) { - $error = error_get_last(); - throw new \RuntimeException($error['message']); + throw new \RuntimeException($error); } return $content; diff --git a/vendor/symfony/finder/Tests/FinderTest.php b/vendor/symfony/finder/Tests/FinderTest.php index 7e75f141..c7908fa8 100644 --- a/vendor/symfony/finder/Tests/FinderTest.php +++ b/vendor/symfony/finder/Tests/FinderTest.php @@ -46,6 +46,45 @@ class FinderTest extends Iterator\RealIteratorTestCase $this->assertIterator($this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar')), $finder->in(self::$tmpDir)->getIterator()); } + public function testRemoveTrailingSlash() + { + $finder = $this->buildFinder(); + + $expected = $this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar')); + $in = self::$tmpDir.'//'; + + $this->assertIterator($expected, $finder->in($in)->files()->getIterator()); + } + + public function testSymlinksNotResolved() + { + if ('\\' === DIRECTORY_SEPARATOR) { + $this->markTestSkipped('symlinks are not supported on Windows'); + } + + $finder = $this->buildFinder(); + + symlink($this->toAbsolute('foo'), $this->toAbsolute('baz')); + $expected = $this->toAbsolute(array('baz/bar.tmp')); + $in = self::$tmpDir.'/baz/'; + try { + $this->assertIterator($expected, $finder->in($in)->files()->getIterator()); + unlink($this->toAbsolute('baz')); + } catch (\Exception $e) { + unlink($this->toAbsolute('baz')); + throw $e; + } + } + + public function testBackPathNotNormalized() + { + $finder = $this->buildFinder(); + + $expected = $this->toAbsolute(array('foo/../foo/bar.tmp')); + $in = self::$tmpDir.'/foo/../foo/'; + $this->assertIterator($expected, $finder->in($in)->files()->getIterator()); + } + public function testDepth() { $finder = $this->buildFinder(); @@ -261,7 +300,7 @@ class FinderTest extends Iterator\RealIteratorTestCase public function testInWithGlob() { $finder = $this->buildFinder(); - $finder->in(array(__DIR__.'/Fixtures/*/B/C', __DIR__.'/Fixtures/*/*/B/C'))->getIterator(); + $finder->in(array(__DIR__.'/Fixtures/*/B/C/', __DIR__.'/Fixtures/*/*/B/C/'))->getIterator(); $this->assertIterator($this->toAbsoluteFixtures(array('A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy')), $finder); } diff --git a/vendor/symfony/http-foundation/Cookie.php b/vendor/symfony/http-foundation/Cookie.php index 4519a6ad..d202dc6c 100644 --- a/vendor/symfony/http-foundation/Cookie.php +++ b/vendor/symfony/http-foundation/Cookie.php @@ -145,12 +145,12 @@ class Cookie $str = ($this->isRaw() ? $this->getName() : urlencode($this->getName())).'='; if ('' === (string) $this->getValue()) { - $str .= 'deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; max-age=-31536001'; + $str .= 'deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0'; } else { $str .= $this->isRaw() ? $this->getValue() : rawurlencode($this->getValue()); if (0 !== $this->getExpiresTime()) { - $str .= '; expires='.gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime()).'; max-age='.$this->getMaxAge(); + $str .= '; expires='.gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime()).'; Max-Age='.$this->getMaxAge(); } } @@ -224,7 +224,9 @@ class Cookie */ public function getMaxAge() { - return 0 !== $this->expire ? $this->expire - time() : 0; + $maxAge = $this->expire - time(); + + return 0 >= $maxAge ? 0 : $maxAge; } /** diff --git a/vendor/symfony/http-foundation/File/File.php b/vendor/symfony/http-foundation/File/File.php index e2a67684..65ece983 100644 --- a/vendor/symfony/http-foundation/File/File.php +++ b/vendor/symfony/http-foundation/File/File.php @@ -93,9 +93,11 @@ class File extends \SplFileInfo { $target = $this->getTargetFile($directory, $name); - if (!@rename($this->getPathname(), $target)) { - $error = error_get_last(); - throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error['message']))); + set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; }); + $renamed = rename($this->getPathname(), $target); + restore_error_handler(); + if (!$renamed) { + throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error))); } @chmod($target, 0666 & ~umask()); diff --git a/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php index c2ac6768..3c358104 100644 --- a/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php +++ b/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php @@ -43,7 +43,21 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface */ public static function isSupported() { - return '\\' !== DIRECTORY_SEPARATOR && function_exists('passthru') && function_exists('escapeshellarg'); + static $supported = null; + + if (null !== $supported) { + return $supported; + } + + if ('\\' === DIRECTORY_SEPARATOR || !function_exists('passthru') || !function_exists('escapeshellarg')) { + return $supported = false; + } + + ob_start(); + passthru('command -v file', $exitStatus); + $binPath = trim(ob_get_clean()); + + return $supported = 0 === $exitStatus && '' !== $binPath; } /** diff --git a/vendor/symfony/http-foundation/File/MimeType/MimeTypeExtensionGuesser.php b/vendor/symfony/http-foundation/File/MimeType/MimeTypeExtensionGuesser.php index 896c135a..77bf51b1 100644 --- a/vendor/symfony/http-foundation/File/MimeType/MimeTypeExtensionGuesser.php +++ b/vendor/symfony/http-foundation/File/MimeType/MimeTypeExtensionGuesser.php @@ -599,6 +599,7 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface 'application/x-xliff+xml' => 'xlf', 'application/x-xpinstall' => 'xpi', 'application/x-xz' => 'xz', + 'application/x-zip-compressed' => 'zip', 'application/x-zmachine' => 'z1', 'application/xaml+xml' => 'xaml', 'application/xcap-diff+xml' => 'xdf', diff --git a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php index e3ef45ef..d78c7606 100644 --- a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php +++ b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php @@ -80,13 +80,8 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface */ private function __construct() { - if (FileBinaryMimeTypeGuesser::isSupported()) { - $this->register(new FileBinaryMimeTypeGuesser()); - } - - if (FileinfoMimeTypeGuesser::isSupported()) { - $this->register(new FileinfoMimeTypeGuesser()); - } + $this->register(new FileBinaryMimeTypeGuesser()); + $this->register(new FileinfoMimeTypeGuesser()); } /** @@ -125,18 +120,14 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface throw new AccessDeniedException($path); } - if (!$this->guessers) { - $msg = 'Unable to guess the mime type as no guessers are available'; - if (!FileinfoMimeTypeGuesser::isSupported()) { - $msg .= ' (Did you enable the php_fileinfo extension?)'; - } - throw new \LogicException($msg); - } - foreach ($this->guessers as $guesser) { if (null !== $mimeType = $guesser->guess($path)) { return $mimeType; } } + + if (2 === \count($this->guessers) && !FileBinaryMimeTypeGuesser::isSupported() && !FileinfoMimeTypeGuesser::isSupported()) { + throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?)'); + } } } diff --git a/vendor/symfony/http-foundation/File/UploadedFile.php b/vendor/symfony/http-foundation/File/UploadedFile.php index 082d8d53..39b29775 100644 --- a/vendor/symfony/http-foundation/File/UploadedFile.php +++ b/vendor/symfony/http-foundation/File/UploadedFile.php @@ -192,9 +192,11 @@ class UploadedFile extends File $target = $this->getTargetFile($directory, $name); - if (!@move_uploaded_file($this->getPathname(), $target)) { - $error = error_get_last(); - throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error['message']))); + set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; }); + $moved = move_uploaded_file($this->getPathname(), $target); + restore_error_handler(); + if (!$moved) { + throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error))); } @chmod($target, 0666 & ~umask()); diff --git a/vendor/symfony/http-foundation/Request.php b/vendor/symfony/http-foundation/Request.php index be55069e..da17df90 100644 --- a/vendor/symfony/http-foundation/Request.php +++ b/vendor/symfony/http-foundation/Request.php @@ -144,7 +144,7 @@ class Request public $headers; /** - * @var string|resource + * @var string|resource|false|null */ protected $content; @@ -242,13 +242,13 @@ class Request ); /** - * @param array $query The GET parameters - * @param array $request The POST parameters - * @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...) - * @param array $cookies The COOKIE parameters - * @param array $files The FILES parameters - * @param array $server The SERVER parameters - * @param string|resource $content The raw body data + * @param array $query The GET parameters + * @param array $request The POST parameters + * @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...) + * @param array $cookies The COOKIE parameters + * @param array $files The FILES parameters + * @param array $server The SERVER parameters + * @param string|resource|null $content The raw body data */ public function __construct(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null) { @@ -260,13 +260,13 @@ class Request * * This method also re-initializes all properties. * - * @param array $query The GET parameters - * @param array $request The POST parameters - * @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...) - * @param array $cookies The COOKIE parameters - * @param array $files The FILES parameters - * @param array $server The SERVER parameters - * @param string|resource $content The raw body data + * @param array $query The GET parameters + * @param array $request The POST parameters + * @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...) + * @param array $cookies The COOKIE parameters + * @param array $files The FILES parameters + * @param array $server The SERVER parameters + * @param string|resource|null $content The raw body data */ public function initialize(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null) { @@ -329,13 +329,13 @@ class Request * The information contained in the URI always take precedence * over the other information (server and parameters). * - * @param string $uri The URI - * @param string $method The HTTP method - * @param array $parameters The query (GET) or request (POST) parameters - * @param array $cookies The request cookies ($_COOKIE) - * @param array $files The request files ($_FILES) - * @param array $server The server parameters ($_SERVER) - * @param string|resource $content The raw body data + * @param string $uri The URI + * @param string $method The HTTP method + * @param array $parameters The query (GET) or request (POST) parameters + * @param array $cookies The request cookies ($_COOKIE) + * @param array $files The request files ($_FILES) + * @param array $server The server parameters ($_SERVER) + * @param string|resource|null $content The raw body data * * @return static */ @@ -557,7 +557,7 @@ class Request */ public function overrideGlobals() { - $this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), null, '&'))); + $this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), '', '&'))); $_GET = $this->query->all(); $_POST = $this->request->all(); @@ -641,7 +641,7 @@ class Request public static function setTrustedHosts(array $hostPatterns) { self::$trustedHostPatterns = array_map(function ($hostPattern) { - return sprintf('#%s#i', $hostPattern); + return sprintf('{%s}i', $hostPattern); }, $hostPatterns); // we need to reset trusted hosts on trusted host patterns change self::$trustedHosts = array(); @@ -1378,7 +1378,7 @@ class Request * * @param string $format The format * - * @return string The associated mime type (null if not found) + * @return string|null The associated mime type (null if not found) */ public function getMimeType($format) { diff --git a/vendor/symfony/http-foundation/Response.php b/vendor/symfony/http-foundation/Response.php index cf1325af..e05194b0 100644 --- a/vendor/symfony/http-foundation/Response.php +++ b/vendor/symfony/http-foundation/Response.php @@ -21,6 +21,7 @@ class Response const HTTP_CONTINUE = 100; const HTTP_SWITCHING_PROTOCOLS = 101; const HTTP_PROCESSING = 102; // RFC2518 + const HTTP_EARLY_HINTS = 103; // RFC8297 const HTTP_OK = 200; const HTTP_CREATED = 201; const HTTP_ACCEPTED = 202; @@ -327,7 +328,7 @@ class Response } // headers - foreach ($this->headers->allPreserveCaseWithoutCookies() as $name => $values) { + foreach ($this->headers->allPreserveCase() as $name => $values) { foreach ($values as $value) { header($name.': '.$value, false, $this->statusCode); } @@ -336,15 +337,6 @@ class Response // status header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode); - // cookies - foreach ($this->headers->getCookies() as $cookie) { - if ($cookie->isRaw()) { - setrawcookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly()); - } else { - setcookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly()); - } - } - return $this; } @@ -372,7 +364,7 @@ class Response if (function_exists('fastcgi_finish_request')) { fastcgi_finish_request(); - } elseif ('cli' !== PHP_SAPI) { + } elseif (!\in_array(PHP_SAPI, array('cli', 'phpdbg'), true)) { static::closeOutputBuffers(0, true); } @@ -519,13 +511,19 @@ class Response } /** - * Returns true if the response is worth caching under any circumstance. + * Returns true if the response may safely be kept in a shared (surrogate) cache. * * Responses marked "private" with an explicit Cache-Control directive are * considered uncacheable. * * Responses with neither a freshness lifetime (Expires, max-age) nor cache - * validator (Last-Modified, ETag) are considered uncacheable. + * validator (Last-Modified, ETag) are considered uncacheable because there is + * no way to tell when or how to remove them from the cache. + * + * Note that RFC 7231 and RFC 7234 possibly allow for a more permissive implementation, + * for example "status codes that are defined as cacheable by default [...] + * can be reused by a cache with heuristic expiration unless otherwise indicated" + * (https://tools.ietf.org/html/rfc7231#section-6.1) * * @return bool true if the response is worth caching, false otherwise * diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php index 9f4ef702..dd37eae1 100644 --- a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php +++ b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php @@ -80,7 +80,9 @@ class MemcachedSessionHandler extends AbstractSessionHandler */ public function updateTimestamp($sessionId, $data) { - return $this->memcached->touch($this->prefix.$sessionId, time() + $this->ttl); + $this->memcached->touch($this->prefix.$sessionId, time() + $this->ttl); + + return true; } /** diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php index 2e1692b6..37ec7571 100644 --- a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php +++ b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php @@ -164,7 +164,7 @@ class PdoSessionHandler extends AbstractSessionHandler * * db_connection_options: An array of driver-specific connection options [default: array()] * * lock_mode: The strategy for locking, see constants [default: LOCK_TRANSACTIONAL] * - * @param \PDO|string|null $pdoOrDsn A \PDO instance or DSN string or null + * @param \PDO|string|null $pdoOrDsn A \PDO instance or DSN string or URL string or null * @param array $options An associative array of options * * @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION @@ -178,6 +178,8 @@ class PdoSessionHandler extends AbstractSessionHandler $this->pdo = $pdoOrDsn; $this->driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME); + } elseif (is_string($pdoOrDsn) && false !== strpos($pdoOrDsn, '://')) { + $this->dsn = $this->buildDsnFromUrl($pdoOrDsn); } else { $this->dsn = $pdoOrDsn; } @@ -431,6 +433,102 @@ class PdoSessionHandler extends AbstractSessionHandler $this->driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME); } + /** + * Builds a PDO DSN from a URL-like connection string. + * + * @param string $dsnOrUrl + * + * @return string + * + * @todo implement missing support for oci DSN (which look totally different from other PDO ones) + */ + private function buildDsnFromUrl($dsnOrUrl) + { + // (pdo_)?sqlite3?:///... => (pdo_)?sqlite3?://localhost/... or else the URL will be invalid + $url = preg_replace('#^((?:pdo_)?sqlite3?):///#', '$1://localhost/', $dsnOrUrl); + + $params = parse_url($url); + + if (false === $params) { + return $dsnOrUrl; // If the URL is not valid, let's assume it might be a DSN already. + } + + $params = array_map('rawurldecode', $params); + + // Override the default username and password. Values passed through options will still win over these in the constructor. + if (isset($params['user'])) { + $this->username = $params['user']; + } + + if (isset($params['pass'])) { + $this->password = $params['pass']; + } + + if (!isset($params['scheme'])) { + throw new \InvalidArgumentException('URLs without scheme are not supported to configure the PdoSessionHandler'); + } + + $driverAliasMap = array( + 'mssql' => 'sqlsrv', + 'mysql2' => 'mysql', // Amazon RDS, for some weird reason + 'postgres' => 'pgsql', + 'postgresql' => 'pgsql', + 'sqlite3' => 'sqlite', + ); + + $driver = isset($driverAliasMap[$params['scheme']]) ? $driverAliasMap[$params['scheme']] : $params['scheme']; + + // Doctrine DBAL supports passing its internal pdo_* driver names directly too (allowing both dashes and underscores). This allows supporting the same here. + if (0 === strpos($driver, 'pdo_') || 0 === strpos($driver, 'pdo-')) { + $driver = substr($driver, 4); + } + + switch ($driver) { + case 'mysql': + case 'pgsql': + $dsn = $driver.':'; + + if (isset($params['host']) && '' !== $params['host']) { + $dsn .= 'host='.$params['host'].';'; + } + + if (isset($params['port']) && '' !== $params['port']) { + $dsn .= 'port='.$params['port'].';'; + } + + if (isset($params['path'])) { + $dbName = substr($params['path'], 1); // Remove the leading slash + $dsn .= 'dbname='.$dbName.';'; + } + + return $dsn; + + case 'sqlite': + return 'sqlite:'.substr($params['path'], 1); + + case 'sqlsrv': + $dsn = 'sqlsrv:server='; + + if (isset($params['host'])) { + $dsn .= $params['host']; + } + + if (isset($params['port']) && '' !== $params['port']) { + $dsn .= ','.$params['port']; + } + + if (isset($params['path'])) { + $dbName = substr($params['path'], 1); // Remove the leading slash + $dsn .= ';Database='.$dbName; + } + + return $dsn; + + default: + throw new \InvalidArgumentException(sprintf('The scheme "%s" is not supported by the PdoSessionHandler URL configuration. Pass a PDO DSN directly.', $params['scheme'])); + } + } + /** * Helper method to begin a transaction. * @@ -518,6 +616,7 @@ class PdoSessionHandler extends AbstractSessionHandler $selectSql = $this->getSelectSql(); $selectStmt = $this->pdo->prepare($selectSql); $selectStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR); + $insertStmt = null; do { $selectStmt->execute(); @@ -533,6 +632,11 @@ class PdoSessionHandler extends AbstractSessionHandler return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0]; } + if (null !== $insertStmt) { + $this->rollback(); + throw new \RuntimeException('Failed to read session: INSERT reported a duplicate id but next SELECT did not return any data.'); + } + if (!ini_get('session.use_strict_mode') && self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) { // In strict mode, session fixation is not possible: new sessions always start with a unique // random id, so that concurrency is not possible and this code path can be skipped. @@ -578,14 +682,16 @@ class PdoSessionHandler extends AbstractSessionHandler { switch ($this->driver) { case 'mysql': + // MySQL 5.7.5 and later enforces a maximum length on lock names of 64 characters. Previously, no limit was enforced. + $lockId = \substr($sessionId, 0, 64); // should we handle the return value? 0 on timeout, null on error // we use a timeout of 50 seconds which is also the default for innodb_lock_wait_timeout $stmt = $this->pdo->prepare('SELECT GET_LOCK(:key, 50)'); - $stmt->bindValue(':key', $sessionId, \PDO::PARAM_STR); + $stmt->bindValue(':key', $lockId, \PDO::PARAM_STR); $stmt->execute(); $releaseStmt = $this->pdo->prepare('DO RELEASE_LOCK(:key)'); - $releaseStmt->bindValue(':key', $sessionId, \PDO::PARAM_STR); + $releaseStmt->bindValue(':key', $lockId, \PDO::PARAM_STR); return $releaseStmt; case 'pgsql': diff --git a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php index 0dfad9ac..6416a03f 100644 --- a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php +++ b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php @@ -349,7 +349,7 @@ class NativeSessionStorage implements SessionStorageInterface } $validOptions = array_flip(array( - 'cache_limiter', 'cache_expire', 'cookie_domain', 'cookie_httponly', + 'cache_expire', 'cache_limiter', 'cookie_domain', 'cookie_httponly', 'cookie_lifetime', 'cookie_path', 'cookie_secure', 'entropy_file', 'entropy_length', 'gc_divisor', 'gc_maxlifetime', 'gc_probability', 'hash_bits_per_character', @@ -357,13 +357,13 @@ class NativeSessionStorage implements SessionStorageInterface 'serialize_handler', 'use_strict_mode', 'use_cookies', 'use_only_cookies', 'use_trans_sid', 'upload_progress.enabled', 'upload_progress.cleanup', 'upload_progress.prefix', 'upload_progress.name', - 'upload_progress.freq', 'upload_progress.min-freq', 'url_rewriter.tags', + 'upload_progress.freq', 'upload_progress.min_freq', 'url_rewriter.tags', 'sid_length', 'sid_bits_per_character', 'trans_sid_hosts', 'trans_sid_tags', )); foreach ($options as $key => $value) { if (isset($validOptions[$key])) { - ini_set('session.'.$key, $value); + ini_set('url_rewriter.tags' !== $key ? 'session.'.$key : $key, $value); } } } diff --git a/vendor/symfony/http-foundation/Tests/CookieTest.php b/vendor/symfony/http-foundation/Tests/CookieTest.php index 070b7dd4..a47b71e1 100644 --- a/vendor/symfony/http-foundation/Tests/CookieTest.php +++ b/vendor/symfony/http-foundation/Tests/CookieTest.php @@ -162,13 +162,13 @@ class CookieTest extends TestCase public function testToString() { $cookie = new Cookie('foo', 'bar', $expire = strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true); - $this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; max-age='.($expire - time()).'; path=/; domain=.myfoodomain.com; secure; httponly', (string) $cookie, '->__toString() returns string representation of the cookie'); + $this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; Max-Age=0; path=/; domain=.myfoodomain.com; secure; httponly', (string) $cookie, '->__toString() returns string representation of the cookie'); $cookie = new Cookie('foo', 'bar with white spaces', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true); - $this->assertEquals('foo=bar%20with%20white%20spaces; expires=Fri, 20-May-2011 15:25:52 GMT; max-age='.($expire - time()).'; path=/; domain=.myfoodomain.com; secure; httponly', (string) $cookie, '->__toString() encodes the value of the cookie according to RFC 3986 (white space = %20)'); + $this->assertEquals('foo=bar%20with%20white%20spaces; expires=Fri, 20-May-2011 15:25:52 GMT; Max-Age=0; path=/; domain=.myfoodomain.com; secure; httponly', (string) $cookie, '->__toString() encodes the value of the cookie according to RFC 3986 (white space = %20)'); $cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com'); - $this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', $expire = time() - 31536001).'; max-age='.($expire - time()).'; path=/admin/; domain=.myfoodomain.com; httponly', (string) $cookie, '->__toString() returns string representation of a cleared cookie if value is NULL'); + $this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', $expire = time() - 31536001).'; Max-Age=0; path=/admin/; domain=.myfoodomain.com; httponly', (string) $cookie, '->__toString() returns string representation of a cleared cookie if value is NULL'); $cookie = new Cookie('foo', 'bar', 0, '/', ''); $this->assertEquals('foo=bar; path=/; httponly', (string) $cookie); @@ -194,7 +194,7 @@ class CookieTest extends TestCase $this->assertEquals($expire - time(), $cookie->getMaxAge()); $cookie = new Cookie('foo', 'bar', $expire = time() - 100); - $this->assertEquals($expire - time(), $cookie->getMaxAge()); + $this->assertEquals(0, $cookie->getMaxAge()); } public function testFromString() diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc new file mode 100644 index 00000000..ba101d35 --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc @@ -0,0 +1,39 @@ +headers->set('Date', 'Sat, 12 Nov 1955 20:04:00 GMT'); + +return $r; diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.expected b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.expected new file mode 100644 index 00000000..bdb9d023 --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.expected @@ -0,0 +1,11 @@ + +Warning: Expiry date cannot have a year greater than 9999 in %scookie_max_age.php on line 10 + +Array +( + [0] => Content-Type: text/plain; charset=utf-8 + [1] => Cache-Control: no-cache, private + [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT + [3] => Set-Cookie: foo=bar; expires=Sat, 01-Jan-10000 02:46:40 GMT; Max-Age=%d; path=/ +) +shutdown diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.php b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.php new file mode 100644 index 00000000..8775a5cc --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.php @@ -0,0 +1,10 @@ +headers->setCookie(new Cookie('foo', 'bar', 253402310800, '', null, false, false)); +$r->sendHeaders(); + +setcookie('foo2', 'bar', 253402310800, '/'); diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.expected b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.expected new file mode 100644 index 00000000..0c097972 --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.expected @@ -0,0 +1,10 @@ + +Array +( + [0] => Content-Type: text/plain; charset=utf-8 + [1] => Cache-Control: no-cache, private + [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT + [3] => Set-Cookie: ?*():@&+$/%#[]=?*():@&+$/%#[]; path=/ + [4] => Set-Cookie: ?*():@&+$/%#[]=?*():@&+$/%#[]; path=/ +) +shutdown diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.php b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.php new file mode 100644 index 00000000..2ca5b59f --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.php @@ -0,0 +1,12 @@ +headers->setCookie(new Cookie($str, $str, 0, '/', null, false, false, true)); +$r->sendHeaders(); + +setrawcookie($str, $str, 0, '/', null, false, false); diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.expected b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.expected new file mode 100644 index 00000000..cbde2cbf --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.expected @@ -0,0 +1,9 @@ + +Array +( + [0] => Content-Type: text/plain; charset=utf-8 + [1] => Cache-Control: no-cache, private + [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT + [3] => Set-Cookie: CookieSamesiteLaxTest=LaxValue; path=/; httponly; samesite=lax +) +shutdown diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.php b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.php new file mode 100644 index 00000000..9a476f1d --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.php @@ -0,0 +1,8 @@ +headers->setCookie(new Cookie('CookieSamesiteLaxTest', 'LaxValue', 0, '/', null, false, true, false, Cookie::SAMESITE_LAX)); +$r->sendHeaders(); diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.expected b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.expected new file mode 100644 index 00000000..adc491fd --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.expected @@ -0,0 +1,9 @@ + +Array +( + [0] => Content-Type: text/plain; charset=utf-8 + [1] => Cache-Control: no-cache, private + [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT + [3] => Set-Cookie: CookieSamesiteStrictTest=StrictValue; path=/; httponly; samesite=strict +) +shutdown diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.php b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.php new file mode 100644 index 00000000..3bcb41f8 --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.php @@ -0,0 +1,8 @@ +headers->setCookie(new Cookie('CookieSamesiteStrictTest', 'StrictValue', 0, '/', null, false, true, false, Cookie::SAMESITE_STRICT)); +$r->sendHeaders(); diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected new file mode 100644 index 00000000..4e9c4c07 --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected @@ -0,0 +1,10 @@ + +Array +( + [0] => Content-Type: text/plain; charset=utf-8 + [1] => Cache-Control: no-cache, private + [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT + [3] => Set-Cookie: %3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/ + [4] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/ +) +shutdown diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php new file mode 100644 index 00000000..05b9af30 --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php @@ -0,0 +1,12 @@ +headers->setCookie(new Cookie($str, $str, 0, '', null, false, false)); +$r->sendHeaders(); + +setcookie($str, $str, 0, '/'); diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.expected b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.expected new file mode 100644 index 00000000..2b560f0b --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.expected @@ -0,0 +1,6 @@ +The cookie name "Hello + world" contains invalid characters. +Array +( + [0] => Content-Type: text/plain; charset=utf-8 +) +shutdown diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php new file mode 100644 index 00000000..3fe15718 --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php @@ -0,0 +1,11 @@ +headers->setCookie(new Cookie('Hello + world', 'hodor')); +} catch (\InvalidArgumentException $e) { + echo $e->getMessage(); +} diff --git a/vendor/symfony/http-foundation/Tests/RequestTest.php b/vendor/symfony/http-foundation/Tests/RequestTest.php index 72add953..4266197a 100644 --- a/vendor/symfony/http-foundation/Tests/RequestTest.php +++ b/vendor/symfony/http-foundation/Tests/RequestTest.php @@ -23,6 +23,7 @@ class RequestTest extends TestCase { // reset Request::setTrustedProxies(array(), -1); + Request::setTrustedHosts(array()); } public function testInitialize() @@ -2007,9 +2008,15 @@ class RequestTest extends TestCase $request->headers->set('host', 'subdomain.trusted.com'); $this->assertEquals('subdomain.trusted.com', $request->getHost()); + } - // reset request for following tests - Request::setTrustedHosts(array()); + public function testSetTrustedHostsDoesNotBreakOnSpecialCharacters() + { + Request::setTrustedHosts(array('localhost(\.local){0,1}#,example.com', 'localhost')); + + $request = Request::create('/'); + $request->headers->set('host', 'localhost'); + $this->assertSame('localhost', $request->getHost()); } public function testFactory() @@ -2148,11 +2155,11 @@ class RequestTest extends TestCase /** * @dataProvider methodCacheableProvider */ - public function testMethodCacheable($method, $chacheable) + public function testMethodCacheable($method, $cacheable) { $request = new Request(); $request->setMethod($method); - $this->assertEquals($chacheable, $request->isMethodCacheable()); + $this->assertEquals($cacheable, $request->isMethodCacheable()); } public function methodCacheableProvider() @@ -2316,7 +2323,7 @@ class RequestContentProxy extends Request { public function getContent($asResource = false) { - return http_build_query(array('_method' => 'PUT', 'content' => 'mycontent')); + return http_build_query(array('_method' => 'PUT', 'content' => 'mycontent'), '', '&'); } } diff --git a/vendor/symfony/http-foundation/Tests/ResponseFunctionalTest.php b/vendor/symfony/http-foundation/Tests/ResponseFunctionalTest.php new file mode 100644 index 00000000..22f25e97 --- /dev/null +++ b/vendor/symfony/http-foundation/Tests/ResponseFunctionalTest.php @@ -0,0 +1,58 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation\Tests; + +use PHPUnit\Framework\TestCase; + +/** + * @requires PHP 7.0 + */ +class ResponseFunctionalTest extends TestCase +{ + private static $server; + + public static function setUpBeforeClass() + { + $spec = array( + 1 => array('file', '/dev/null', 'w'), + 2 => array('file', '/dev/null', 'w'), + ); + if (!self::$server = @proc_open('exec php -S localhost:8054', $spec, $pipes, __DIR__.'/Fixtures/response-functional')) { + self::markTestSkipped('PHP server unable to start.'); + } + sleep(1); + } + + public static function tearDownAfterClass() + { + if (self::$server) { + proc_terminate(self::$server); + proc_close(self::$server); + } + } + + /** + * @dataProvider provideCookie + */ + public function testCookie($fixture) + { + $result = file_get_contents(sprintf('http://localhost:8054/%s.php', $fixture)); + $this->assertStringMatchesFormatFile(__DIR__.sprintf('/Fixtures/response-functional/%s.expected', $fixture), $result); + } + + public function provideCookie() + { + foreach (glob(__DIR__.'/Fixtures/response-functional/*.php') as $file) { + yield array(pathinfo($file, PATHINFO_FILENAME)); + } + } +} diff --git a/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php b/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php index ce855359..7b5e720a 100644 --- a/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php +++ b/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php @@ -116,7 +116,7 @@ class ResponseHeaderBagTest extends TestCase $bag->clearCookie('foo'); - $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; max-age=-31536001; path=/; httponly', $bag); + $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0; path=/; httponly', $bag); } public function testClearCookieSecureNotHttpOnly() @@ -125,7 +125,7 @@ class ResponseHeaderBagTest extends TestCase $bag->clearCookie('foo', '/', null, true, false); - $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; max-age=-31536001; path=/; secure', $bag); + $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0; path=/; secure', $bag); } public function testReplace() diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php index 1a68d575..4a9fb600 100644 --- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php +++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php @@ -32,7 +32,7 @@ class NativeSessionHandlerTest extends TestCase { $handler = new NativeSessionHandler(); - $this->assertTrue($handler instanceof \SessionHandler); + $this->assertInstanceOf('SessionHandler', $handler); $this->assertTrue($handler instanceof NativeSessionHandler); } } diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php index a0d7529f..0a0e4490 100644 --- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php +++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php @@ -324,6 +324,41 @@ class PdoSessionHandlerTest extends TestCase $this->assertInstanceOf('\PDO', $method->invoke($storage)); } + /** + * @dataProvider provideUrlDsnPairs + */ + public function testUrlDsn($url, $expectedDsn, $expectedUser = null, $expectedPassword = null) + { + $storage = new PdoSessionHandler($url); + + $this->assertAttributeEquals($expectedDsn, 'dsn', $storage); + + if (null !== $expectedUser) { + $this->assertAttributeEquals($expectedUser, 'username', $storage); + } + + if (null !== $expectedPassword) { + $this->assertAttributeEquals($expectedPassword, 'password', $storage); + } + } + + public function provideUrlDsnPairs() + { + yield array('mysql://localhost/test', 'mysql:host=localhost;dbname=test;'); + yield array('mysql://localhost:56/test', 'mysql:host=localhost;port=56;dbname=test;'); + yield array('mysql2://root:pwd@localhost/test', 'mysql:host=localhost;dbname=test;', 'root', 'pwd'); + yield array('postgres://localhost/test', 'pgsql:host=localhost;dbname=test;'); + yield array('postgresql://localhost:5634/test', 'pgsql:host=localhost;port=5634;dbname=test;'); + yield array('postgres://root:pwd@localhost/test', 'pgsql:host=localhost;dbname=test;', 'root', 'pwd'); + yield 'sqlite relative path' => array('sqlite://localhost/tmp/test', 'sqlite:tmp/test'); + yield 'sqlite absolute path' => array('sqlite://localhost//tmp/test', 'sqlite:/tmp/test'); + yield 'sqlite relative path without host' => array('sqlite:///tmp/test', 'sqlite:tmp/test'); + yield 'sqlite absolute path without host' => array('sqlite3:////tmp/test', 'sqlite:/tmp/test'); + yield array('sqlite://localhost/:memory:', 'sqlite::memory:'); + yield array('mssql://localhost/test', 'sqlsrv:server=localhost;Database=test'); + yield array('mssql://localhost:56/test', 'sqlsrv:server=localhost,56;Database=test'); + } + private function createStream($content) { $stream = tmpfile(); diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php index 8fb8b422..382707b0 100644 --- a/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php +++ b/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php @@ -182,6 +182,23 @@ class NativeSessionStorageTest extends TestCase $this->assertEquals($options, $gco); } + public function testSessionOptions() + { + if (defined('HHVM_VERSION')) { + $this->markTestSkipped('HHVM is not handled in this test case.'); + } + + $options = array( + 'url_rewriter.tags' => 'a=href', + 'cache_expire' => '200', + ); + + $this->getStorage($options); + + $this->assertSame('a=href', ini_get('url_rewriter.tags')); + $this->assertSame('200', ini_get('session.cache_expire')); + } + /** * @expectedException \InvalidArgumentException */ diff --git a/vendor/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php b/vendor/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php index c55564c0..7bc195f2 100644 --- a/vendor/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php +++ b/vendor/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php @@ -39,9 +39,15 @@ final class ServiceValueResolver implements ArgumentValueResolverInterface if (\is_array($controller) && \is_callable($controller, true) && \is_string($controller[0])) { $controller = $controller[0].'::'.$controller[1]; + } elseif (!\is_string($controller) || '' === $controller) { + return false; } - return \is_string($controller) && $this->container->has($controller) && $this->container->get($controller)->has($argument->getName()); + if ('\\' === $controller[0]) { + $controller = ltrim($controller, '\\'); + } + + return $this->container->has($controller) && $this->container->get($controller)->has($argument->getName()); } /** @@ -53,6 +59,10 @@ final class ServiceValueResolver implements ArgumentValueResolverInterface $controller = $controller[0].'::'.$controller[1]; } + if ('\\' === $controller[0]) { + $controller = ltrim($controller, '\\'); + } + yield $this->container->get($controller)->get($argument->getName()); } } diff --git a/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php b/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php index d1e7af20..0424850e 100644 --- a/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php +++ b/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php @@ -58,7 +58,7 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface } foreach ($reflection->getParameters() as $param) { - $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param), $this->isVariadic($param), $this->hasDefaultValue($param), $this->getDefaultValue($param), $param->allowsNull()); + $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection), $this->isVariadic($param), $this->hasDefaultValue($param), $this->getDefaultValue($param), $param->allowsNull()); } return $arguments; @@ -107,23 +107,35 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface * * @return null|string */ - private function getType(\ReflectionParameter $parameter) + private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function) { if ($this->supportsParameterType) { if (!$type = $parameter->getType()) { return; } - $typeName = $type instanceof \ReflectionNamedType ? $type->getName() : $type->__toString(); - if ('array' === $typeName && !$type->isBuiltin()) { + $name = $type instanceof \ReflectionNamedType ? $type->getName() : $type->__toString(); + if ('array' === $name && !$type->isBuiltin()) { // Special case for HHVM with variadics return; } - - return $typeName; + } elseif (preg_match('/^(?:[^ ]++ ){4}([a-zA-Z_\x7F-\xFF][^ ]++)/', $parameter, $name)) { + $name = $name[1]; + } else { + return; } + $lcName = strtolower($name); - if (preg_match('/^(?:[^ ]++ ){4}([a-zA-Z_\x7F-\xFF][^ ]++)/', $parameter, $info)) { - return $info[1]; + if ('self' !== $lcName && 'parent' !== $lcName) { + return $name; + } + if (!$function instanceof \ReflectionMethod) { + return; + } + if ('self' === $lcName) { + return $function->getDeclaringClass()->name; + } + if ($parent = $function->getDeclaringClass()->getParentClass()) { + return $parent->name; } } } diff --git a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php b/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php index d0ca671e..27a9a825 100644 --- a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php +++ b/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php @@ -67,7 +67,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface if ($this->stopwatch) { $this->stopwatch->start('dump'); } - if ($this->isCollected) { + if ($this->isCollected && !$this->dumper) { $this->isCollected = false; } @@ -250,7 +250,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface --$i; } - if ('cli' !== PHP_SAPI && stripos($h[$i], 'html')) { + if (!\in_array(PHP_SAPI, array('cli', 'phpdbg'), true) && stripos($h[$i], 'html')) { $this->dumper = new HtmlDumper('php://output', $this->charset); $this->dumper->setDisplayOptions(array('fileLinkFormat' => $this->fileLinkFormat)); } else { diff --git a/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php b/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php index c340d9b6..1a72ac7e 100644 --- a/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php +++ b/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php @@ -13,6 +13,8 @@ namespace Symfony\Component\HttpKernel\Debug; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; +use Symfony\Component\Routing\Exception\ExceptionInterface; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; /** * Formats debug file links. @@ -26,6 +28,9 @@ class FileLinkFormatter implements \Serializable private $baseDir; private $urlFormat; + /** + * @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand + */ public function __construct($fileLinkFormat = null, RequestStack $requestStack = null, $baseDir = null, $urlFormat = null) { $fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format'); @@ -70,6 +75,18 @@ class FileLinkFormatter implements \Serializable } } + /** + * @internal + */ + public static function generateUrlFormat(UrlGeneratorInterface $router, $routeName, $queryString) + { + try { + return $router->generate($routeName).$queryString; + } catch (ExceptionInterface $e) { + return null; + } + } + private function getFileLinkFormat() { if ($this->fileLinkFormat) { @@ -78,6 +95,10 @@ class FileLinkFormatter implements \Serializable if ($this->requestStack && $this->baseDir && $this->urlFormat) { $request = $this->requestStack->getMasterRequest(); if ($request instanceof Request) { + if ($this->urlFormat instanceof \Closure && !$this->urlFormat = \call_user_func($this->urlFormat)) { + return; + } + return array( $request->getSchemeAndHttpHost().$request->getBaseUrl().$this->urlFormat, $this->baseDir.DIRECTORY_SEPARATOR, '', diff --git a/vendor/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/vendor/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php index 985dfb71..cb88594e 100644 --- a/vendor/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php +++ b/vendor/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php @@ -22,6 +22,7 @@ use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\LazyProxy\ProxyHelper; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\TypedReference; +use Symfony\Component\HttpFoundation\Request; /** * Creates the service-locators required by ServiceValueResolver. @@ -148,6 +149,10 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface continue; } + if (Request::class === $type) { + continue; + } + if ($type && !$p->isOptional() && !$p->allowsNull() && !class_exists($type) && !interface_exists($type, false)) { $message = sprintf('Cannot determine controller argument for "%s::%s()": the $%s argument is type-hinted with the non-existent class or interface: "%s".', $class, $r->name, $p->name, $type); diff --git a/vendor/symfony/http-kernel/EventListener/AbstractTestSessionListener.php b/vendor/symfony/http-kernel/EventListener/AbstractTestSessionListener.php index 5f0ea5c0..82061fd6 100644 --- a/vendor/symfony/http-kernel/EventListener/AbstractTestSessionListener.php +++ b/vendor/symfony/http-kernel/EventListener/AbstractTestSessionListener.php @@ -29,6 +29,8 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; */ abstract class AbstractTestSessionListener implements EventSubscriberInterface { + private $sessionId; + public function onKernelRequest(GetResponseEvent $event) { if (!$event->isMasterRequest()) { @@ -44,7 +46,8 @@ abstract class AbstractTestSessionListener implements EventSubscriberInterface $cookies = $event->getRequest()->cookies; if ($cookies->has($session->getName())) { - $session->setId($cookies->get($session->getName())); + $this->sessionId = $cookies->get($session->getName()); + $session->setId($this->sessionId); } } @@ -66,9 +69,10 @@ abstract class AbstractTestSessionListener implements EventSubscriberInterface $session->save(); } - if ($session instanceof Session ? !$session->isEmpty() : $wasStarted) { + if ($session instanceof Session ? !$session->isEmpty() || (null !== $this->sessionId && $session->getId() !== $this->sessionId) : $wasStarted) { $params = session_get_cookie_params(); $event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly'])); + $this->sessionId = $session->getId(); } } diff --git a/vendor/symfony/http-kernel/EventListener/ExceptionListener.php b/vendor/symfony/http-kernel/EventListener/ExceptionListener.php index f18e42c7..3dfa4cd8 100644 --- a/vendor/symfony/http-kernel/EventListener/ExceptionListener.php +++ b/vendor/symfony/http-kernel/EventListener/ExceptionListener.php @@ -12,9 +12,11 @@ namespace Symfony\Component\HttpKernel\EventListener; use Psr\Log\LoggerInterface; +use Symfony\Component\Debug\ExceptionHandler; use Symfony\Component\Debug\Exception\FlattenException; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; use Symfony\Component\HttpKernel\Log\DebugLoggerInterface; use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; @@ -33,12 +35,14 @@ class ExceptionListener implements EventSubscriberInterface protected $controller; protected $logger; protected $debug; + private $charset; - public function __construct($controller, LoggerInterface $logger = null, $debug = false) + public function __construct($controller, LoggerInterface $logger = null, $debug = false, $charset = null) { $this->controller = $controller; $this->logger = $logger; $this->debug = $debug; + $this->charset = $charset; } public function onKernelException(GetResponseForExceptionEvent $event) @@ -117,8 +121,12 @@ class ExceptionListener implements EventSubscriberInterface protected function duplicateRequest(\Exception $exception, Request $request) { $attributes = array( - '_controller' => $this->controller, - 'exception' => FlattenException::create($exception), + 'exception' => $exception = FlattenException::create($exception), + '_controller' => $this->controller ?: function () use ($exception) { + $handler = new ExceptionHandler($this->debug, $this->charset); + + return new Response($handler->getHtml($exception), $exception->getStatusCode(), $exception->getHeaders()); + }, 'logger' => $this->logger instanceof DebugLoggerInterface ? $this->logger : null, ); $request = $request->duplicate(null, null, $attributes); diff --git a/vendor/symfony/http-kernel/EventListener/RouterListener.php b/vendor/symfony/http-kernel/EventListener/RouterListener.php index caaf80f8..959f2ba0 100644 --- a/vendor/symfony/http-kernel/EventListener/RouterListener.php +++ b/vendor/symfony/http-kernel/EventListener/RouterListener.php @@ -14,6 +14,7 @@ namespace Symfony\Component\HttpKernel\EventListener; use Psr\Log\LoggerInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\GetResponseEvent; +use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; use Symfony\Component\HttpKernel\Event\FinishRequestEvent; use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\HttpKernel\KernelEvents; @@ -129,12 +130,6 @@ class RouterListener implements EventSubscriberInterface unset($parameters['_route'], $parameters['_controller']); $request->attributes->set('_route_params', $parameters); } catch (ResourceNotFoundException $e) { - if ($this->debug && $e instanceof NoConfigurationException) { - $event->setResponse($this->createWelcomeResponse()); - - return; - } - $message = sprintf('No route found for "%s %s"', $request->getMethod(), $request->getPathInfo()); if ($referer = $request->headers->get('referer')) { @@ -149,11 +144,23 @@ class RouterListener implements EventSubscriberInterface } } + public function onKernelException(GetResponseForExceptionEvent $event) + { + if (!$this->debug || !($e = $event->getException()) instanceof NotFoundHttpException) { + return; + } + + if ($e->getPrevious() instanceof NoConfigurationException) { + $event->setResponse($this->createWelcomeResponse()); + } + } + public static function getSubscribedEvents() { return array( KernelEvents::REQUEST => array(array('onKernelRequest', 32)), KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)), + KernelEvents::EXCEPTION => array('onKernelException', -64), ); } diff --git a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php b/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php index 027b2b17..672cc893 100644 --- a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php +++ b/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php @@ -72,7 +72,7 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface $response->setLastModified(null); } - if (!$response->isFresh()) { + if (!$response->isFresh() || !$response->isCacheable()) { $this->cacheable = false; } diff --git a/vendor/symfony/http-kernel/HttpCache/Store.php b/vendor/symfony/http-kernel/HttpCache/Store.php index fa0d4a86..d20bfaa1 100644 --- a/vendor/symfony/http-kernel/HttpCache/Store.php +++ b/vendor/symfony/http-kernel/HttpCache/Store.php @@ -387,16 +387,22 @@ class Store implements StoreInterface $tmpFile = tempnam(dirname($path), basename($path)); if (false === $fp = @fopen($tmpFile, 'wb')) { + @unlink($tmpFile); + return false; } @fwrite($fp, $data); @fclose($fp); if ($data != file_get_contents($tmpFile)) { + @unlink($tmpFile); + return false; } if (false === @rename($tmpFile, $path)) { + @unlink($tmpFile); + return false; } } diff --git a/vendor/symfony/http-kernel/Kernel.php b/vendor/symfony/http-kernel/Kernel.php index eb2364e4..ca0f0b95 100644 --- a/vendor/symfony/http-kernel/Kernel.php +++ b/vendor/symfony/http-kernel/Kernel.php @@ -22,6 +22,7 @@ use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\DependencyInjection\Loader\IniFileLoader; use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; +use Symfony\Component\DependencyInjection\Loader\GlobFileLoader; use Symfony\Component\DependencyInjection\Loader\DirectoryLoader; use Symfony\Component\DependencyInjection\Loader\ClosureLoader; use Symfony\Component\Filesystem\Filesystem; @@ -32,7 +33,6 @@ use Symfony\Component\HttpKernel\Config\EnvParametersResource; use Symfony\Component\HttpKernel\Config\FileLocator; use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass; use Symfony\Component\HttpKernel\DependencyInjection\AddAnnotatedClassesToCachePass; -use Symfony\Component\Config\Loader\GlobFileLoader; use Symfony\Component\Config\Loader\LoaderResolver; use Symfony\Component\Config\Loader\DelegatingLoader; use Symfony\Component\Config\ConfigCache; @@ -67,11 +67,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private $requestStackSize = 0; private $resetServices = false; - const VERSION = '3.4.4'; - const VERSION_ID = 30404; + const VERSION = '3.4.11'; + const VERSION_ID = 30411; const MAJOR_VERSION = 3; const MINOR_VERSION = 4; - const RELEASE_VERSION = 4; + const RELEASE_VERSION = 11; const EXTRA_VERSION = ''; const END_OF_MAINTENANCE = '11/2020'; @@ -587,7 +587,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl $errorLevel = error_reporting(\E_ALL ^ \E_WARNING); $fresh = $oldContainer = false; try { - if (\is_object($this->container = include $cache->getPath())) { + if (file_exists($cache->getPath()) && \is_object($this->container = include $cache->getPath())) { $this->container->set('kernel', $this); $oldContainer = $this->container; $fresh = true; @@ -650,7 +650,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl } } - if (null === $oldContainer) { + if (null === $oldContainer && file_exists($cache->getPath())) { $errorLevel = error_reporting(\E_ALL ^ \E_WARNING); try { $oldContainer = include $cache->getPath(); @@ -670,9 +670,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl // Because concurrent requests might still be using them, // old container files are not removed immediately, // but on a next dump of the container. + static $legacyContainers = array(); $oldContainerDir = dirname($oldContainer->getFileName()); - foreach (glob(dirname($oldContainerDir).'/*.legacy') as $legacyContainer) { - if ($oldContainerDir.'.legacy' !== $legacyContainer && @unlink($legacyContainer)) { + $legacyContainers[$oldContainerDir.'.legacy'] = true; + foreach (glob(dirname($oldContainerDir).DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) { + if (!isset($legacyContainers[$legacyContainer]) && @unlink($legacyContainer)) { (new Filesystem())->remove(substr($legacyContainer, 0, -7)); } } @@ -790,7 +792,6 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl foreach ($this->bundles as $bundle) { if ($extension = $bundle->getContainerExtension()) { $container->registerExtension($extension); - $extensions[] = $extension->getAlias(); } if ($this->debug) { @@ -804,6 +805,10 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl $this->build($container); + foreach ($container->getExtensions() as $extension) { + $extensions[] = $extension->getAlias(); + } + // ensure these extensions are implicitly loaded $container->getCompilerPassConfig()->setMergePass(new MergeExtensionConfigurationPass($extensions)); } @@ -842,7 +847,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl $dumper = new PhpDumper($container); if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper')) { - $dumper->setProxyDumper(new ProxyDumper(substr(hash('sha256', $cache->getPath()), 0, 7))); + $dumper->setProxyDumper(new ProxyDumper()); } $content = $dumper->dump(array( @@ -852,6 +857,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl 'as_files' => true, 'debug' => $this->debug, 'inline_class_loader_parameter' => \PHP_VERSION_ID >= 70000 && !$this->loadClassCache && !class_exists(ClassCollectionLoader::class, false) ? 'container.dumper.inline_class_loader' : null, + 'build_time' => $container->hasParameter('kernel.container_build_time') ? $container->getParameter('kernel.container_build_time') : time(), )); $rootCode = array_pop($content); @@ -880,7 +886,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl new YamlFileLoader($container, $locator), new IniFileLoader($container, $locator), new PhpFileLoader($container, $locator), - new GlobFileLoader($locator), + new GlobFileLoader($container, $locator), new DirectoryLoader($container, $locator), new ClosureLoader($container), )); diff --git a/vendor/symfony/http-kernel/KernelInterface.php b/vendor/symfony/http-kernel/KernelInterface.php index b341e3e9..9ec4e7a9 100644 --- a/vendor/symfony/http-kernel/KernelInterface.php +++ b/vendor/symfony/http-kernel/KernelInterface.php @@ -27,7 +27,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable /** * Returns an array of bundles to register. * - * @return BundleInterface[] An array of bundle instances + * @return iterable|BundleInterface[] An iterable of bundle instances */ public function registerBundles(); diff --git a/vendor/symfony/http-kernel/Profiler/Profiler.php b/vendor/symfony/http-kernel/Profiler/Profiler.php index 15bfbc5a..6245a21b 100644 --- a/vendor/symfony/http-kernel/Profiler/Profiler.php +++ b/vendor/symfony/http-kernel/Profiler/Profiler.php @@ -37,7 +37,7 @@ class Profiler private $enabled = true; /** - * @param bool $enable The initial enabled state + * @param bool $enable The initial enabled state */ public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null, $enable = true) { diff --git a/vendor/symfony/http-kernel/Resources/welcome.html.php b/vendor/symfony/http-kernel/Resources/welcome.html.php index d8c37beb..caac7fd6 100644 --- a/vendor/symfony/http-kernel/Resources/welcome.html.php +++ b/vendor/symfony/http-kernel/Resources/welcome.html.php @@ -76,7 +76,7 @@

    - You're seeing this message because you have debug mode enabled and you haven't configured any URLs. + You're seeing this page because debug mode is enabled and you haven't configured any homepage URL.

    diff --git a/vendor/symfony/http-kernel/Tests/ClientTest.php b/vendor/symfony/http-kernel/Tests/ClientTest.php index 1ac72c73..b774d8ec 100644 --- a/vendor/symfony/http-kernel/Tests/ClientTest.php +++ b/vendor/symfony/http-kernel/Tests/ClientTest.php @@ -60,22 +60,17 @@ class ClientTest extends TestCase $m = $r->getMethod('filterResponse'); $m->setAccessible(true); - $expected = array( - 'foo=bar; expires=Sun, 15-Feb-2009 20:00:00 GMT; max-age='.(strtotime('Sun, 15-Feb-2009 20:00:00 GMT') - time()).'; path=/foo; domain=http://example.com; secure; httponly', - 'foo1=bar1; expires=Sun, 15-Feb-2009 20:00:00 GMT; max-age='.(strtotime('Sun, 15-Feb-2009 20:00:00 GMT') - time()).'; path=/foo; domain=http://example.com; secure; httponly', - ); + $response = new Response(); + $response->headers->setCookie($cookie1 = new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true)); + $domResponse = $m->invoke($client, $response); + $this->assertSame((string) $cookie1, $domResponse->getHeader('Set-Cookie')); $response = new Response(); - $response->headers->setCookie(new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true)); + $response->headers->setCookie($cookie1 = new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true)); + $response->headers->setCookie($cookie2 = new Cookie('foo1', 'bar1', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true)); $domResponse = $m->invoke($client, $response); - $this->assertEquals($expected[0], $domResponse->getHeader('Set-Cookie')); - - $response = new Response(); - $response->headers->setCookie(new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true)); - $response->headers->setCookie(new Cookie('foo1', 'bar1', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true)); - $domResponse = $m->invoke($client, $response); - $this->assertEquals($expected[0], $domResponse->getHeader('Set-Cookie')); - $this->assertEquals($expected, $domResponse->getHeader('Set-Cookie', false)); + $this->assertSame((string) $cookie1, $domResponse->getHeader('Set-Cookie')); + $this->assertSame(array((string) $cookie1, (string) $cookie2), $domResponse->getHeader('Set-Cookie', false)); } public function testFilterResponseSupportsStreamedResponses() @@ -97,6 +92,7 @@ class ClientTest extends TestCase public function testUploadedFile() { $source = tempnam(sys_get_temp_dir(), 'source'); + file_put_contents($source, '1'); $target = sys_get_temp_dir().'/sf.moved.file'; @unlink($target); @@ -104,8 +100,8 @@ class ClientTest extends TestCase $client = new Client($kernel); $files = array( - array('tmp_name' => $source, 'name' => 'original', 'type' => 'mime/original', 'size' => 123, 'error' => UPLOAD_ERR_OK), - new UploadedFile($source, 'original', 'mime/original', 123, UPLOAD_ERR_OK, true), + array('tmp_name' => $source, 'name' => 'original', 'type' => 'mime/original', 'size' => 1, 'error' => UPLOAD_ERR_OK), + new UploadedFile($source, 'original', 'mime/original', 1, UPLOAD_ERR_OK, true), ); $file = null; @@ -120,7 +116,7 @@ class ClientTest extends TestCase $this->assertEquals('original', $file->getClientOriginalName()); $this->assertEquals('mime/original', $file->getClientMimeType()); - $this->assertEquals('123', $file->getClientSize()); + $this->assertSame(1, $file->getClientSize()); $this->assertTrue($file->isValid()); } diff --git a/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php index b05828f5..7d34172c 100644 --- a/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php +++ b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php @@ -47,6 +47,25 @@ class ServiceValueResolverTest extends TestCase $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument)); } + public function testExistingControllerWithATrailingBackSlash() + { + $resolver = new ServiceValueResolver(new ServiceLocator(array( + 'App\\Controller\\Mine::method' => function () { + return new ServiceLocator(array( + 'dummy' => function () { + return new DummyService(); + }, + )); + }, + ))); + + $request = $this->requestWithAttributes(array('_controller' => '\\App\\Controller\\Mine::method')); + $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null); + + $this->assertTrue($resolver->supports($request, $argument)); + $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument)); + } + public function testControllerNameIsAnArray() { $resolver = new ServiceValueResolver(new ServiceLocator(array( diff --git a/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php index b4b449f3..bf0db5ad 100644 --- a/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php +++ b/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php @@ -126,11 +126,11 @@ class ArgumentMetadataFactoryTest extends TestCase ), $arguments); } - private function signature1(ArgumentMetadataFactoryTest $foo, array $bar, callable $baz) + private function signature1(self $foo, array $bar, callable $baz) { } - private function signature2(ArgumentMetadataFactoryTest $foo = null, FakeClassThatDoesNotExist $bar = null, ImportedAndFake $baz = null) + private function signature2(self $foo = null, FakeClassThatDoesNotExist $bar = null, ImportedAndFake $baz = null) { } diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php index fc4b92b5..d809331c 100644 --- a/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php +++ b/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php @@ -16,6 +16,7 @@ use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\VarDumper\Cloner\Data; +use Symfony\Component\VarDumper\Dumper\CliDumper; /** * @author Nicolas Grekas @@ -66,7 +67,7 @@ class DumpDataCollectorTest extends TestCase ob_start(); $collector->collect(new Request(), new Response()); - $output = ob_get_clean(); + $output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean()); $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n123\n", $output); $this->assertSame(1, $collector->getDumpsCount()); @@ -110,6 +111,28 @@ EOTXT; ob_start(); $collector->__destruct(); - $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", ob_get_clean()); + $output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean()); + $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output); + } + + public function testFlushNothingWhenDataDumperIsProvided() + { + $data = new Data(array(array(456))); + $dumper = new CliDumper('php://output'); + $collector = new DumpDataCollector(null, null, null, null, $dumper); + + ob_start(); + $collector->dump($data); + $line = __LINE__ - 1; + $output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean()); + if (\PHP_VERSION_ID >= 50400) { + $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output); + } else { + $this->assertSame("\"DumpDataCollectorTest.php on line {$line}:\"\n456\n", $output); + } + + ob_start(); + $collector->__destruct(); + $this->assertEmpty(ob_get_clean()); } } diff --git a/vendor/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php b/vendor/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php index d28c6eca..e8957bb3 100644 --- a/vendor/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php +++ b/vendor/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php @@ -12,8 +12,10 @@ namespace Symfony\Component\HttpKernel\Tests\DependencyInjection; use PHPUnit\Framework\TestCase; -use Symfony\Component\DependencyInjection\Definition; +use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; +use Symfony\Component\DependencyInjection\ServiceLocator; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\DependencyInjection\FragmentRendererPass; use Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface; @@ -22,73 +24,37 @@ class FragmentRendererPassTest extends TestCase { /** * Tests that content rendering not implementing FragmentRendererInterface - * trigger an exception. + * triggers an exception. * * @expectedException \InvalidArgumentException */ public function testContentRendererWithoutInterface() { - // one service, not implementing any interface - $services = array( - 'my_content_renderer' => array(array('alias' => 'foo')), - ); - - $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock(); - - $builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock(); - $builder->expects($this->any()) - ->method('hasDefinition') - ->will($this->returnValue(true)); - - // We don't test kernel.fragment_renderer here - $builder->expects($this->atLeastOnce()) - ->method('findTaggedServiceIds') - ->will($this->returnValue($services)); - - $builder->expects($this->atLeastOnce()) - ->method('getDefinition') - ->will($this->returnValue($definition)); + $builder = new ContainerBuilder(); + $fragmentHandlerDefinition = $builder->register('fragment.handler'); + $builder->register('my_content_renderer', 'Symfony\Component\DependencyInjection\Definition') + ->addTag('kernel.fragment_renderer', array('alias' => 'foo')); $pass = new FragmentRendererPass(); $pass->process($builder); + + $this->assertEquals(array(array('addRendererService', array('foo', 'my_content_renderer'))), $fragmentHandlerDefinition->getMethodCalls()); } public function testValidContentRenderer() { - $services = array( - 'my_content_renderer' => array(array('alias' => 'foo')), - ); - - $renderer = new Definition('', array(null)); - - $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock(); - $definition->expects($this->atLeastOnce()) - ->method('getClass') - ->will($this->returnValue('Symfony\Component\HttpKernel\Tests\DependencyInjection\RendererService')); - - $builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition', 'getReflectionClass'))->getMock(); - $builder->expects($this->any()) - ->method('hasDefinition') - ->will($this->returnValue(true)); - - // We don't test kernel.fragment_renderer here - $builder->expects($this->atLeastOnce()) - ->method('findTaggedServiceIds') - ->will($this->returnValue($services)); - - $builder->expects($this->atLeastOnce()) - ->method('getDefinition') - ->will($this->onConsecutiveCalls($renderer, $definition)); - - $builder->expects($this->atLeastOnce()) - ->method('getReflectionClass') - ->with('Symfony\Component\HttpKernel\Tests\DependencyInjection\RendererService') - ->will($this->returnValue(new \ReflectionClass('Symfony\Component\HttpKernel\Tests\DependencyInjection\RendererService'))); + $builder = new ContainerBuilder(); + $fragmentHandlerDefinition = $builder->register('fragment.handler') + ->addArgument(null); + $builder->register('my_content_renderer', 'Symfony\Component\HttpKernel\Tests\DependencyInjection\RendererService') + ->addTag('kernel.fragment_renderer', array('alias' => 'foo')); $pass = new FragmentRendererPass(); $pass->process($builder); - $this->assertInstanceOf(Reference::class, $renderer->getArgument(0)); + $serviceLocatorDefinition = $builder->getDefinition((string) $fragmentHandlerDefinition->getArgument(0)); + $this->assertSame(ServiceLocator::class, $serviceLocatorDefinition->getClass()); + $this->assertEquals(array('foo' => new ServiceClosureArgument(new Reference('my_content_renderer'))), $serviceLocatorDefinition->getArgument(0)); } } diff --git a/vendor/symfony/http-kernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php b/vendor/symfony/http-kernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php index 81fc8b45..ae421d91 100644 --- a/vendor/symfony/http-kernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php +++ b/vendor/symfony/http-kernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php @@ -12,44 +12,39 @@ namespace Symfony\Component\HttpKernel\Tests\DependencyInjection; use PHPUnit\Framework\TestCase; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass; class MergeExtensionConfigurationPassTest extends TestCase { public function testAutoloadMainExtension() { - $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerBuilder')->setMethods(array('getExtensionConfig', 'loadFromExtension', 'getParameterBag', 'getDefinitions', 'getAliases', 'getExtensions'))->getMock(); - $params = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBag')->getMock(); + $container = new ContainerBuilder(); + $container->registerExtension(new LoadedExtension()); + $container->registerExtension(new NotLoadedExtension()); + $container->loadFromExtension('loaded', array()); - $container->expects($this->at(0)) - ->method('getExtensionConfig') - ->with('loaded') - ->will($this->returnValue(array(array()))); - $container->expects($this->at(1)) - ->method('getExtensionConfig') - ->with('notloaded') - ->will($this->returnValue(array())); - $container->expects($this->once()) - ->method('loadFromExtension') - ->with('notloaded', array()); - - $container->expects($this->any()) - ->method('getParameterBag') - ->will($this->returnValue($params)); - $params->expects($this->any()) - ->method('all') - ->will($this->returnValue(array())); - $container->expects($this->any()) - ->method('getDefinitions') - ->will($this->returnValue(array())); - $container->expects($this->any()) - ->method('getAliases') - ->will($this->returnValue(array())); - $container->expects($this->any()) - ->method('getExtensions') - ->will($this->returnValue(array())); - - $configPass = new MergeExtensionConfigurationPass(array('loaded', 'notloaded')); + $configPass = new MergeExtensionConfigurationPass(array('loaded', 'not_loaded')); $configPass->process($container); + + $this->assertTrue($container->hasDefinition('loaded.foo')); + $this->assertTrue($container->hasDefinition('not_loaded.bar')); + } +} + +class LoadedExtension extends Extension +{ + public function load(array $configs, ContainerBuilder $container) + { + $container->register('loaded.foo'); + } +} + +class NotLoadedExtension extends Extension +{ + public function load(array $configs, ContainerBuilder $container) + { + $container->register('not_loaded.bar'); } } diff --git a/vendor/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php index 3cb0b298..b607bf90 100644 --- a/vendor/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php +++ b/vendor/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php @@ -151,6 +151,23 @@ class ExceptionListenerTest extends TestCase $this->assertFalse($response->headers->has('content-security-policy'), 'CSP header has been removed'); $this->assertFalse($dispatcher->hasListeners(KernelEvents::RESPONSE), 'CSP removal listener has been removed'); } + + public function testNullController() + { + $listener = new ExceptionListener(null); + $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(); + $kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) { + $controller = $request->attributes->get('_controller'); + + return $controller(); + })); + $request = Request::create('/'); + $event = new GetResponseForExceptionEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, new \Exception('foo')); + + $listener->onKernelException($event); + + $this->assertContains('Whoops, looks like something went wrong.', $event->getResponse()->getContent()); + } } class TestLogger extends Logger implements DebugLoggerInterface diff --git a/vendor/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php index 4452f487..22a2b712 100644 --- a/vendor/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php +++ b/vendor/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php @@ -15,6 +15,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\ServiceSubscriberInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; use Symfony\Component\HttpKernel\EventListener\SessionListener; @@ -44,6 +45,9 @@ class TestSessionListenerTest extends TestCase { $this->listener = $this->getMockForAbstractClass('Symfony\Component\HttpKernel\EventListener\AbstractTestSessionListener'); $this->session = $this->getSession(); + $this->listener->expects($this->any()) + ->method('getSession') + ->will($this->returnValue($this->session)); } public function testShouldSaveMasterRequestSession() @@ -86,6 +90,22 @@ class TestSessionListenerTest extends TestCase $this->assertSame(array(), $response->headers->getCookies()); } + public function testEmptySessionWithNewSessionIdDoesSendCookie() + { + $this->sessionHasBeenStarted(); + $this->sessionIsEmpty(); + $this->fixSessionId('456'); + + $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(); + $request = Request::create('/', 'GET', array(), array('MOCKSESSID' => '123')); + $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST); + $this->listener->onKernelRequest($event); + + $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST); + + $this->assertNotEmpty($response->headers->getCookies()); + } + public function testUnstartedSessionIsNotSave() { $this->sessionHasNotBeenStarted(); @@ -150,6 +170,13 @@ class TestSessionListenerTest extends TestCase ->will($this->returnValue(true)); } + private function fixSessionId($sessionId) + { + $this->session->expects($this->any()) + ->method('getId') + ->will($this->returnValue($sessionId)); + } + private function getSession() { $mock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session') diff --git a/vendor/symfony/http-kernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php b/vendor/symfony/http-kernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php index 760366c6..05d8d787 100644 --- a/vendor/symfony/http-kernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php +++ b/vendor/symfony/http-kernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php @@ -6,21 +6,6 @@ use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException; class UnprocessableEntityHttpExceptionTest extends HttpExceptionTest { - /** - * Test that setting the headers using the setter function - * is working as expected. - * - * @param array $headers The headers to set - * - * @dataProvider headerDataProvider - */ - public function testHeadersSetter($headers) - { - $exception = new UnprocessableEntityHttpException(10); - $exception->setHeaders($headers); - $this->assertSame($headers, $exception->getHeaders()); - } - protected function createException() { return new UnprocessableEntityHttpException(); diff --git a/vendor/symfony/http-kernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php b/vendor/symfony/http-kernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php index d47287a1..4dae039c 100644 --- a/vendor/symfony/http-kernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php +++ b/vendor/symfony/http-kernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php @@ -6,17 +6,7 @@ use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException; class UnsupportedMediaTypeHttpExceptionTest extends HttpExceptionTest { - /** - * @dataProvider headerDataProvider - */ - public function testHeadersSetter($headers) - { - $exception = new UnsupportedMediaTypeHttpException(10); - $exception->setHeaders($headers); - $this->assertSame($headers, $exception->getHeaders()); - } - - protected function createException($headers = array()) + protected function createException() { return new UnsupportedMediaTypeHttpException(); } diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/ResponseCacheStrategyTest.php b/vendor/symfony/http-kernel/Tests/HttpCache/ResponseCacheStrategyTest.php index 5e4c3222..6d67a177 100644 --- a/vendor/symfony/http-kernel/Tests/HttpCache/ResponseCacheStrategyTest.php +++ b/vendor/symfony/http-kernel/Tests/HttpCache/ResponseCacheStrategyTest.php @@ -175,8 +175,26 @@ class ResponseCacheStrategyTest extends TestCase $cacheStrategy->update($masterResponse); $this->assertTrue($masterResponse->headers->hasCacheControlDirective('private')); - // Not sure if we should pass "max-age: 60" in this case, as long as the response is private and - // that's the more conservative of both the master and embedded response...? + $this->assertFalse($masterResponse->headers->hasCacheControlDirective('public')); + } + + public function testEmbeddingPublicResponseDoesNotMakeMainResponsePublic() + { + $cacheStrategy = new ResponseCacheStrategy(); + + $masterResponse = new Response(); + $masterResponse->setPrivate(); // this is the default, but let's be explicit + $masterResponse->setMaxAge(100); + + $embeddedResponse = new Response(); + $embeddedResponse->setPublic(); + $embeddedResponse->setSharedMaxAge(100); + + $cacheStrategy->add($embeddedResponse); + $cacheStrategy->update($masterResponse); + + $this->assertTrue($masterResponse->headers->hasCacheControlDirective('private')); + $this->assertFalse($masterResponse->headers->hasCacheControlDirective('public')); } public function testResponseIsExiprableWhenEmbeddedResponseCombinesExpiryAndValidation() diff --git a/vendor/symfony/http-kernel/Tests/KernelTest.php b/vendor/symfony/http-kernel/Tests/KernelTest.php index 755e1db2..a16ac37d 100644 --- a/vendor/symfony/http-kernel/Tests/KernelTest.php +++ b/vendor/symfony/http-kernel/Tests/KernelTest.php @@ -849,14 +849,14 @@ EOF; $kernel = new CustomProjectDirKernel(); $kernel->boot(); - $this->assertSame($containerClass, get_class($kernel->getContainer())); + $this->assertInstanceOf($containerClass, $kernel->getContainer()); $this->assertFileExists($containerFile); unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta'); $kernel = new CustomProjectDirKernel(function ($container) { $container->register('foo', 'stdClass')->setPublic(true); }); $kernel->boot(); - $this->assertTrue(get_class($kernel->getContainer()) !== $containerClass); + $this->assertNotInstanceOf($containerClass, $kernel->getContainer()); $this->assertFileExists($containerFile); $this->assertFileExists(dirname($containerFile).'.legacy'); } diff --git a/vendor/symfony/http-kernel/Tests/Profiler/FileProfilerStorageTest.php b/vendor/symfony/http-kernel/Tests/Profiler/FileProfilerStorageTest.php index 99ff2075..a1db1d9c 100644 --- a/vendor/symfony/http-kernel/Tests/Profiler/FileProfilerStorageTest.php +++ b/vendor/symfony/http-kernel/Tests/Profiler/FileProfilerStorageTest.php @@ -83,22 +83,22 @@ class FileProfilerStorageTest extends TestCase $profile = new Profile('simple_quote'); $profile->setUrl('http://foo.bar/\''); $this->storage->write($profile); - $this->assertTrue(false !== $this->storage->read('simple_quote'), '->write() accepts single quotes in URL'); + $this->assertNotFalse($this->storage->read('simple_quote'), '->write() accepts single quotes in URL'); $profile = new Profile('double_quote'); $profile->setUrl('http://foo.bar/"'); $this->storage->write($profile); - $this->assertTrue(false !== $this->storage->read('double_quote'), '->write() accepts double quotes in URL'); + $this->assertNotFalse($this->storage->read('double_quote'), '->write() accepts double quotes in URL'); $profile = new Profile('backslash'); $profile->setUrl('http://foo.bar/\\'); $this->storage->write($profile); - $this->assertTrue(false !== $this->storage->read('backslash'), '->write() accepts backslash in URL'); + $this->assertNotFalse($this->storage->read('backslash'), '->write() accepts backslash in URL'); $profile = new Profile('comma'); $profile->setUrl('http://foo.bar/,'); $this->storage->write($profile); - $this->assertTrue(false !== $this->storage->read('comma'), '->write() accepts comma in URL'); + $this->assertNotFalse($this->storage->read('comma'), '->write() accepts comma in URL'); } public function testStoreDuplicateToken() @@ -247,7 +247,7 @@ class FileProfilerStorageTest extends TestCase $profile->setMethod('GET'); $this->storage->write($profile); - $this->assertTrue(false !== $this->storage->read('token1')); + $this->assertNotFalse($this->storage->read('token1')); $this->assertCount(1, $this->storage->find('127.0.0.1', '', 10, 'GET')); $profile = new Profile('token2'); @@ -256,7 +256,7 @@ class FileProfilerStorageTest extends TestCase $profile->setMethod('GET'); $this->storage->write($profile); - $this->assertTrue(false !== $this->storage->read('token2')); + $this->assertNotFalse($this->storage->read('token2')); $this->assertCount(2, $this->storage->find('127.0.0.1', '', 10, 'GET')); $this->storage->purge(); diff --git a/vendor/symfony/http-kernel/Tests/Profiler/ProfilerTest.php b/vendor/symfony/http-kernel/Tests/Profiler/ProfilerTest.php index 243c3c5c..2d5f0ca5 100644 --- a/vendor/symfony/http-kernel/Tests/Profiler/ProfilerTest.php +++ b/vendor/symfony/http-kernel/Tests/Profiler/ProfilerTest.php @@ -44,7 +44,7 @@ class ProfilerTest extends TestCase public function testReset() { $collector = $this->getMockBuilder(DataCollectorInterface::class) - ->setMethods(['collect', 'getName', 'reset']) + ->setMethods(array('collect', 'getName', 'reset')) ->getMock(); $collector->expects($this->any())->method('getName')->willReturn('mock'); $collector->expects($this->once())->method('reset'); diff --git a/vendor/symfony/http-kernel/composer.json b/vendor/symfony/http-kernel/composer.json index b3367576..17c0544c 100644 --- a/vendor/symfony/http-kernel/composer.json +++ b/vendor/symfony/http-kernel/composer.json @@ -20,6 +20,7 @@ "symfony/event-dispatcher": "~2.8|~3.0|~4.0", "symfony/http-foundation": "^3.4.4|^4.0.4", "symfony/debug": "~2.8|~3.0|~4.0", + "symfony/polyfill-ctype": "~1.8", "psr/log": "~1.0" }, "require-dev": { @@ -28,7 +29,7 @@ "symfony/config": "~2.8|~3.0|~4.0", "symfony/console": "~2.8|~3.0|~4.0", "symfony/css-selector": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", + "symfony/dependency-injection": "^3.4.5|^4.0.5", "symfony/dom-crawler": "~2.8|~3.0|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", @@ -45,7 +46,7 @@ }, "conflict": { "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.4", + "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4", "symfony/var-dumper": "<3.3", "twig/twig": "<1.34|<2.4,>=2" }, diff --git a/vendor/symfony/polyfill-ctype/Ctype.php b/vendor/symfony/polyfill-ctype/Ctype.php new file mode 100644 index 00000000..58414dc7 --- /dev/null +++ b/vendor/symfony/polyfill-ctype/Ctype.php @@ -0,0 +1,227 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Polyfill\Ctype; + +/** + * Ctype implementation through regex. + * + * @internal + * + * @author Gert de Pagter + */ +final class Ctype +{ + /** + * Returns TRUE if every character in text is either a letter or a digit, FALSE otherwise. + * + * @see https://php.net/ctype-alnum + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_alnum($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^A-Za-z0-9]/', $text); + } + + /** + * Returns TRUE if every character in text is a letter, FALSE otherwise. + * + * @see https://php.net/ctype-alpha + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_alpha($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^A-Za-z]/', $text); + } + + /** + * Returns TRUE if every character in text is a control character from the current locale, FALSE otherwise. + * + * @see https://php.net/ctype-cntrl + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_cntrl($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^\x00-\x1f\x7f]/', $text); + } + + /** + * Returns TRUE if every character in the string text is a decimal digit, FALSE otherwise. + * + * @see https://php.net/ctype-digit + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_digit($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^0-9]/', $text); + } + + /** + * Returns TRUE if every character in text is printable and actually creates visible output (no white space), FALSE otherwise. + * + * @see https://php.net/ctype-graph + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_graph($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^!-~]/', $text); + } + + /** + * Returns TRUE if every character in text is a lowercase letter. + * + * @see https://php.net/ctype-lower + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_lower($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^a-z]/', $text); + } + + /** + * Returns TRUE if every character in text will actually create output (including blanks). Returns FALSE if text contains control characters or characters that do not have any output or control function at all. + * + * @see https://php.net/ctype-print + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_print($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^ -~]/', $text); + } + + /** + * Returns TRUE if every character in text is printable, but neither letter, digit or blank, FALSE otherwise. + * + * @see https://php.net/ctype-punct + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_punct($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^!-\/\:-@\[-`\{-~]/', $text); + } + + /** + * Returns TRUE if every character in text creates some sort of white space, FALSE otherwise. Besides the blank character this also includes tab, vertical tab, line feed, carriage return and form feed characters. + * + * @see https://php.net/ctype-space + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_space($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^\s]/', $text); + } + + /** + * Returns TRUE if every character in text is an uppercase letter. + * + * @see https://php.net/ctype-upper + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_upper($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^A-Z]/', $text); + } + + /** + * Returns TRUE if every character in text is a hexadecimal 'digit', that is a decimal digit or a character from [A-Fa-f] , FALSE otherwise. + * + * @see https://php.net/ctype-xdigit + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_xdigit($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^A-Fa-f0-9]/', $text); + } + + /** + * Converts integers to their char versions according to normal ctype behaviour, if needed. + * + * If an integer between -128 and 255 inclusive is provided, + * it is interpreted as the ASCII value of a single character + * (negative values have 256 added in order to allow characters in the Extended ASCII range). + * Any other integer is interpreted as a string containing the decimal digits of the integer. + * + * @param string|int $int + * + * @return mixed + */ + private static function convert_int_to_char_for_ctype($int) + { + if (!\is_int($int)) { + return $int; + } + + if ($int < -128 || $int > 255) { + return (string) $int; + } + + if ($int < 0) { + $int += 256; + } + + return \chr($int); + } +} diff --git a/vendor/symfony/polyfill-ctype/LICENSE b/vendor/symfony/polyfill-ctype/LICENSE new file mode 100644 index 00000000..ad399a79 --- /dev/null +++ b/vendor/symfony/polyfill-ctype/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2018 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/vendor/symfony/polyfill-ctype/README.md b/vendor/symfony/polyfill-ctype/README.md new file mode 100644 index 00000000..8add1ab0 --- /dev/null +++ b/vendor/symfony/polyfill-ctype/README.md @@ -0,0 +1,12 @@ +Symfony Polyfill / Ctype +======================== + +This component provides `ctype_*` functions to users who run php versions without the ctype extension. + +More information can be found in the +[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md). + +License +======= + +This library is released under the [MIT license](LICENSE). diff --git a/vendor/symfony/polyfill-ctype/bootstrap.php b/vendor/symfony/polyfill-ctype/bootstrap.php new file mode 100644 index 00000000..14d1d0fa --- /dev/null +++ b/vendor/symfony/polyfill-ctype/bootstrap.php @@ -0,0 +1,26 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +use Symfony\Polyfill\Ctype as p; + +if (!function_exists('ctype_alnum')) { + function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); } + function ctype_alpha($text) { return p\Ctype::ctype_alpha($text); } + function ctype_cntrl($text) { return p\Ctype::ctype_cntrl($text); } + function ctype_digit($text) { return p\Ctype::ctype_digit($text); } + function ctype_graph($text) { return p\Ctype::ctype_graph($text); } + function ctype_lower($text) { return p\Ctype::ctype_lower($text); } + function ctype_print($text) { return p\Ctype::ctype_print($text); } + function ctype_punct($text) { return p\Ctype::ctype_punct($text); } + function ctype_space($text) { return p\Ctype::ctype_space($text); } + function ctype_upper($text) { return p\Ctype::ctype_upper($text); } + function ctype_xdigit($text) { return p\Ctype::ctype_xdigit($text); } +} diff --git a/vendor/symfony/polyfill-ctype/composer.json b/vendor/symfony/polyfill-ctype/composer.json new file mode 100644 index 00000000..0504dda0 --- /dev/null +++ b/vendor/symfony/polyfill-ctype/composer.json @@ -0,0 +1,31 @@ +{ + "name": "symfony/polyfill-ctype", + "type": "library", + "description": "Symfony polyfill for ctype functions", + "keywords": ["polyfill", "compatibility", "portable", "ctype"], + "homepage": "https://symfony.com", + "license": "MIT", + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "require": { + "php": ">=5.3.3" + }, + "autoload": { + "psr-4": { "Symfony\\Polyfill\\Ctype\\": "" }, + "files": [ "bootstrap.php" ] + }, + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + } +} diff --git a/vendor/symfony/polyfill-mbstring/Mbstring.php b/vendor/symfony/polyfill-mbstring/Mbstring.php index 67cf9ab8..4bd326e5 100644 --- a/vendor/symfony/polyfill-mbstring/Mbstring.php +++ b/vendor/symfony/polyfill-mbstring/Mbstring.php @@ -78,7 +78,7 @@ final class Mbstring public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null) { - if (is_array($fromEncoding) || false !== strpos($fromEncoding, ',')) { + if (\is_array($fromEncoding) || false !== strpos($fromEncoding, ',')) { $fromEncoding = self::mb_detect_encoding($s, $fromEncoding); } else { $fromEncoding = self::getEncoding($fromEncoding); @@ -140,16 +140,16 @@ final class Mbstring public static function mb_decode_numericentity($s, $convmap, $encoding = null) { - if (null !== $s && !is_scalar($s) && !(is_object($s) && method_exists($s, '__toString'))) { + if (null !== $s && !\is_scalar($s) && !(\is_object($s) && \method_exists($s, '__toString'))) { trigger_error('mb_decode_numericentity() expects parameter 1 to be string, '.gettype($s).' given', E_USER_WARNING); return null; } - if (!is_array($convmap) || !$convmap) { + if (!\is_array($convmap) || !$convmap) { return false; } - if (null !== $encoding && !is_scalar($encoding)) { + if (null !== $encoding && !\is_scalar($encoding)) { trigger_error('mb_decode_numericentity() expects parameter 3 to be string, '.gettype($s).' given', E_USER_WARNING); return ''; // Instead of null (cf. mb_encode_numericentity). } @@ -170,7 +170,7 @@ final class Mbstring $s = iconv($encoding, 'UTF-8//IGNORE', $s); } - $cnt = floor(count($convmap) / 4) * 4; + $cnt = floor(\count($convmap) / 4) * 4; for ($i = 0; $i < $cnt; $i += 4) { // collector_decode_htmlnumericentity ignores $convmap[$i + 3] @@ -197,21 +197,21 @@ final class Mbstring public static function mb_encode_numericentity($s, $convmap, $encoding = null, $is_hex = false) { - if (null !== $s && !is_scalar($s) && !(is_object($s) && method_exists($s, '__toString'))) { + if (null !== $s && !\is_scalar($s) && !(\is_object($s) && \method_exists($s, '__toString'))) { trigger_error('mb_encode_numericentity() expects parameter 1 to be string, '.gettype($s).' given', E_USER_WARNING); return null; } - if (!is_array($convmap) || !$convmap) { + if (!\is_array($convmap) || !$convmap) { return false; } - if (null !== $encoding && !is_scalar($encoding)) { + if (null !== $encoding && !\is_scalar($encoding)) { trigger_error('mb_encode_numericentity() expects parameter 3 to be string, '.gettype($s).' given', E_USER_WARNING); return null; // Instead of '' (cf. mb_decode_numericentity). } - if (null !== $is_hex && !is_scalar($is_hex)) { + if (null !== $is_hex && !\is_scalar($is_hex)) { trigger_error('mb_encode_numericentity() expects parameter 4 to be boolean, '.gettype($s).' given', E_USER_WARNING); return null; } @@ -234,9 +234,9 @@ final class Mbstring static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4); - $cnt = floor(count($convmap) / 4) * 4; + $cnt = floor(\count($convmap) / 4) * 4; $i = 0; - $len = strlen($s); + $len = \strlen($s); $result = ''; while ($i < $len) { @@ -305,7 +305,7 @@ final class Mbstring static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4); $i = 0; - $len = strlen($s); + $len = \strlen($s); while ($i < $len) { $ulen = $s[$i] < "\x80" ? 1 : $ulenMask[$s[$i] & "\xF0"]; @@ -314,7 +314,7 @@ final class Mbstring if (isset($map[$uchr])) { $uchr = $map[$uchr]; - $nlen = strlen($uchr); + $nlen = \strlen($uchr); if ($nlen == $ulen) { $nlen = $i; @@ -404,7 +404,7 @@ final class Mbstring if (null === $encodingList) { $encodingList = self::$encodingList; } else { - if (!is_array($encodingList)) { + if (!\is_array($encodingList)) { $encodingList = array_map('trim', explode(',', $encodingList)); } $encodingList = array_map('strtoupper', $encodingList); @@ -441,7 +441,7 @@ final class Mbstring return self::$encodingList; } - if (!is_array($encodingList)) { + if (!\is_array($encodingList)) { $encodingList = array_map('trim', explode(',', $encodingList)); } $encodingList = array_map('strtoupper', $encodingList); @@ -467,7 +467,7 @@ final class Mbstring { $encoding = self::getEncoding($encoding); if ('CP850' === $encoding || 'ASCII' === $encoding) { - return strlen($s); + return \strlen($s); } return @iconv_strlen($s, $encoding); @@ -679,13 +679,13 @@ final class Mbstring public static function mb_chr($code, $encoding = null) { if (0x80 > $code %= 0x200000) { - $s = chr($code); + $s = \chr($code); } elseif (0x800 > $code) { - $s = chr(0xC0 | $code >> 6).chr(0x80 | $code & 0x3F); + $s = \chr(0xC0 | $code >> 6).\chr(0x80 | $code & 0x3F); } elseif (0x10000 > $code) { - $s = chr(0xE0 | $code >> 12).chr(0x80 | $code >> 6 & 0x3F).chr(0x80 | $code & 0x3F); + $s = \chr(0xE0 | $code >> 12).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F); } else { - $s = chr(0xF0 | $code >> 18).chr(0x80 | $code >> 12 & 0x3F).chr(0x80 | $code >> 6 & 0x3F).chr(0x80 | $code & 0x3F); + $s = \chr(0xF0 | $code >> 18).\chr(0x80 | $code >> 12 & 0x3F).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F); } if ('UTF-8' !== $encoding = self::getEncoding($encoding)) { @@ -735,7 +735,7 @@ final class Mbstring while (isset($m[$i])) { if (0x80 > $m[$i]) { - $entities .= chr($m[$i++]); + $entities .= \chr($m[$i++]); continue; } if (0xF0 <= $m[$i]) { diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/vendor/symfony/polyfill-mbstring/composer.json index 4febcdd5..49b720dd 100644 --- a/vendor/symfony/polyfill-mbstring/composer.json +++ b/vendor/symfony/polyfill-mbstring/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } } } diff --git a/vendor/symfony/polyfill-php70/Php70.php b/vendor/symfony/polyfill-php70/Php70.php index 8e784506..39e66450 100644 --- a/vendor/symfony/polyfill-php70/Php70.php +++ b/vendor/symfony/polyfill-php70/Php70.php @@ -60,12 +60,12 @@ final class Php70 restore_error_handler(); } - public static function intArg($value, $caller, $pos) + private static function intArg($value, $caller, $pos) { - if (is_int($value)) { + if (\is_int($value)) { return $value; } - if (!is_numeric($value) || PHP_INT_MAX <= ($value += 0) || ~PHP_INT_MAX >= $value) { + if (!\is_numeric($value) || PHP_INT_MAX <= ($value += 0) || ~PHP_INT_MAX >= $value) { throw new \TypeError(sprintf('%s() expects parameter %d to be integer, %s given', $caller, $pos, gettype($value))); } diff --git a/vendor/symfony/polyfill-php70/composer.json b/vendor/symfony/polyfill-php70/composer.json index 88ff357a..871045d2 100644 --- a/vendor/symfony/polyfill-php70/composer.json +++ b/vendor/symfony/polyfill-php70/composer.json @@ -27,7 +27,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } } } diff --git a/vendor/symfony/process/ExecutableFinder.php b/vendor/symfony/process/ExecutableFinder.php index d042a5b1..1ec6526d 100644 --- a/vendor/symfony/process/ExecutableFinder.php +++ b/vendor/symfony/process/ExecutableFinder.php @@ -77,7 +77,7 @@ class ExecutableFinder } foreach ($suffixes as $suffix) { foreach ($dirs as $dir) { - if (@is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR || is_executable($file))) { + if (@is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR || @is_executable($file))) { return $file; } } diff --git a/vendor/symfony/process/PhpExecutableFinder.php b/vendor/symfony/process/PhpExecutableFinder.php index db31cc1b..67015902 100644 --- a/vendor/symfony/process/PhpExecutableFinder.php +++ b/vendor/symfony/process/PhpExecutableFinder.php @@ -44,12 +44,12 @@ class PhpExecutableFinder } // PHP_BINARY return the current sapi executable - if (PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg')) && is_file(PHP_BINARY)) { + if (PHP_BINARY && \in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg'), true)) { return PHP_BINARY.$args; } if ($php = getenv('PHP_PATH')) { - if (!is_executable($php)) { + if (!@is_executable($php)) { return false; } @@ -57,11 +57,15 @@ class PhpExecutableFinder } if ($php = getenv('PHP_PEAR_PHP_BIN')) { - if (is_executable($php)) { + if (@is_executable($php)) { return $php; } } + if (@is_executable($php = PHP_BINDIR.('\\' === DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) { + return $php; + } + $dirs = array(PHP_BINDIR); if ('\\' === DIRECTORY_SEPARATOR) { $dirs[] = 'C:\xampp\php\\'; diff --git a/vendor/symfony/process/Pipes/AbstractPipes.php b/vendor/symfony/process/Pipes/AbstractPipes.php index 2bd1fe75..9a7d88be 100644 --- a/vendor/symfony/process/Pipes/AbstractPipes.php +++ b/vendor/symfony/process/Pipes/AbstractPipes.php @@ -25,6 +25,7 @@ abstract class AbstractPipes implements PipesInterface private $inputBuffer = ''; private $input; private $blocked = true; + private $lastError; /** * @param resource|string|int|float|bool|\Iterator|null $input @@ -58,10 +59,11 @@ abstract class AbstractPipes implements PipesInterface */ protected function hasSystemCallBeenInterrupted() { - $lastError = error_get_last(); + $lastError = $this->lastError; + $this->lastError = null; // stream_select returns false when the `select` system call is interrupted by an incoming signal - return isset($lastError['message']) && false !== stripos($lastError['message'], 'interrupted system call'); + return null !== $lastError && false !== stripos($lastError, 'interrupted system call'); } /** @@ -165,4 +167,12 @@ abstract class AbstractPipes implements PipesInterface return array($this->pipes[0]); } } + + /** + * @internal + */ + public function handleError($type, $msg) + { + $this->lastError = $msg; + } } diff --git a/vendor/symfony/process/Pipes/UnixPipes.php b/vendor/symfony/process/Pipes/UnixPipes.php index 78ffee7b..254df519 100644 --- a/vendor/symfony/process/Pipes/UnixPipes.php +++ b/vendor/symfony/process/Pipes/UnixPipes.php @@ -99,7 +99,9 @@ class UnixPipes extends AbstractPipes unset($r[0]); // let's have a look if something changed in streams - if (($r || $w) && false === @stream_select($r, $w, $e, 0, $blocking ? Process::TIMEOUT_PRECISION * 1E6 : 0)) { + set_error_handler(array($this, 'handleError')); + if (($r || $w) && false === stream_select($r, $w, $e, 0, $blocking ? Process::TIMEOUT_PRECISION * 1E6 : 0)) { + restore_error_handler(); // if a system call has been interrupted, forget about it, let's try again // otherwise, an error occurred, let's reset pipes if (!$this->hasSystemCallBeenInterrupted()) { @@ -108,6 +110,7 @@ class UnixPipes extends AbstractPipes return $read; } + restore_error_handler(); foreach ($r as $pipe) { // prior PHP 5.4 the array passed to stream_select is modified and diff --git a/vendor/symfony/routing/Loader/AnnotationClassLoader.php b/vendor/symfony/routing/Loader/AnnotationClassLoader.php index 2fe6fb59..fd1d2b65 100644 --- a/vendor/symfony/routing/Loader/AnnotationClassLoader.php +++ b/vendor/symfony/routing/Loader/AnnotationClassLoader.php @@ -119,10 +119,15 @@ abstract class AnnotationClassLoader implements LoaderInterface } } - if (0 === $collection->count() && $class->hasMethod('__invoke') && $annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) { - $globals['path'] = ''; - $globals['name'] = ''; - $this->addRoute($collection, $annot, $globals, $class, $class->getMethod('__invoke')); + if (0 === $collection->count() && $class->hasMethod('__invoke')) { + foreach ($this->reader->getClassAnnotations($class) as $annot) { + if ($annot instanceof $this->routeAnnotationClass) { + $globals['path'] = ''; + $globals['name'] = ''; + + $this->addRoute($collection, $annot, $globals, $class, $class->getMethod('__invoke')); + } + } } return $collection; diff --git a/vendor/symfony/routing/Loader/Configurator/CollectionConfigurator.php b/vendor/symfony/routing/Loader/Configurator/CollectionConfigurator.php index 38d86cb8..8baefdd5 100644 --- a/vendor/symfony/routing/Loader/Configurator/CollectionConfigurator.php +++ b/vendor/symfony/routing/Loader/Configurator/CollectionConfigurator.php @@ -23,13 +23,15 @@ class CollectionConfigurator use Traits\RouteTrait; private $parent; + private $parentConfigurator; - public function __construct(RouteCollection $parent, $name) + public function __construct(RouteCollection $parent, $name, self $parentConfigurator = null) { $this->parent = $parent; $this->name = $name; $this->collection = new RouteCollection(); $this->route = new Route(''); + $this->parentConfigurator = $parentConfigurator; // for GC control } public function __destruct() @@ -50,7 +52,7 @@ class CollectionConfigurator { $this->collection->add($this->name.$name, $route = clone $this->route); - return new RouteConfigurator($this->collection, $route->setPath($path), $this->name); + return new RouteConfigurator($this->collection, $route->setPath($path), $this->name, $this); } /** @@ -60,7 +62,7 @@ class CollectionConfigurator */ final public function collection($name = '') { - return new self($this->collection, $this->name.$name); + return new self($this->collection, $this->name.$name, $this); } /** diff --git a/vendor/symfony/routing/Loader/Configurator/RouteConfigurator.php b/vendor/symfony/routing/Loader/Configurator/RouteConfigurator.php index b8d87025..6422bbf6 100644 --- a/vendor/symfony/routing/Loader/Configurator/RouteConfigurator.php +++ b/vendor/symfony/routing/Loader/Configurator/RouteConfigurator.php @@ -22,10 +22,13 @@ class RouteConfigurator use Traits\AddTrait; use Traits\RouteTrait; - public function __construct(RouteCollection $collection, Route $route, $name = '') + private $parentConfigurator; + + public function __construct(RouteCollection $collection, Route $route, $name = '', CollectionConfigurator $parentConfigurator = null) { $this->collection = $collection; $this->route = $route; $this->name = $name; + $this->parentConfigurator = $parentConfigurator; // for GC control } } diff --git a/vendor/symfony/routing/Loader/Configurator/RoutingConfigurator.php b/vendor/symfony/routing/Loader/Configurator/RoutingConfigurator.php index 4591a86b..d992cef8 100644 --- a/vendor/symfony/routing/Loader/Configurator/RoutingConfigurator.php +++ b/vendor/symfony/routing/Loader/Configurator/RoutingConfigurator.php @@ -39,9 +39,17 @@ class RoutingConfigurator final public function import($resource, $type = null, $ignoreErrors = false) { $this->loader->setCurrentDir(dirname($this->path)); - $subCollection = $this->loader->import($resource, $type, $ignoreErrors, $this->file); + $imported = $this->loader->import($resource, $type, $ignoreErrors, $this->file); + if (!is_array($imported)) { + return new ImportConfigurator($this->collection, $imported); + } - return new ImportConfigurator($this->collection, $subCollection); + $mergedCollection = new RouteCollection(); + foreach ($imported as $subCollection) { + $mergedCollection->addCollection($subCollection); + } + + return new ImportConfigurator($this->collection, $mergedCollection); } /** diff --git a/vendor/symfony/routing/Loader/Configurator/Traits/AddTrait.php b/vendor/symfony/routing/Loader/Configurator/Traits/AddTrait.php index 7171fd24..e8b8fa26 100644 --- a/vendor/symfony/routing/Loader/Configurator/Traits/AddTrait.php +++ b/vendor/symfony/routing/Loader/Configurator/Traits/AddTrait.php @@ -34,9 +34,10 @@ trait AddTrait */ final public function add($name, $path) { + $parentConfigurator = $this instanceof RouteConfigurator ? $this->parentConfigurator : null; $this->collection->add($this->name.$name, $route = new Route($path)); - return new RouteConfigurator($this->collection, $route); + return new RouteConfigurator($this->collection, $route, '', $parentConfigurator); } /** diff --git a/vendor/symfony/routing/Loader/GlobFileLoader.php b/vendor/symfony/routing/Loader/GlobFileLoader.php new file mode 100644 index 00000000..03ee341b --- /dev/null +++ b/vendor/symfony/routing/Loader/GlobFileLoader.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Routing\Loader; + +use Symfony\Component\Config\Loader\FileLoader; +use Symfony\Component\Routing\RouteCollection; + +/** + * GlobFileLoader loads files from a glob pattern. + * + * @author Nicolas Grekas + */ +class GlobFileLoader extends FileLoader +{ + /** + * {@inheritdoc} + */ + public function load($resource, $type = null) + { + $collection = new RouteCollection(); + + foreach ($this->glob($resource, false, $globResource) as $path => $info) { + $collection->addCollection($this->import($path)); + } + + $collection->addResource($globResource); + + return $collection; + } + + /** + * {@inheritdoc} + */ + public function supports($resource, $type = null) + { + return 'glob' === $type; + } +} diff --git a/vendor/symfony/routing/Loader/XmlFileLoader.php b/vendor/symfony/routing/Loader/XmlFileLoader.php index 3a778907..f3f66055 100644 --- a/vendor/symfony/routing/Loader/XmlFileLoader.php +++ b/vendor/symfony/routing/Loader/XmlFileLoader.php @@ -146,26 +146,33 @@ class XmlFileLoader extends FileLoader $this->setCurrentDir(dirname($path)); - $subCollection = $this->import($resource, ('' !== $type ? $type : null), false, $file); - /* @var $subCollection RouteCollection */ - $subCollection->addPrefix($prefix); - if (null !== $host) { - $subCollection->setHost($host); - } - if (null !== $condition) { - $subCollection->setCondition($condition); - } - if (null !== $schemes) { - $subCollection->setSchemes($schemes); - } - if (null !== $methods) { - $subCollection->setMethods($methods); - } - $subCollection->addDefaults($defaults); - $subCollection->addRequirements($requirements); - $subCollection->addOptions($options); + $imported = $this->import($resource, ('' !== $type ? $type : null), false, $file); - $collection->addCollection($subCollection); + if (!is_array($imported)) { + $imported = array($imported); + } + + foreach ($imported as $subCollection) { + /* @var $subCollection RouteCollection */ + $subCollection->addPrefix($prefix); + if (null !== $host) { + $subCollection->setHost($host); + } + if (null !== $condition) { + $subCollection->setCondition($condition); + } + if (null !== $schemes) { + $subCollection->setSchemes($schemes); + } + if (null !== $methods) { + $subCollection->setMethods($methods); + } + $subCollection->addDefaults($defaults); + $subCollection->addRequirements($requirements); + $subCollection->addOptions($options); + + $collection->addCollection($subCollection); + } } /** diff --git a/vendor/symfony/routing/Loader/YamlFileLoader.php b/vendor/symfony/routing/Loader/YamlFileLoader.php index 037d581d..f59f9097 100644 --- a/vendor/symfony/routing/Loader/YamlFileLoader.php +++ b/vendor/symfony/routing/Loader/YamlFileLoader.php @@ -158,26 +158,33 @@ class YamlFileLoader extends FileLoader $this->setCurrentDir(dirname($path)); - $subCollection = $this->import($config['resource'], $type, false, $file); - /* @var $subCollection RouteCollection */ - $subCollection->addPrefix($prefix); - if (null !== $host) { - $subCollection->setHost($host); - } - if (null !== $condition) { - $subCollection->setCondition($condition); - } - if (null !== $schemes) { - $subCollection->setSchemes($schemes); - } - if (null !== $methods) { - $subCollection->setMethods($methods); - } - $subCollection->addDefaults($defaults); - $subCollection->addRequirements($requirements); - $subCollection->addOptions($options); + $imported = $this->import($config['resource'], $type, false, $file); - $collection->addCollection($subCollection); + if (!is_array($imported)) { + $imported = array($imported); + } + + foreach ($imported as $subCollection) { + /* @var $subCollection RouteCollection */ + $subCollection->addPrefix($prefix); + if (null !== $host) { + $subCollection->setHost($host); + } + if (null !== $condition) { + $subCollection->setCondition($condition); + } + if (null !== $schemes) { + $subCollection->setSchemes($schemes); + } + if (null !== $methods) { + $subCollection->setMethods($methods); + } + $subCollection->addDefaults($defaults); + $subCollection->addRequirements($requirements); + $subCollection->addOptions($options); + + $collection->addCollection($subCollection); + } } /** diff --git a/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php b/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php index 6916297b..dd057d2e 100644 --- a/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php +++ b/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php @@ -106,7 +106,7 @@ class DumperCollection implements \IteratorAggregate /** * Sets the parent collection. */ - protected function setParent(DumperCollection $parent) + protected function setParent(self $parent) { $this->parent = $parent; } diff --git a/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php b/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php index acb9eddb..40d8df67 100644 --- a/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php +++ b/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php @@ -102,15 +102,13 @@ EOF; \$pathinfo = rawurldecode(\$rawPathinfo); \$trimmedPathinfo = rtrim(\$pathinfo, '/'); \$context = \$this->context; - \$request = \$this->request; + \$request = \$this->request ?: \$this->createRequest(\$pathinfo); \$requestMethod = \$canonicalMethod = \$context->getMethod(); - \$scheme = \$context->getScheme(); if ('HEAD' === \$requestMethod) { \$canonicalMethod = 'GET'; } - $code throw 0 < count(\$allow) ? new MethodNotAllowedException(array_unique(\$allow)) : new ResourceNotFoundException(); @@ -155,11 +153,10 @@ EOF; } } - if ('' === $code) { - $code .= " if ('/' === \$pathinfo) {\n"; - $code .= " throw new Symfony\Component\Routing\Exception\NoConfigurationException();\n"; - $code .= " }\n"; - } + // used to display the Welcome Page in apps that don't define a homepage + $code .= " if ('/' === \$pathinfo && !\$allow) {\n"; + $code .= " throw new Symfony\Component\Routing\Exception\NoConfigurationException();\n"; + $code .= " }\n"; return $code; } @@ -239,7 +236,7 @@ EOF; $hostMatches = false; $methods = $route->getMethods(); - $supportsTrailingSlash = $supportsRedirections && (!$methods || in_array('HEAD', $methods) || in_array('GET', $methods)); + $supportsTrailingSlash = $supportsRedirections && (!$methods || in_array('GET', $methods)); $regex = $compiledRoute->getRegex(); if (!count($compiledRoute->getPathVariables()) && false !== preg_match('#^(.)\^(?P.*?)\$\1#'.('u' === substr($regex, -1) ? 'u' : ''), $regex, $m)) { @@ -281,59 +278,6 @@ EOF; $gotoname = 'not_'.preg_replace('/[^A-Za-z0-9_]/', '', $name); - if ($methods) { - if (1 === count($methods)) { - if ('HEAD' === $methods[0]) { - $code .= <<redirect(\$rawPathinfo.'/', '$name')); } @@ -369,29 +317,69 @@ EOF; EOF; } + if ($methods) { + $methodVariable = in_array('GET', $methods) ? '$canonicalMethod' : '$requestMethod'; + $methods = implode("', '", $methods); + } + if ($schemes = $route->getSchemes()) { if (!$supportsRedirections) { throw new \LogicException('The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.'); } $schemes = str_replace("\n", '', var_export(array_flip($schemes), true)); - $code .= <<getScheme()]); + if (!in_array($methodVariable, array('$methods'))) { + if (\$hasRequiredScheme) { + \$allow = array_merge(\$allow, array('$methods')); + } + goto $gotoname; + } + if (!\$hasRequiredScheme) { + if ('GET' !== \$canonicalMethod) { + goto $gotoname; + } + return array_replace(\$ret, \$this->redirect(\$rawPathinfo, '$name', key(\$requiredSchemes))); } +EOF; + } else { + $code .= <<getScheme()])) { + if ('GET' !== \$canonicalMethod) { + goto $gotoname; + } + + return array_replace(\$ret, \$this->redirect(\$rawPathinfo, '$name', key(\$requiredSchemes))); + } + + +EOF; + } + } elseif ($methods) { + $code .= <<routes) && '/' === $pathinfo) { + if ('/' === $pathinfo && !$this->allow) { throw new NoConfigurationException(); } @@ -135,6 +135,12 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface continue; } + $status = $this->handleRouteRequirements($pathinfo, $name, $route); + + if (self::REQUIREMENT_MISMATCH === $status[0]) { + continue; + } + // check HTTP method requirement if ($requiredMethods = $route->getMethods()) { // HEAD and GET are equivalent as per RFC @@ -143,18 +149,14 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface } if (!in_array($method, $requiredMethods)) { - $this->allow = array_merge($this->allow, $requiredMethods); + if (self::REQUIREMENT_MATCH === $status[0]) { + $this->allow = array_merge($this->allow, $requiredMethods); + } continue; } } - $status = $this->handleRouteRequirements($pathinfo, $name, $route); - - if (self::REQUIREMENT_MISMATCH === $status[0]) { - continue; - } - return $this->getAttributes($route, $name, array_replace($matches, $hostMatches, isset($status[1]) ? $status[1] : array())); } } diff --git a/vendor/symfony/routing/RouteCollection.php b/vendor/symfony/routing/RouteCollection.php index feabf234..e22cbc5f 100644 --- a/vendor/symfony/routing/RouteCollection.php +++ b/vendor/symfony/routing/RouteCollection.php @@ -117,7 +117,7 @@ class RouteCollection implements \IteratorAggregate, \Countable * Adds a route collection at the end of the current set by appending all * routes of the added collection. */ - public function addCollection(RouteCollection $collection) + public function addCollection(self $collection) { // we need to remove all routes with the same names first because just replacing them // would not place the new route at the end of the merged array diff --git a/vendor/symfony/routing/RouteCollectionBuilder.php b/vendor/symfony/routing/RouteCollectionBuilder.php index e8a9a165..3aec1469 100644 --- a/vendor/symfony/routing/RouteCollectionBuilder.php +++ b/vendor/symfony/routing/RouteCollectionBuilder.php @@ -118,7 +118,7 @@ class RouteCollectionBuilder * @param string $prefix * @param RouteCollectionBuilder $builder */ - public function mount($prefix, RouteCollectionBuilder $builder) + public function mount($prefix, self $builder) { $builder->prefix = trim(trim($prefix), '/'); $this->routes[] = $builder; @@ -251,8 +251,6 @@ class RouteCollectionBuilder /** * Adds a resource for this collection. * - * @param ResourceInterface $resource - * * @return $this */ private function addResource(ResourceInterface $resource) diff --git a/vendor/symfony/routing/RouteCompiler.php b/vendor/symfony/routing/RouteCompiler.php index 9b5526f3..dc4e4f80 100644 --- a/vendor/symfony/routing/RouteCompiler.php +++ b/vendor/symfony/routing/RouteCompiler.php @@ -210,7 +210,7 @@ class RouteCompiler implements RouteCompilerInterface for ($i = 0, $nbToken = count($tokens); $i < $nbToken; ++$i) { $regexp .= self::computeRegexp($tokens, $i, $firstOptional); } - $regexp = self::REGEX_DELIMITER.'^'.$regexp.'$'.self::REGEX_DELIMITER.'s'.($isHost ? 'i' : ''); + $regexp = self::REGEX_DELIMITER.'^'.$regexp.'$'.self::REGEX_DELIMITER.'sD'.($isHost ? 'i' : ''); // enable Utf8 matching if really required if ($needsUtf8) { diff --git a/vendor/symfony/routing/Router.php b/vendor/symfony/routing/Router.php index 0de92185..ed56332e 100644 --- a/vendor/symfony/routing/Router.php +++ b/vendor/symfony/routing/Router.php @@ -302,7 +302,9 @@ class Router implements RouterInterface, RequestMatcherInterface } ); - require_once $cache->getPath(); + if (!class_exists($this->options['matcher_cache_class'], false)) { + require_once $cache->getPath(); + } return $this->matcher = new $this->options['matcher_cache_class']($this->context); } @@ -334,7 +336,9 @@ class Router implements RouterInterface, RequestMatcherInterface } ); - require_once $cache->getPath(); + if (!class_exists($this->options['generator_cache_class'], false)) { + require_once $cache->getPath(); + } $this->generator = new $this->options['generator_cache_class']($this->context, $this->logger); } diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php index 839c7d13..9e9b9103 100644 --- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php +++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php @@ -21,16 +21,14 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher $pathinfo = rawurldecode($rawPathinfo); $trimmedPathinfo = rtrim($pathinfo, '/'); $context = $this->context; - $request = $this->request; + $request = $this->request ?: $this->createRequest($pathinfo); $requestMethod = $canonicalMethod = $context->getMethod(); - $scheme = $context->getScheme(); if ('HEAD' === $requestMethod) { $canonicalMethod = 'GET'; } - - if ('/' === $pathinfo) { + if ('/' === $pathinfo && !$allow) { throw new Symfony\Component\Routing\Exception\NoConfigurationException(); } diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php index 5d7dca8e..23a93c19 100644 --- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php +++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php @@ -21,18 +21,16 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher $pathinfo = rawurldecode($rawPathinfo); $trimmedPathinfo = rtrim($pathinfo, '/'); $context = $this->context; - $request = $this->request; + $request = $this->request ?: $this->createRequest($pathinfo); $requestMethod = $canonicalMethod = $context->getMethod(); - $scheme = $context->getScheme(); if ('HEAD' === $requestMethod) { $canonicalMethod = 'GET'; } - if (0 === strpos($pathinfo, '/foo')) { // foo - if (preg_match('#^/foo/(?Pbaz|symfony)$#s', $pathinfo, $matches)) { + if (preg_match('#^/foo/(?Pbaz|symfony)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo')), array ( 'def' => 'test',)); } @@ -45,24 +43,26 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher elseif (0 === strpos($pathinfo, '/bar')) { // bar - if (preg_match('#^/bar/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + if (preg_match('#^/bar/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'bar')), array ()); + if (!in_array($canonicalMethod, array('GET', 'HEAD'))) { + $allow = array_merge($allow, array('GET', 'HEAD')); goto not_bar; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar')), array ()); + return $ret; } not_bar: // barhead - if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'barhead')), array ()); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); goto not_barhead; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'barhead')), array ()); + return $ret; } not_barhead: @@ -88,36 +88,38 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher } // baz4 - if (preg_match('#^/test/(?P[^/]++)/$#s', $pathinfo, $matches)) { + if (preg_match('#^/test/(?P[^/]++)/$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'baz4')), array ()); } // baz5 - if (preg_match('#^/test/(?P[^/]++)/$#s', $pathinfo, $matches)) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + if (preg_match('#^/test/(?P[^/]++)/$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz5')), array ()); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_baz5; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'baz5')), array ()); + return $ret; } not_baz5: // baz.baz6 - if (preg_match('#^/test/(?P[^/]++)/$#s', $pathinfo, $matches)) { - if ('PUT' !== $canonicalMethod) { - $allow[] = 'PUT'; + if (preg_match('#^/test/(?P[^/]++)/$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz.baz6')), array ()); + if (!in_array($requestMethod, array('PUT'))) { + $allow = array_merge($allow, array('PUT')); goto not_bazbaz6; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'baz.baz6')), array ()); + return $ret; } not_bazbaz6: } // quoter - if (preg_match('#^/(?P[\']+)$#s', $pathinfo, $matches)) { + if (preg_match('#^/(?P[\']+)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'quoter')), array ()); } @@ -129,30 +131,30 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher if (0 === strpos($pathinfo, '/a')) { if (0 === strpos($pathinfo, '/a/b\'b')) { // foo1 - if (preg_match('#^/a/b\'b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b\'b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo1')), array ()); } // bar1 - if (preg_match('#^/a/b\'b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b\'b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar1')), array ()); } } // overridden - if (preg_match('#^/a/(?P.*)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/(?P.*)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'overridden')), array ()); } if (0 === strpos($pathinfo, '/a/b\'b')) { // foo2 - if (preg_match('#^/a/b\'b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b\'b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo2')), array ()); } // bar2 - if (preg_match('#^/a/b\'b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b\'b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar2')), array ()); } @@ -162,7 +164,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher elseif (0 === strpos($pathinfo, '/multi')) { // helloWorld - if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P[^/]++))?$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P[^/]++))?$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'helloWorld')), array ( 'who' => 'World!',)); } @@ -179,12 +181,12 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher } // foo3 - if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo3')), array ()); } // bar3 - if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar3')), array ()); } @@ -195,7 +197,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher } // foo4 - if (preg_match('#^/aba/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/aba/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo4')), array ()); } @@ -203,7 +205,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher $host = $context->getHost(); - if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) { // route1 if ('/route1' === $pathinfo) { return array('_route' => 'route1'); @@ -216,7 +218,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher } - if (preg_match('#^b\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^b\\.example\\.com$#sDi', $host, $hostMatches)) { // route3 if ('/c2/route3' === $pathinfo) { return array('_route' => 'route3'); @@ -224,7 +226,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher } - if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) { // route4 if ('/route4' === $pathinfo) { return array('_route' => 'route4'); @@ -232,7 +234,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher } - if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) { // route5 if ('/route5' === $pathinfo) { return array('_route' => 'route5'); @@ -245,7 +247,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher return array('_route' => 'route6'); } - if (preg_match('#^(?P[^\\.]++)\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^(?P[^\\.]++)\\.example\\.com$#sDi', $host, $hostMatches)) { if (0 === strpos($pathinfo, '/route1')) { // route11 if ('/route11' === $pathinfo) { @@ -258,12 +260,12 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher } // route13 - if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($hostMatches, $matches, array('_route' => 'route13')), array ()); } // route14 - if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($hostMatches, $matches, array('_route' => 'route14')), array ( 'var1' => 'val',)); } @@ -271,16 +273,16 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher } - if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) { // route15 - if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'route15')), array ()); } } // route16 - if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'route16')), array ( 'var1' => 'val',)); } @@ -296,17 +298,21 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher if (0 === strpos($pathinfo, '/a/b')) { // b - if (preg_match('#^/a/b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'b')), array ()); } // c - if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'c')), array ()); } } + if ('/' === $pathinfo && !$allow) { + throw new Symfony\Component\Routing\Exception\NoConfigurationException(); + } + throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException(); } } diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php index 49ce082a..e430adb1 100644 --- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php +++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php @@ -21,18 +21,16 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec $pathinfo = rawurldecode($rawPathinfo); $trimmedPathinfo = rtrim($pathinfo, '/'); $context = $this->context; - $request = $this->request; + $request = $this->request ?: $this->createRequest($pathinfo); $requestMethod = $canonicalMethod = $context->getMethod(); - $scheme = $context->getScheme(); if ('HEAD' === $requestMethod) { $canonicalMethod = 'GET'; } - if (0 === strpos($pathinfo, '/foo')) { // foo - if (preg_match('#^/foo/(?Pbaz|symfony)$#s', $pathinfo, $matches)) { + if (preg_match('#^/foo/(?Pbaz|symfony)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo')), array ( 'def' => 'test',)); } @@ -45,24 +43,26 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec elseif (0 === strpos($pathinfo, '/bar')) { // bar - if (preg_match('#^/bar/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + if (preg_match('#^/bar/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'bar')), array ()); + if (!in_array($canonicalMethod, array('GET', 'HEAD'))) { + $allow = array_merge($allow, array('GET', 'HEAD')); goto not_bar; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar')), array ()); + return $ret; } not_bar: // barhead - if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'barhead')), array ()); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); goto not_barhead; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'barhead')), array ()); + return $ret; } not_barhead: @@ -83,51 +83,63 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec // baz3 if ('/test/baz3' === $trimmedPathinfo) { $ret = array('_route' => 'baz3'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_baz3; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'baz3')); } return $ret; } + not_baz3: } // baz4 - if (preg_match('#^/test/(?P[^/]++)/?$#s', $pathinfo, $matches)) { + if (preg_match('#^/test/(?P[^/]++)/?$#sD', $pathinfo, $matches)) { $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz4')), array ()); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_baz4; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'baz4')); } return $ret; } + not_baz4: // baz5 - if (preg_match('#^/test/(?P[^/]++)/$#s', $pathinfo, $matches)) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + if (preg_match('#^/test/(?P[^/]++)/$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz5')), array ()); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_baz5; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'baz5')), array ()); + return $ret; } not_baz5: // baz.baz6 - if (preg_match('#^/test/(?P[^/]++)/$#s', $pathinfo, $matches)) { - if ('PUT' !== $canonicalMethod) { - $allow[] = 'PUT'; + if (preg_match('#^/test/(?P[^/]++)/$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz.baz6')), array ()); + if (!in_array($requestMethod, array('PUT'))) { + $allow = array_merge($allow, array('PUT')); goto not_bazbaz6; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'baz.baz6')), array ()); + return $ret; } not_bazbaz6: } // quoter - if (preg_match('#^/(?P[\']+)$#s', $pathinfo, $matches)) { + if (preg_match('#^/(?P[\']+)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'quoter')), array ()); } @@ -139,30 +151,30 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec if (0 === strpos($pathinfo, '/a')) { if (0 === strpos($pathinfo, '/a/b\'b')) { // foo1 - if (preg_match('#^/a/b\'b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b\'b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo1')), array ()); } // bar1 - if (preg_match('#^/a/b\'b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b\'b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar1')), array ()); } } // overridden - if (preg_match('#^/a/(?P.*)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/(?P.*)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'overridden')), array ()); } if (0 === strpos($pathinfo, '/a/b\'b')) { // foo2 - if (preg_match('#^/a/b\'b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b\'b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo2')), array ()); } // bar2 - if (preg_match('#^/a/b\'b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b\'b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar2')), array ()); } @@ -172,19 +184,24 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec elseif (0 === strpos($pathinfo, '/multi')) { // helloWorld - if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P[^/]++))?$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P[^/]++))?$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'helloWorld')), array ( 'who' => 'World!',)); } // hey if ('/multi/hey' === $trimmedPathinfo) { $ret = array('_route' => 'hey'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_hey; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'hey')); } return $ret; } + not_hey: // overridden2 if ('/multi/new' === $pathinfo) { @@ -194,12 +211,12 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec } // foo3 - if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo3')), array ()); } // bar3 - if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar3')), array ()); } @@ -210,7 +227,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec } // foo4 - if (preg_match('#^/aba/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/aba/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo4')), array ()); } @@ -218,7 +235,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec $host = $context->getHost(); - if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) { // route1 if ('/route1' === $pathinfo) { return array('_route' => 'route1'); @@ -231,7 +248,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec } - if (preg_match('#^b\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^b\\.example\\.com$#sDi', $host, $hostMatches)) { // route3 if ('/c2/route3' === $pathinfo) { return array('_route' => 'route3'); @@ -239,7 +256,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec } - if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) { // route4 if ('/route4' === $pathinfo) { return array('_route' => 'route4'); @@ -247,7 +264,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec } - if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) { // route5 if ('/route5' === $pathinfo) { return array('_route' => 'route5'); @@ -260,7 +277,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec return array('_route' => 'route6'); } - if (preg_match('#^(?P[^\\.]++)\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^(?P[^\\.]++)\\.example\\.com$#sDi', $host, $hostMatches)) { if (0 === strpos($pathinfo, '/route1')) { // route11 if ('/route11' === $pathinfo) { @@ -273,12 +290,12 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec } // route13 - if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($hostMatches, $matches, array('_route' => 'route13')), array ()); } // route14 - if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($hostMatches, $matches, array('_route' => 'route14')), array ( 'var1' => 'val',)); } @@ -286,16 +303,16 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec } - if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) { + if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) { // route15 - if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'route15')), array ()); } } // route16 - if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'route16')), array ( 'var1' => 'val',)); } @@ -311,12 +328,12 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec if (0 === strpos($pathinfo, '/a/b')) { // b - if (preg_match('#^/a/b/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/a/b/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'b')), array ()); } // c - if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'c')), array ()); } @@ -326,23 +343,37 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec if ('/secure' === $pathinfo) { $ret = array('_route' => 'secure'); $requiredSchemes = array ( 'https' => 0,); - if (!isset($requiredSchemes[$scheme])) { + if (!isset($requiredSchemes[$context->getScheme()])) { + if ('GET' !== $canonicalMethod) { + goto not_secure; + } + return array_replace($ret, $this->redirect($rawPathinfo, 'secure', key($requiredSchemes))); } return $ret; } + not_secure: // nonsecure if ('/nonsecure' === $pathinfo) { $ret = array('_route' => 'nonsecure'); $requiredSchemes = array ( 'http' => 0,); - if (!isset($requiredSchemes[$scheme])) { + if (!isset($requiredSchemes[$context->getScheme()])) { + if ('GET' !== $canonicalMethod) { + goto not_nonsecure; + } + return array_replace($ret, $this->redirect($rawPathinfo, 'nonsecure', key($requiredSchemes))); } return $ret; } + not_nonsecure: + + if ('/' === $pathinfo && !$allow) { + throw new Symfony\Component\Routing\Exception\NoConfigurationException(); + } throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException(); } diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php index ae549563..67c46674 100644 --- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php +++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php @@ -21,15 +21,13 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher $pathinfo = rawurldecode($rawPathinfo); $trimmedPathinfo = rtrim($pathinfo, '/'); $context = $this->context; - $request = $this->request; + $request = $this->request ?: $this->createRequest($pathinfo); $requestMethod = $canonicalMethod = $context->getMethod(); - $scheme = $context->getScheme(); if ('HEAD' === $requestMethod) { $canonicalMethod = 'GET'; } - if (0 === strpos($pathinfo, '/rootprefix')) { // static if ('/rootprefix/test' === $pathinfo) { @@ -37,7 +35,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher } // dynamic - if (preg_match('#^/rootprefix/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/rootprefix/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'dynamic')), array ()); } @@ -48,6 +46,10 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher return array('_route' => 'with-condition'); } + if ('/' === $pathinfo && !$allow) { + throw new Symfony\Component\Routing\Exception\NoConfigurationException(); + } + throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException(); } } diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php index 50da489f..ed07194a 100644 --- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php +++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php @@ -21,84 +21,92 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher $pathinfo = rawurldecode($rawPathinfo); $trimmedPathinfo = rtrim($pathinfo, '/'); $context = $this->context; - $request = $this->request; + $request = $this->request ?: $this->createRequest($pathinfo); $requestMethod = $canonicalMethod = $context->getMethod(); - $scheme = $context->getScheme(); if ('HEAD' === $requestMethod) { $canonicalMethod = 'GET'; } - // just_head if ('/just_head' === $pathinfo) { - if ('HEAD' !== $requestMethod) { - $allow[] = 'HEAD'; + $ret = array('_route' => 'just_head'); + if (!in_array($requestMethod, array('HEAD'))) { + $allow = array_merge($allow, array('HEAD')); goto not_just_head; } - return array('_route' => 'just_head'); + return $ret; } not_just_head: // head_and_get if ('/head_and_get' === $pathinfo) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + $ret = array('_route' => 'head_and_get'); + if (!in_array($canonicalMethod, array('HEAD', 'GET'))) { + $allow = array_merge($allow, array('HEAD', 'GET')); goto not_head_and_get; } - return array('_route' => 'head_and_get'); + return $ret; } not_head_and_get: // get_and_head if ('/get_and_head' === $pathinfo) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + $ret = array('_route' => 'get_and_head'); + if (!in_array($canonicalMethod, array('GET', 'HEAD'))) { + $allow = array_merge($allow, array('GET', 'HEAD')); goto not_get_and_head; } - return array('_route' => 'get_and_head'); + return $ret; } not_get_and_head: // post_and_head - if ('/post_and_get' === $pathinfo) { + if ('/post_and_head' === $pathinfo) { + $ret = array('_route' => 'post_and_head'); if (!in_array($requestMethod, array('POST', 'HEAD'))) { $allow = array_merge($allow, array('POST', 'HEAD')); goto not_post_and_head; } - return array('_route' => 'post_and_head'); + return $ret; } not_post_and_head: if (0 === strpos($pathinfo, '/put_and_post')) { // put_and_post if ('/put_and_post' === $pathinfo) { + $ret = array('_route' => 'put_and_post'); if (!in_array($requestMethod, array('PUT', 'POST'))) { $allow = array_merge($allow, array('PUT', 'POST')); goto not_put_and_post; } - return array('_route' => 'put_and_post'); + return $ret; } not_put_and_post: // put_and_get_and_head if ('/put_and_post' === $pathinfo) { - if (!in_array($canonicalMethod, array('PUT', 'GET'))) { - $allow = array_merge($allow, array('PUT', 'GET')); + $ret = array('_route' => 'put_and_get_and_head'); + if (!in_array($canonicalMethod, array('PUT', 'GET', 'HEAD'))) { + $allow = array_merge($allow, array('PUT', 'GET', 'HEAD')); goto not_put_and_get_and_head; } - return array('_route' => 'put_and_get_and_head'); + return $ret; } not_put_and_get_and_head: } + if ('/' === $pathinfo && !$allow) { + throw new Symfony\Component\Routing\Exception\NoConfigurationException(); + } + throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException(); } } diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php index 51be5b0b..2b22513a 100644 --- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php +++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php @@ -21,15 +21,13 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec $pathinfo = rawurldecode($rawPathinfo); $trimmedPathinfo = rtrim($pathinfo, '/'); $context = $this->context; - $request = $this->request; + $request = $this->request ?: $this->createRequest($pathinfo); $requestMethod = $canonicalMethod = $context->getMethod(); - $scheme = $context->getScheme(); if ('HEAD' === $requestMethod) { $canonicalMethod = 'GET'; } - if (0 === strpos($pathinfo, '/a')) { // a_first if ('/a/11' === $pathinfo) { @@ -49,7 +47,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec } // a_wildcard - if (preg_match('#^/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (preg_match('#^/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'a_wildcard')), array ()); } @@ -57,37 +55,52 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec // a_fourth if ('/a/44' === $trimmedPathinfo) { $ret = array('_route' => 'a_fourth'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_a_fourth; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'a_fourth')); } return $ret; } + not_a_fourth: // a_fifth if ('/a/55' === $trimmedPathinfo) { $ret = array('_route' => 'a_fifth'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_a_fifth; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'a_fifth')); } return $ret; } + not_a_fifth: // a_sixth if ('/a/66' === $trimmedPathinfo) { $ret = array('_route' => 'a_sixth'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_a_sixth; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'a_sixth')); } return $ret; } + not_a_sixth: } // nested_wildcard - if (0 === strpos($pathinfo, '/nested') && preg_match('#^/nested/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/nested') && preg_match('#^/nested/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'nested_wildcard')), array ()); } @@ -95,32 +108,47 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec // nested_a if ('/nested/group/a' === $trimmedPathinfo) { $ret = array('_route' => 'nested_a'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_nested_a; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'nested_a')); } return $ret; } + not_nested_a: // nested_b if ('/nested/group/b' === $trimmedPathinfo) { $ret = array('_route' => 'nested_b'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_nested_b; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'nested_b')); } return $ret; } + not_nested_b: // nested_c if ('/nested/group/c' === $trimmedPathinfo) { $ret = array('_route' => 'nested_c'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_nested_c; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'nested_c')); } return $ret; } + not_nested_c: } @@ -128,35 +156,54 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec // slashed_a if ('/slashed/group' === $trimmedPathinfo) { $ret = array('_route' => 'slashed_a'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_slashed_a; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'slashed_a')); } return $ret; } + not_slashed_a: // slashed_b if ('/slashed/group/b' === $trimmedPathinfo) { $ret = array('_route' => 'slashed_b'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_slashed_b; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'slashed_b')); } return $ret; } + not_slashed_b: // slashed_c if ('/slashed/group/c' === $trimmedPathinfo) { $ret = array('_route' => 'slashed_c'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_slashed_c; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'slashed_c')); } return $ret; } + not_slashed_c: } + if ('/' === $pathinfo && !$allow) { + throw new Symfony\Component\Routing\Exception\NoConfigurationException(); + } + throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException(); } } diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php index 93352569..48ecdf81 100644 --- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php +++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php @@ -21,15 +21,13 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher $pathinfo = rawurldecode($rawPathinfo); $trimmedPathinfo = rtrim($pathinfo, '/'); $context = $this->context; - $request = $this->request; + $request = $this->request ?: $this->createRequest($pathinfo); $requestMethod = $canonicalMethod = $context->getMethod(); - $scheme = $context->getScheme(); if ('HEAD' === $requestMethod) { $canonicalMethod = 'GET'; } - if (0 === strpos($pathinfo, '/trailing/simple')) { // simple_trailing_slash_no_methods if ('/trailing/simple/no-methods/' === $pathinfo) { @@ -38,34 +36,37 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher // simple_trailing_slash_GET_method if ('/trailing/simple/get-method/' === $pathinfo) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + $ret = array('_route' => 'simple_trailing_slash_GET_method'); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); goto not_simple_trailing_slash_GET_method; } - return array('_route' => 'simple_trailing_slash_GET_method'); + return $ret; } not_simple_trailing_slash_GET_method: // simple_trailing_slash_HEAD_method if ('/trailing/simple/head-method/' === $pathinfo) { - if ('HEAD' !== $requestMethod) { - $allow[] = 'HEAD'; + $ret = array('_route' => 'simple_trailing_slash_HEAD_method'); + if (!in_array($requestMethod, array('HEAD'))) { + $allow = array_merge($allow, array('HEAD')); goto not_simple_trailing_slash_HEAD_method; } - return array('_route' => 'simple_trailing_slash_HEAD_method'); + return $ret; } not_simple_trailing_slash_HEAD_method: // simple_trailing_slash_POST_method if ('/trailing/simple/post-method/' === $pathinfo) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + $ret = array('_route' => 'simple_trailing_slash_POST_method'); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_simple_trailing_slash_POST_method; } - return array('_route' => 'simple_trailing_slash_POST_method'); + return $ret; } not_simple_trailing_slash_POST_method: @@ -73,40 +74,43 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher elseif (0 === strpos($pathinfo, '/trailing/regex')) { // regex_trailing_slash_no_methods - if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P[^/]++)/$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P[^/]++)/$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_no_methods')), array ()); } // regex_trailing_slash_GET_method - if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P[^/]++)/$#s', $pathinfo, $matches)) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P[^/]++)/$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_GET_method')), array ()); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); goto not_regex_trailing_slash_GET_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_GET_method')), array ()); + return $ret; } not_regex_trailing_slash_GET_method: // regex_trailing_slash_HEAD_method - if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P[^/]++)/$#s', $pathinfo, $matches)) { - if ('HEAD' !== $requestMethod) { - $allow[] = 'HEAD'; + if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P[^/]++)/$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_HEAD_method')), array ()); + if (!in_array($requestMethod, array('HEAD'))) { + $allow = array_merge($allow, array('HEAD')); goto not_regex_trailing_slash_HEAD_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_HEAD_method')), array ()); + return $ret; } not_regex_trailing_slash_HEAD_method: // regex_trailing_slash_POST_method - if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P[^/]++)/$#s', $pathinfo, $matches)) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P[^/]++)/$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_POST_method')), array ()); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_regex_trailing_slash_POST_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_POST_method')), array ()); + return $ret; } not_regex_trailing_slash_POST_method: @@ -120,34 +124,37 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher // simple_not_trailing_slash_GET_method if ('/not-trailing/simple/get-method' === $pathinfo) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + $ret = array('_route' => 'simple_not_trailing_slash_GET_method'); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); goto not_simple_not_trailing_slash_GET_method; } - return array('_route' => 'simple_not_trailing_slash_GET_method'); + return $ret; } not_simple_not_trailing_slash_GET_method: // simple_not_trailing_slash_HEAD_method if ('/not-trailing/simple/head-method' === $pathinfo) { - if ('HEAD' !== $requestMethod) { - $allow[] = 'HEAD'; + $ret = array('_route' => 'simple_not_trailing_slash_HEAD_method'); + if (!in_array($requestMethod, array('HEAD'))) { + $allow = array_merge($allow, array('HEAD')); goto not_simple_not_trailing_slash_HEAD_method; } - return array('_route' => 'simple_not_trailing_slash_HEAD_method'); + return $ret; } not_simple_not_trailing_slash_HEAD_method: // simple_not_trailing_slash_POST_method if ('/not-trailing/simple/post-method' === $pathinfo) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + $ret = array('_route' => 'simple_not_trailing_slash_POST_method'); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_simple_not_trailing_slash_POST_method; } - return array('_route' => 'simple_not_trailing_slash_POST_method'); + return $ret; } not_simple_not_trailing_slash_POST_method: @@ -155,45 +162,52 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher elseif (0 === strpos($pathinfo, '/not-trailing/regex')) { // regex_not_trailing_slash_no_methods - if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_no_methods')), array ()); } // regex_not_trailing_slash_GET_method - if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_GET_method')), array ()); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); goto not_regex_not_trailing_slash_GET_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_GET_method')), array ()); + return $ret; } not_regex_not_trailing_slash_GET_method: // regex_not_trailing_slash_HEAD_method - if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('HEAD' !== $requestMethod) { - $allow[] = 'HEAD'; + if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_HEAD_method')), array ()); + if (!in_array($requestMethod, array('HEAD'))) { + $allow = array_merge($allow, array('HEAD')); goto not_regex_not_trailing_slash_HEAD_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_HEAD_method')), array ()); + return $ret; } not_regex_not_trailing_slash_HEAD_method: // regex_not_trailing_slash_POST_method - if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_POST_method')), array ()); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_regex_not_trailing_slash_POST_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_POST_method')), array ()); + return $ret; } not_regex_not_trailing_slash_POST_method: } + if ('/' === $pathinfo && !$allow) { + throw new Symfony\Component\Routing\Exception\NoConfigurationException(); + } + throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException(); } } diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php index bceee6f3..81d76ea4 100644 --- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php +++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php @@ -21,36 +21,43 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec $pathinfo = rawurldecode($rawPathinfo); $trimmedPathinfo = rtrim($pathinfo, '/'); $context = $this->context; - $request = $this->request; + $request = $this->request ?: $this->createRequest($pathinfo); $requestMethod = $canonicalMethod = $context->getMethod(); - $scheme = $context->getScheme(); if ('HEAD' === $requestMethod) { $canonicalMethod = 'GET'; } - if (0 === strpos($pathinfo, '/trailing/simple')) { // simple_trailing_slash_no_methods if ('/trailing/simple/no-methods' === $trimmedPathinfo) { $ret = array('_route' => 'simple_trailing_slash_no_methods'); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_simple_trailing_slash_no_methods; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_no_methods')); } return $ret; } + not_simple_trailing_slash_no_methods: // simple_trailing_slash_GET_method if ('/trailing/simple/get-method' === $trimmedPathinfo) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + $ret = array('_route' => 'simple_trailing_slash_GET_method'); + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { goto not_simple_trailing_slash_GET_method; + } else { + return array_replace($ret, $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_GET_method')); } - $ret = array('_route' => 'simple_trailing_slash_GET_method'); - if (substr($pathinfo, -1) !== '/') { - return array_replace($ret, $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_GET_method')); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); + goto not_simple_trailing_slash_GET_method; } return $ret; @@ -58,15 +65,11 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec not_simple_trailing_slash_GET_method: // simple_trailing_slash_HEAD_method - if ('/trailing/simple/head-method' === $trimmedPathinfo) { - if ('HEAD' !== $requestMethod) { - $allow[] = 'HEAD'; - goto not_simple_trailing_slash_HEAD_method; - } - + if ('/trailing/simple/head-method/' === $pathinfo) { $ret = array('_route' => 'simple_trailing_slash_HEAD_method'); - if (substr($pathinfo, -1) !== '/') { - return array_replace($ret, $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_HEAD_method')); + if (!in_array($requestMethod, array('HEAD'))) { + $allow = array_merge($allow, array('HEAD')); + goto not_simple_trailing_slash_HEAD_method; } return $ret; @@ -75,12 +78,13 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec // simple_trailing_slash_POST_method if ('/trailing/simple/post-method/' === $pathinfo) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + $ret = array('_route' => 'simple_trailing_slash_POST_method'); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_simple_trailing_slash_POST_method; } - return array('_route' => 'simple_trailing_slash_POST_method'); + return $ret; } not_simple_trailing_slash_POST_method: @@ -88,25 +92,34 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec elseif (0 === strpos($pathinfo, '/trailing/regex')) { // regex_trailing_slash_no_methods - if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P[^/]++)/?$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P[^/]++)/?$#sD', $pathinfo, $matches)) { $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_no_methods')), array ()); - if (substr($pathinfo, -1) !== '/') { + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { + goto not_regex_trailing_slash_no_methods; + } else { return array_replace($ret, $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_no_methods')); } return $ret; } + not_regex_trailing_slash_no_methods: // regex_trailing_slash_GET_method - if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P[^/]++)/?$#s', $pathinfo, $matches)) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P[^/]++)/?$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_GET_method')), array ()); + if ('/' === substr($pathinfo, -1)) { + // no-op + } elseif ('GET' !== $canonicalMethod) { goto not_regex_trailing_slash_GET_method; + } else { + return array_replace($ret, $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_GET_method')); } - $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_GET_method')), array ()); - if (substr($pathinfo, -1) !== '/') { - return array_replace($ret, $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_GET_method')); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); + goto not_regex_trailing_slash_GET_method; } return $ret; @@ -114,15 +127,11 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec not_regex_trailing_slash_GET_method: // regex_trailing_slash_HEAD_method - if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P[^/]++)/?$#s', $pathinfo, $matches)) { - if ('HEAD' !== $requestMethod) { - $allow[] = 'HEAD'; - goto not_regex_trailing_slash_HEAD_method; - } - + if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P[^/]++)/$#sD', $pathinfo, $matches)) { $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_HEAD_method')), array ()); - if (substr($pathinfo, -1) !== '/') { - return array_replace($ret, $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_HEAD_method')); + if (!in_array($requestMethod, array('HEAD'))) { + $allow = array_merge($allow, array('HEAD')); + goto not_regex_trailing_slash_HEAD_method; } return $ret; @@ -130,13 +139,14 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec not_regex_trailing_slash_HEAD_method: // regex_trailing_slash_POST_method - if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P[^/]++)/$#s', $pathinfo, $matches)) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P[^/]++)/$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_POST_method')), array ()); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_regex_trailing_slash_POST_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_POST_method')), array ()); + return $ret; } not_regex_trailing_slash_POST_method: @@ -150,34 +160,37 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec // simple_not_trailing_slash_GET_method if ('/not-trailing/simple/get-method' === $pathinfo) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + $ret = array('_route' => 'simple_not_trailing_slash_GET_method'); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); goto not_simple_not_trailing_slash_GET_method; } - return array('_route' => 'simple_not_trailing_slash_GET_method'); + return $ret; } not_simple_not_trailing_slash_GET_method: // simple_not_trailing_slash_HEAD_method if ('/not-trailing/simple/head-method' === $pathinfo) { - if ('HEAD' !== $requestMethod) { - $allow[] = 'HEAD'; + $ret = array('_route' => 'simple_not_trailing_slash_HEAD_method'); + if (!in_array($requestMethod, array('HEAD'))) { + $allow = array_merge($allow, array('HEAD')); goto not_simple_not_trailing_slash_HEAD_method; } - return array('_route' => 'simple_not_trailing_slash_HEAD_method'); + return $ret; } not_simple_not_trailing_slash_HEAD_method: // simple_not_trailing_slash_POST_method if ('/not-trailing/simple/post-method' === $pathinfo) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + $ret = array('_route' => 'simple_not_trailing_slash_POST_method'); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_simple_not_trailing_slash_POST_method; } - return array('_route' => 'simple_not_trailing_slash_POST_method'); + return $ret; } not_simple_not_trailing_slash_POST_method: @@ -185,45 +198,52 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec elseif (0 === strpos($pathinfo, '/not-trailing/regex')) { // regex_not_trailing_slash_no_methods - if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P[^/]++)$#s', $pathinfo, $matches)) { + if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P[^/]++)$#sD', $pathinfo, $matches)) { return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_no_methods')), array ()); } // regex_not_trailing_slash_GET_method - if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('GET' !== $canonicalMethod) { - $allow[] = 'GET'; + if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_GET_method')), array ()); + if (!in_array($canonicalMethod, array('GET'))) { + $allow = array_merge($allow, array('GET')); goto not_regex_not_trailing_slash_GET_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_GET_method')), array ()); + return $ret; } not_regex_not_trailing_slash_GET_method: // regex_not_trailing_slash_HEAD_method - if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('HEAD' !== $requestMethod) { - $allow[] = 'HEAD'; + if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_HEAD_method')), array ()); + if (!in_array($requestMethod, array('HEAD'))) { + $allow = array_merge($allow, array('HEAD')); goto not_regex_not_trailing_slash_HEAD_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_HEAD_method')), array ()); + return $ret; } not_regex_not_trailing_slash_HEAD_method: // regex_not_trailing_slash_POST_method - if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P[^/]++)$#s', $pathinfo, $matches)) { - if ('POST' !== $canonicalMethod) { - $allow[] = 'POST'; + if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P[^/]++)$#sD', $pathinfo, $matches)) { + $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_POST_method')), array ()); + if (!in_array($requestMethod, array('POST'))) { + $allow = array_merge($allow, array('POST')); goto not_regex_not_trailing_slash_POST_method; } - return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_POST_method')), array ()); + return $ret; } not_regex_not_trailing_slash_POST_method: } + if ('/' === $pathinfo && !$allow) { + throw new Symfony\Component\Routing\Exception\NoConfigurationException(); + } + throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException(); } } diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/bar.xml b/vendor/symfony/routing/Tests/Fixtures/glob/bar.xml new file mode 100644 index 00000000..0d31eeb1 --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/bar.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/bar.yml b/vendor/symfony/routing/Tests/Fixtures/glob/bar.yml new file mode 100644 index 00000000..ba3bc229 --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/bar.yml @@ -0,0 +1,4 @@ +bar_route: + path: /bar + defaults: + _controller: AppBundle:Bar:view diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/baz.xml b/vendor/symfony/routing/Tests/Fixtures/glob/baz.xml new file mode 100644 index 00000000..3abba1ac --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/baz.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/baz.yml b/vendor/symfony/routing/Tests/Fixtures/glob/baz.yml new file mode 100644 index 00000000..f7d8c67f --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/baz.yml @@ -0,0 +1,4 @@ +baz_route: + path: /baz + defaults: + _controller: AppBundle:Baz:view diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/import_multiple.xml b/vendor/symfony/routing/Tests/Fixtures/glob/import_multiple.xml new file mode 100644 index 00000000..ca6b1b5a --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/import_multiple.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/import_multiple.yml b/vendor/symfony/routing/Tests/Fixtures/glob/import_multiple.yml new file mode 100644 index 00000000..d1ae5854 --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/import_multiple.yml @@ -0,0 +1,2 @@ +_static: + resource: ba?.yml diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/import_single.xml b/vendor/symfony/routing/Tests/Fixtures/glob/import_single.xml new file mode 100644 index 00000000..15f5698c --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/import_single.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/import_single.yml b/vendor/symfony/routing/Tests/Fixtures/glob/import_single.yml new file mode 100644 index 00000000..f56ddbd0 --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/import_single.yml @@ -0,0 +1,2 @@ +_static: + resource: b?r.yml diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/php_dsl.php b/vendor/symfony/routing/Tests/Fixtures/glob/php_dsl.php new file mode 100644 index 00000000..897fa11f --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/php_dsl.php @@ -0,0 +1,7 @@ +import('php_dsl_ba?.php'); +}; diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/php_dsl_bar.php b/vendor/symfony/routing/Tests/Fixtures/glob/php_dsl_bar.php new file mode 100644 index 00000000..e2b91b17 --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/php_dsl_bar.php @@ -0,0 +1,12 @@ +collection(); + + $collection->add('bar_route', '/bar') + ->defaults(array('_controller' => 'AppBundle:Bar:view')); + + return $collection; +}; diff --git a/vendor/symfony/routing/Tests/Fixtures/glob/php_dsl_baz.php b/vendor/symfony/routing/Tests/Fixtures/glob/php_dsl_baz.php new file mode 100644 index 00000000..ca8f188a --- /dev/null +++ b/vendor/symfony/routing/Tests/Fixtures/glob/php_dsl_baz.php @@ -0,0 +1,12 @@ +collection(); + + $collection->add('baz_route', '/baz') + ->defaults(array('_controller' => 'AppBundle:Baz:view')); + + return $collection; +}; diff --git a/vendor/symfony/routing/Tests/Fixtures/php_dsl.php b/vendor/symfony/routing/Tests/Fixtures/php_dsl.php index 04f6d7ed..0780c9fa 100644 --- a/vendor/symfony/routing/Tests/Fixtures/php_dsl.php +++ b/vendor/symfony/routing/Tests/Fixtures/php_dsl.php @@ -4,6 +4,7 @@ namespace Symfony\Component\Routing\Loader\Configurator; return function (RoutingConfigurator $routes) { $routes + ->collection() ->add('foo', '/foo') ->condition('abc') ->options(array('utf8' => true)) diff --git a/vendor/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php b/vendor/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php index 70db1ccd..32e40129 100644 --- a/vendor/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php +++ b/vendor/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php @@ -191,9 +191,9 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest ); $this->reader - ->expects($this->exactly(2)) - ->method('getClassAnnotation') - ->will($this->returnValue($this->getAnnotatedRoute($classRouteData))) + ->expects($this->exactly(1)) + ->method('getClassAnnotations') + ->will($this->returnValue(array($this->getAnnotatedRoute($classRouteData)))) ; $this->reader ->expects($this->once()) @@ -205,8 +205,49 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest $route = $routeCollection->get($classRouteData['name']); $this->assertSame($classRouteData['path'], $route->getPath(), '->load preserves class route path'); - $this->assertEquals(array_merge($classRouteData['schemes'], $classRouteData['schemes']), $route->getSchemes(), '->load preserves class route schemes'); - $this->assertEquals(array_merge($classRouteData['methods'], $classRouteData['methods']), $route->getMethods(), '->load preserves class route methods'); + $this->assertEquals($classRouteData['schemes'], $route->getSchemes(), '->load preserves class route schemes'); + $this->assertEquals($classRouteData['methods'], $route->getMethods(), '->load preserves class route methods'); + } + + public function testInvokableClassMultipleRouteLoad() + { + $classRouteData1 = array( + 'name' => 'route1', + 'path' => '/1', + 'schemes' => array('https'), + 'methods' => array('GET'), + ); + + $classRouteData2 = array( + 'name' => 'route2', + 'path' => '/2', + 'schemes' => array('https'), + 'methods' => array('GET'), + ); + + $this->reader + ->expects($this->exactly(1)) + ->method('getClassAnnotations') + ->will($this->returnValue(array($this->getAnnotatedRoute($classRouteData1), $this->getAnnotatedRoute($classRouteData2)))) + ; + $this->reader + ->expects($this->once()) + ->method('getMethodAnnotations') + ->will($this->returnValue(array())) + ; + + $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass'); + $route = $routeCollection->get($classRouteData1['name']); + + $this->assertSame($classRouteData1['path'], $route->getPath(), '->load preserves class route path'); + $this->assertEquals($classRouteData1['schemes'], $route->getSchemes(), '->load preserves class route schemes'); + $this->assertEquals($classRouteData1['methods'], $route->getMethods(), '->load preserves class route methods'); + + $route = $routeCollection->get($classRouteData2['name']); + + $this->assertSame($classRouteData2['path'], $route->getPath(), '->load preserves class route path'); + $this->assertEquals($classRouteData2['schemes'], $route->getSchemes(), '->load preserves class route schemes'); + $this->assertEquals($classRouteData2['methods'], $route->getMethods(), '->load preserves class route methods'); } public function testInvokableClassWithMethodRouteLoad() diff --git a/vendor/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/vendor/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php index 1e8ee394..8a6668e0 100644 --- a/vendor/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php +++ b/vendor/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php @@ -29,7 +29,7 @@ class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest public function testLoad() { - $this->reader->expects($this->exactly(4))->method('getClassAnnotation'); + $this->reader->expects($this->exactly(3))->method('getClassAnnotation'); $this->reader ->expects($this->any()) @@ -37,6 +37,12 @@ class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest ->will($this->returnValue(array())) ; + $this->reader + ->expects($this->any()) + ->method('getClassAnnotations') + ->will($this->returnValue(array())) + ; + $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses'); } @@ -45,7 +51,6 @@ class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest $this->expectAnnotationsToBeReadFrom(array( 'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass', 'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass', - 'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass', 'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\FooClass', )); @@ -55,6 +60,12 @@ class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest ->will($this->returnValue(array())) ; + $this->reader + ->expects($this->any()) + ->method('getClassAnnotations') + ->will($this->returnValue(array())) + ; + $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses'); } diff --git a/vendor/symfony/routing/Tests/Loader/GlobFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/GlobFileLoaderTest.php new file mode 100644 index 00000000..08d806a8 --- /dev/null +++ b/vendor/symfony/routing/Tests/Loader/GlobFileLoaderTest.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Routing\Tests\Loader; + +use PHPUnit\Framework\TestCase; +use Symfony\Component\Config\Resource\GlobResource; +use Symfony\Component\Config\FileLocator; +use Symfony\Component\Routing\Loader\GlobFileLoader; +use Symfony\Component\Routing\RouteCollection; + +class GlobFileLoaderTest extends TestCase +{ + public function testSupports() + { + $loader = new GlobFileLoader(new FileLocator()); + + $this->assertTrue($loader->supports('any-path', 'glob'), '->supports() returns true if the resource has the glob type'); + $this->assertFalse($loader->supports('any-path'), '->supports() returns false if the resource is not of glob type'); + } + + public function testLoadAddsTheGlobResourceToTheContainer() + { + $loader = new GlobFileLoaderWithoutImport(new FileLocator()); + $collection = $loader->load(__DIR__.'/../Fixtures/directory/*.yml'); + + $this->assertEquals(new GlobResource(__DIR__.'/../Fixtures/directory', '/*.yml', false), $collection->getResources()[0]); + } +} + +class GlobFileLoaderWithoutImport extends GlobFileLoader +{ + public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null) + { + return new RouteCollection(); + } +} diff --git a/vendor/symfony/routing/Tests/Loader/PhpFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/PhpFileLoaderTest.php index 608d84ed..0dcf5d49 100644 --- a/vendor/symfony/routing/Tests/Loader/PhpFileLoaderTest.php +++ b/vendor/symfony/routing/Tests/Loader/PhpFileLoaderTest.php @@ -117,4 +117,17 @@ class PhpFileLoaderTest extends TestCase $this->assertEquals($expectedCollection, $routeCollection); } + + public function testRoutingConfiguratorCanImportGlobPatterns() + { + $locator = new FileLocator(array(__DIR__.'/../Fixtures/glob')); + $loader = new PhpFileLoader($locator); + $routeCollection = $loader->load('php_dsl.php'); + + $route = $routeCollection->get('bar_route'); + $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller')); + + $route = $routeCollection->get('baz_route'); + $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller')); + } } diff --git a/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php index 221434b0..21fc3400 100644 --- a/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php +++ b/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php @@ -361,4 +361,25 @@ class XmlFileLoaderTest extends TestCase $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller'))); $loader->load('import_override_defaults.xml'); } + + public function testImportRouteWithGlobMatchingSingleFile() + { + $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/glob'))); + $routeCollection = $loader->load('import_single.xml'); + + $route = $routeCollection->get('bar_route'); + $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller')); + } + + public function testImportRouteWithGlobMatchingMultipleFiles() + { + $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/glob'))); + $routeCollection = $loader->load('import_multiple.xml'); + + $route = $routeCollection->get('bar_route'); + $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller')); + + $route = $routeCollection->get('baz_route'); + $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller')); + } } diff --git a/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php index 1f7fd438..822bddf1 100644 --- a/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php +++ b/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php @@ -182,4 +182,25 @@ class YamlFileLoaderTest extends TestCase $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller'))); $loader->load('import_override_defaults.yml'); } + + public function testImportRouteWithGlobMatchingSingleFile() + { + $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/glob'))); + $routeCollection = $loader->load('import_single.yml'); + + $route = $routeCollection->get('bar_route'); + $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller')); + } + + public function testImportRouteWithGlobMatchingMultipleFiles() + { + $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/glob'))); + $routeCollection = $loader->load('import_multiple.yml'); + + $route = $routeCollection->get('bar_route'); + $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller')); + + $route = $routeCollection->get('baz_route'); + $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller')); + } } diff --git a/vendor/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php b/vendor/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php new file mode 100644 index 00000000..cfbb524d --- /dev/null +++ b/vendor/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Routing\Tests\Matcher; + +use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper; +use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface; +use Symfony\Component\Routing\Matcher\UrlMatcher; +use Symfony\Component\Routing\RouteCollection; +use Symfony\Component\Routing\RequestContext; + +class DumpedRedirectableUrlMatcherTest extends RedirectableUrlMatcherTest +{ + protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) + { + static $i = 0; + + $class = 'DumpedRedirectableUrlMatcher'.++$i; + $dumper = new PhpMatcherDumper($routes); + eval('?>'.$dumper->dump(array('class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher'))); + + return $this->getMockBuilder($class) + ->setConstructorArgs(array($context ?: new RequestContext())) + ->setMethods(array('redirect')) + ->getMock(); + } +} + +class TestDumpedRedirectableUrlMatcher extends UrlMatcher implements RedirectableUrlMatcherInterface +{ + public function redirect($path, $route, $scheme = null) + { + return array(); + } +} diff --git a/vendor/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php b/vendor/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php new file mode 100644 index 00000000..880b2b13 --- /dev/null +++ b/vendor/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php @@ -0,0 +1,48 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Routing\Tests\Matcher; + +use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper; +use Symfony\Component\Routing\RouteCollection; +use Symfony\Component\Routing\RequestContext; + +class DumpedUrlMatcherTest extends UrlMatcherTest +{ + /** + * @expectedException \LogicException + * @expectedExceptionMessage The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface. + */ + public function testSchemeRequirement() + { + parent::testSchemeRequirement(); + } + + /** + * @expectedException \LogicException + * @expectedExceptionMessage The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface. + */ + public function testSchemeAndMethodMismatch() + { + parent::testSchemeRequirement(); + } + + protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) + { + static $i = 0; + + $class = 'DumpedUrlMatcher'.++$i; + $dumper = new PhpMatcherDumper($routes); + eval('?>'.$dumper->dump(array('class' => $class))); + + return new $class($context ?: new RequestContext()); + } +} diff --git a/vendor/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/vendor/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php index e4c18c47..f29a6d6a 100644 --- a/vendor/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php +++ b/vendor/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php @@ -354,7 +354,7 @@ class PhpMatcherDumperTest extends TestCase array('GET', 'HEAD') )); $headMatchCasesCollection->add('post_and_head', new Route( - '/post_and_get', + '/post_and_head', array(), array(), array(), diff --git a/vendor/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php b/vendor/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php index 0948e002..7984391e 100644 --- a/vendor/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php +++ b/vendor/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php @@ -11,19 +11,18 @@ namespace Symfony\Component\Routing\Tests\Matcher; -use PHPUnit\Framework\TestCase; use Symfony\Component\Routing\Route; use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\RequestContext; -class RedirectableUrlMatcherTest extends TestCase +class RedirectableUrlMatcherTest extends UrlMatcherTest { - public function testRedirectWhenNoSlash() + public function testMissingTrailingSlash() { $coll = new RouteCollection(); $coll->add('foo', new Route('/foo/')); - $matcher = $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($coll, new RequestContext())); + $matcher = $this->getUrlMatcher($coll); $matcher->expects($this->once())->method('redirect')->will($this->returnValue(array())); $matcher->match('/foo'); } @@ -38,7 +37,7 @@ class RedirectableUrlMatcherTest extends TestCase $context = new RequestContext(); $context->setMethod('POST'); - $matcher = $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($coll, $context)); + $matcher = $this->getUrlMatcher($coll, $context); $matcher->match('/foo'); } @@ -47,7 +46,7 @@ class RedirectableUrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('FTP', 'HTTPS'))); - $matcher = $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($coll, new RequestContext())); + $matcher = $this->getUrlMatcher($coll); $matcher ->expects($this->once()) ->method('redirect') @@ -57,12 +56,12 @@ class RedirectableUrlMatcherTest extends TestCase $matcher->match('/foo'); } - public function testNoSchemaRedirectIfOnOfMultipleSchemesMatches() + public function testNoSchemaRedirectIfOneOfMultipleSchemesMatches() { $coll = new RouteCollection(); $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https', 'http'))); - $matcher = $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($coll, new RequestContext())); + $matcher = $this->getUrlMatcher($coll); $matcher ->expects($this->never()) ->method('redirect'); @@ -74,7 +73,7 @@ class RedirectableUrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/foo/{bar}', array(), array(), array(), '', array('https'))); - $matcher = $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($coll, new RequestContext())); + $matcher = $this->getUrlMatcher($coll); $matcher ->expects($this->once()) ->method('redirect') @@ -89,7 +88,7 @@ class RedirectableUrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/foo/{bar}/')); - $matcher = $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($coll, new RequestContext())); + $matcher = $this->getUrlMatcher($coll); $matcher ->expects($this->once()) ->method('redirect') @@ -104,8 +103,22 @@ class RedirectableUrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/foo:bar/')); - $matcher = $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($coll, new RequestContext())); + $matcher = $this->getUrlMatcher($coll); $matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/')->willReturn(array()); $matcher->match('/foo%3Abar'); } + + public function testSchemeRequirement() + { + $coll = new RouteCollection(); + $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https'))); + $matcher = $this->getUrlMatcher($coll, new RequestContext()); + $matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn(array()); + $this->assertSame(array('_route' => 'foo'), $matcher->match('/foo')); + } + + protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) + { + return $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($routes, $context ?: new RequestContext())); + } } diff --git a/vendor/symfony/routing/Tests/Matcher/UrlMatcherTest.php b/vendor/symfony/routing/Tests/Matcher/UrlMatcherTest.php index 8545c2c2..e8d31e22 100644 --- a/vendor/symfony/routing/Tests/Matcher/UrlMatcherTest.php +++ b/vendor/symfony/routing/Tests/Matcher/UrlMatcherTest.php @@ -26,7 +26,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/foo')); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $this->assertInternalType('array', $matcher->match('/foo')); } @@ -35,7 +35,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('post'))); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); try { $matcher->match('/foo'); @@ -45,12 +45,27 @@ class UrlMatcherTest extends TestCase } } + public function testMethodNotAllowedOnRoot() + { + $coll = new RouteCollection(); + $coll->add('foo', new Route('/', array(), array(), array(), '', array(), array('GET'))); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST')); + + try { + $matcher->match('/'); + $this->fail(); + } catch (MethodNotAllowedException $e) { + $this->assertEquals(array('GET'), $e->getAllowedMethods()); + } + } + public function testHeadAllowedWhenRequirementContainsGet() { $coll = new RouteCollection(); $coll->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('get'))); - $matcher = new UrlMatcher($coll, new RequestContext('', 'head')); + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'head')); $this->assertInternalType('array', $matcher->match('/foo')); } @@ -60,7 +75,7 @@ class UrlMatcherTest extends TestCase $coll->add('foo1', new Route('/foo', array(), array(), array(), '', array(), array('post'))); $coll->add('foo2', new Route('/foo', array(), array(), array(), '', array(), array('put', 'delete'))); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); try { $matcher->match('/foo'); @@ -75,7 +90,7 @@ class UrlMatcherTest extends TestCase // test the patterns are matched and parameters are returned $collection = new RouteCollection(); $collection->add('foo', new Route('/foo/{bar}')); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); try { $matcher->match('/no-match'); $this->fail(); @@ -86,17 +101,17 @@ class UrlMatcherTest extends TestCase // test that defaults are merged $collection = new RouteCollection(); $collection->add('foo', new Route('/foo/{bar}', array('def' => 'test'))); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'def' => 'test'), $matcher->match('/foo/baz')); // test that route "method" is ignored if no method is given in the context $collection = new RouteCollection(); $collection->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('get', 'head'))); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertInternalType('array', $matcher->match('/foo')); // route does not match with POST method context - $matcher = new UrlMatcher($collection, new RequestContext('', 'post')); + $matcher = $this->getUrlMatcher($collection, new RequestContext('', 'post')); try { $matcher->match('/foo'); $this->fail(); @@ -104,28 +119,28 @@ class UrlMatcherTest extends TestCase } // route does match with GET or HEAD method context - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertInternalType('array', $matcher->match('/foo')); - $matcher = new UrlMatcher($collection, new RequestContext('', 'head')); + $matcher = $this->getUrlMatcher($collection, new RequestContext('', 'head')); $this->assertInternalType('array', $matcher->match('/foo')); // route with an optional variable as the first segment $collection = new RouteCollection(); $collection->add('bar', new Route('/{bar}/foo', array('bar' => 'bar'), array('bar' => 'foo|bar'))); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_route' => 'bar', 'bar' => 'bar'), $matcher->match('/bar/foo')); $this->assertEquals(array('_route' => 'bar', 'bar' => 'foo'), $matcher->match('/foo/foo')); $collection = new RouteCollection(); $collection->add('bar', new Route('/{bar}', array('bar' => 'bar'), array('bar' => 'foo|bar'))); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_route' => 'bar', 'bar' => 'foo'), $matcher->match('/foo')); $this->assertEquals(array('_route' => 'bar', 'bar' => 'bar'), $matcher->match('/')); // route with only optional variables $collection = new RouteCollection(); $collection->add('bar', new Route('/{foo}/{bar}', array('foo' => 'foo', 'bar' => 'bar'), array())); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_route' => 'bar', 'foo' => 'foo', 'bar' => 'bar'), $matcher->match('/')); $this->assertEquals(array('_route' => 'bar', 'foo' => 'a', 'bar' => 'bar'), $matcher->match('/a')); $this->assertEquals(array('_route' => 'bar', 'foo' => 'a', 'bar' => 'b'), $matcher->match('/a/b')); @@ -138,7 +153,7 @@ class UrlMatcherTest extends TestCase $collection->addPrefix('/b'); $collection->addPrefix('/a'); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_route' => 'foo', 'foo' => 'foo'), $matcher->match('/a/b/foo')); } @@ -149,7 +164,7 @@ class UrlMatcherTest extends TestCase $collection->addPrefix('/b'); $collection->addPrefix('/{_locale}'); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_locale' => 'fr', '_route' => 'foo', 'foo' => 'foo'), $matcher->match('/fr/b/foo')); } @@ -158,17 +173,29 @@ class UrlMatcherTest extends TestCase $collection = new RouteCollection(); $collection->add('$péß^a|', new Route('/bar')); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_route' => '$péß^a|'), $matcher->match('/bar')); } + /** + * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException + */ + public function testTrailingEncodedNewlineIsNotOverlooked() + { + $collection = new RouteCollection(); + $collection->add('foo', new Route('/foo')); + + $matcher = $this->getUrlMatcher($collection); + $matcher->match('/foo%0a'); + } + public function testMatchNonAlpha() { $collection = new RouteCollection(); $chars = '!"$%éà &\'()*+,./:;<=>@ABCDEFGHIJKLMNOPQRSTUVWXYZ\\[]^_`abcdefghijklmnopqrstuvwxyz{|}~-'; $collection->add('foo', new Route('/{foo}/bar', array(), array('foo' => '['.preg_quote($chars).']+'), array('utf8' => true))); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.rawurlencode($chars).'/bar')); $this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.strtr($chars, array('%' => '%25')).'/bar')); } @@ -178,7 +205,7 @@ class UrlMatcherTest extends TestCase $collection = new RouteCollection(); $collection->add('foo', new Route('/{foo}/bar', array(), array('foo' => '.+'))); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_route' => 'foo', 'foo' => "\n"), $matcher->match('/'.urlencode("\n").'/bar'), 'linefeed character is matched'); } @@ -192,7 +219,7 @@ class UrlMatcherTest extends TestCase $collection->addCollection($collection1); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); $this->assertEquals(array('_route' => 'foo'), $matcher->match('/foo1')); $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\ResourceNotFoundException'); @@ -205,12 +232,12 @@ class UrlMatcherTest extends TestCase $coll->add('foo', new Route('/foo/{foo}')); $coll->add('bar', new Route('/foo/bar/{foo}')); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $this->assertEquals(array('foo' => 'bar', '_route' => 'bar'), $matcher->match('/foo/bar/bar')); $collection = new RouteCollection(); $collection->add('foo', new Route('/{bar}')); - $matcher = new UrlMatcher($collection, new RequestContext()); + $matcher = $this->getUrlMatcher($collection); try { $matcher->match('/'); $this->fail(); @@ -223,7 +250,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('test', new Route('/{page}.{_format}', array('page' => 'index', '_format' => 'html'))); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $this->assertEquals(array('page' => 'my-page', '_format' => 'xml', '_route' => 'test'), $matcher->match('/my-page.xml')); } @@ -232,7 +259,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('test', new Route('/{foo}-{bar}-', array(), array('foo' => '.+', 'bar' => '.+'))); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $this->assertEquals(array('foo' => 'text1-text2-text3', 'bar' => 'text4', '_route' => 'test'), $matcher->match('/text1-text2-text3-text4-')); } @@ -241,7 +268,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('test', new Route('/{w}{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => 'y|Y'))); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); // 'w' eagerly matches as much as possible and the other variables match the remaining chars. // This also shows that the variables w-z must all exclude the separating char (the dot '.' in this case) by default requirement. // Otherwise they would also consume '.xml' and _format would never match as it's an optional variable. @@ -260,7 +287,7 @@ class UrlMatcherTest extends TestCase { $coll = new RouteCollection(); $coll->add('test', new Route('/get{what}', array('what' => 'All'))); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $this->assertEquals(array('what' => 'All', '_route' => 'test'), $matcher->match('/get')); $this->assertEquals(array('what' => 'Sites', '_route' => 'test'), $matcher->match('/getSites')); @@ -275,7 +302,7 @@ class UrlMatcherTest extends TestCase { $coll = new RouteCollection(); $coll->add('test', new Route('/get{what}Suffix')); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $this->assertEquals(array('what' => 'Sites', '_route' => 'test'), $matcher->match('/getSitesSuffix')); } @@ -284,7 +311,7 @@ class UrlMatcherTest extends TestCase { $coll = new RouteCollection(); $coll->add('test', new Route('/{page}.{_format}')); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $this->assertEquals(array('page' => 'index', '_format' => 'mobile.html', '_route' => 'test'), $matcher->match('/index.mobile.html')); } @@ -296,7 +323,7 @@ class UrlMatcherTest extends TestCase { $coll = new RouteCollection(); $coll->add('test', new Route('/{page}.{_format}')); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $matcher->match('/index.sl/ash'); } @@ -308,7 +335,7 @@ class UrlMatcherTest extends TestCase { $coll = new RouteCollection(); $coll->add('test', new Route('/{page}.{_format}', array(), array('_format' => 'html|xml'))); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $matcher->match('/do.t.html'); } @@ -320,7 +347,7 @@ class UrlMatcherTest extends TestCase { $coll = new RouteCollection(); $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https'))); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $matcher->match('/foo'); } @@ -333,7 +360,7 @@ class UrlMatcherTest extends TestCase $route = new Route('/foo'); $route->setCondition('context.getMethod() == "POST"'); $coll->add('foo', $route); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $matcher->match('/foo'); } @@ -343,7 +370,7 @@ class UrlMatcherTest extends TestCase $route = new Route('/foo/{bar}'); $route->setCondition('request.getBaseUrl() == "/sub/front.php" and request.getPathInfo() == "/foo/bar"'); $coll->add('foo', $route); - $matcher = new UrlMatcher($coll, new RequestContext('/sub/front.php')); + $matcher = $this->getUrlMatcher($coll, new RequestContext('/sub/front.php')); $this->assertEquals(array('bar' => 'bar', '_route' => 'foo'), $matcher->match('/foo/bar')); } @@ -352,7 +379,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/foo/{foo}')); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $this->assertEquals(array('foo' => 'bar%23', '_route' => 'foo'), $matcher->match('/foo/bar%2523')); } @@ -368,7 +395,7 @@ class UrlMatcherTest extends TestCase $coll->addCollection($subColl); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $this->assertEquals(array('_route' => 'bar'), $matcher->match('/new')); } @@ -377,7 +404,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/foo/{foo}', array(), array(), array(), '{locale}.example.com')); - $matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com')); + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com')); $this->assertEquals(array('foo' => 'bar', '_route' => 'foo', 'locale' => 'en'), $matcher->match('/foo/bar')); } @@ -388,10 +415,10 @@ class UrlMatcherTest extends TestCase $coll->add('bar', new Route('/bar/{foo}', array(), array(), array(), '{locale}.example.net')); $coll->setHost('{locale}.example.com'); - $matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com')); + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com')); $this->assertEquals(array('foo' => 'bar', '_route' => 'foo', 'locale' => 'en'), $matcher->match('/foo/bar')); - $matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com')); + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com')); $this->assertEquals(array('foo' => 'bar', '_route' => 'bar', 'locale' => 'en'), $matcher->match('/bar/bar')); } @@ -403,7 +430,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/foo/{foo}', array(), array(), array(), '{locale}.example.com')); - $matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'example.com')); + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'example.com')); $matcher->match('/foo/bar'); } @@ -415,7 +442,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/locale', array(), array('locale' => 'EN|FR|DE'))); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $matcher->match('/en'); } @@ -424,7 +451,7 @@ class UrlMatcherTest extends TestCase $coll = new RouteCollection(); $coll->add('foo', new Route('/', array(), array('locale' => 'EN|FR|DE'), array(), '{locale}.example.com')); - $matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com')); + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com')); $this->assertEquals(array('_route' => 'foo', 'locale' => 'en'), $matcher->match('/')); } @@ -435,7 +462,48 @@ class UrlMatcherTest extends TestCase { $coll = new RouteCollection(); - $matcher = new UrlMatcher($coll, new RequestContext()); + $matcher = $this->getUrlMatcher($coll); $matcher->match('/'); } + + public function testNestedCollections() + { + $coll = new RouteCollection(); + + $subColl = new RouteCollection(); + $subColl->add('a', new Route('/a')); + $subColl->add('b', new Route('/b')); + $subColl->add('c', new Route('/c')); + $subColl->addPrefix('/p'); + $coll->addCollection($subColl); + + $coll->add('baz', new Route('/{baz}')); + + $subColl = new RouteCollection(); + $subColl->add('buz', new Route('/buz')); + $subColl->addPrefix('/prefix'); + $coll->addCollection($subColl); + + $matcher = $this->getUrlMatcher($coll); + $this->assertEquals(array('_route' => 'a'), $matcher->match('/p/a')); + $this->assertEquals(array('_route' => 'baz', 'baz' => 'p'), $matcher->match('/p')); + $this->assertEquals(array('_route' => 'buz'), $matcher->match('/prefix/buz')); + } + + /** + * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException + */ + public function testSchemeAndMethodMismatch() + { + $coll = new RouteCollection(); + $coll->add('foo', new Route('/', array(), array(), array(), null, array('https'), array('POST'))); + + $matcher = $this->getUrlMatcher($coll); + $matcher->match('/'); + } + + protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) + { + return new UrlMatcher($routes, $context ?: new RequestContext()); + } } diff --git a/vendor/symfony/routing/Tests/RouteCollectionBuilderTest.php b/vendor/symfony/routing/Tests/RouteCollectionBuilderTest.php index f6af600b..76a042d6 100644 --- a/vendor/symfony/routing/Tests/RouteCollectionBuilderTest.php +++ b/vendor/symfony/routing/Tests/RouteCollectionBuilderTest.php @@ -357,7 +357,7 @@ class RouteCollectionBuilderTest extends TestCase $routeCollectionBuilder->import('/directory/recurse/*', '/other/', 'glob'); $routes = $routeCollectionBuilder->build()->all(); - $this->assertEquals(2, count($routes)); + $this->assertCount(2, $routes); $this->assertEquals('/other/a', $routes['a']->getPath()); $this->assertEquals('/other/b', $routes['b']->getPath()); } diff --git a/vendor/symfony/routing/Tests/RouteCompilerTest.php b/vendor/symfony/routing/Tests/RouteCompilerTest.php index 54006d7e..dc304e3e 100644 --- a/vendor/symfony/routing/Tests/RouteCompilerTest.php +++ b/vendor/symfony/routing/Tests/RouteCompilerTest.php @@ -38,7 +38,7 @@ class RouteCompilerTest extends TestCase array( 'Static route', array('/foo'), - '/foo', '#^/foo$#s', array(), array( + '/foo', '#^/foo$#sD', array(), array( array('text', '/foo'), ), ), @@ -46,7 +46,7 @@ class RouteCompilerTest extends TestCase array( 'Route with a variable', array('/foo/{bar}'), - '/foo', '#^/foo/(?P[^/]++)$#s', array('bar'), array( + '/foo', '#^/foo/(?P[^/]++)$#sD', array('bar'), array( array('variable', '/', '[^/]++', 'bar'), array('text', '/foo'), ), @@ -55,7 +55,7 @@ class RouteCompilerTest extends TestCase array( 'Route with a variable that has a default value', array('/foo/{bar}', array('bar' => 'bar')), - '/foo', '#^/foo(?:/(?P[^/]++))?$#s', array('bar'), array( + '/foo', '#^/foo(?:/(?P[^/]++))?$#sD', array('bar'), array( array('variable', '/', '[^/]++', 'bar'), array('text', '/foo'), ), @@ -64,7 +64,7 @@ class RouteCompilerTest extends TestCase array( 'Route with several variables', array('/foo/{bar}/{foobar}'), - '/foo', '#^/foo/(?P[^/]++)/(?P[^/]++)$#s', array('bar', 'foobar'), array( + '/foo', '#^/foo/(?P[^/]++)/(?P[^/]++)$#sD', array('bar', 'foobar'), array( array('variable', '/', '[^/]++', 'foobar'), array('variable', '/', '[^/]++', 'bar'), array('text', '/foo'), @@ -74,7 +74,7 @@ class RouteCompilerTest extends TestCase array( 'Route with several variables that have default values', array('/foo/{bar}/{foobar}', array('bar' => 'bar', 'foobar' => '')), - '/foo', '#^/foo(?:/(?P[^/]++)(?:/(?P[^/]++))?)?$#s', array('bar', 'foobar'), array( + '/foo', '#^/foo(?:/(?P[^/]++)(?:/(?P[^/]++))?)?$#sD', array('bar', 'foobar'), array( array('variable', '/', '[^/]++', 'foobar'), array('variable', '/', '[^/]++', 'bar'), array('text', '/foo'), @@ -84,7 +84,7 @@ class RouteCompilerTest extends TestCase array( 'Route with several variables but some of them have no default values', array('/foo/{bar}/{foobar}', array('bar' => 'bar')), - '/foo', '#^/foo/(?P[^/]++)/(?P[^/]++)$#s', array('bar', 'foobar'), array( + '/foo', '#^/foo/(?P[^/]++)/(?P[^/]++)$#sD', array('bar', 'foobar'), array( array('variable', '/', '[^/]++', 'foobar'), array('variable', '/', '[^/]++', 'bar'), array('text', '/foo'), @@ -94,7 +94,7 @@ class RouteCompilerTest extends TestCase array( 'Route with an optional variable as the first segment', array('/{bar}', array('bar' => 'bar')), - '', '#^/(?P[^/]++)?$#s', array('bar'), array( + '', '#^/(?P[^/]++)?$#sD', array('bar'), array( array('variable', '/', '[^/]++', 'bar'), ), ), @@ -102,7 +102,7 @@ class RouteCompilerTest extends TestCase array( 'Route with a requirement of 0', array('/{bar}', array('bar' => null), array('bar' => '0')), - '', '#^/(?P0)?$#s', array('bar'), array( + '', '#^/(?P0)?$#sD', array('bar'), array( array('variable', '/', '0', 'bar'), ), ), @@ -110,7 +110,7 @@ class RouteCompilerTest extends TestCase array( 'Route with an optional variable as the first segment with requirements', array('/{bar}', array('bar' => 'bar'), array('bar' => '(foo|bar)')), - '', '#^/(?P(foo|bar))?$#s', array('bar'), array( + '', '#^/(?P(foo|bar))?$#sD', array('bar'), array( array('variable', '/', '(foo|bar)', 'bar'), ), ), @@ -118,7 +118,7 @@ class RouteCompilerTest extends TestCase array( 'Route with only optional variables', array('/{foo}/{bar}', array('foo' => 'foo', 'bar' => 'bar')), - '', '#^/(?P[^/]++)?(?:/(?P[^/]++))?$#s', array('foo', 'bar'), array( + '', '#^/(?P[^/]++)?(?:/(?P[^/]++))?$#sD', array('foo', 'bar'), array( array('variable', '/', '[^/]++', 'bar'), array('variable', '/', '[^/]++', 'foo'), ), @@ -127,7 +127,7 @@ class RouteCompilerTest extends TestCase array( 'Route with a variable in last position', array('/foo-{bar}'), - '/foo-', '#^/foo\-(?P[^/]++)$#s', array('bar'), array( + '/foo-', '#^/foo\-(?P[^/]++)$#sD', array('bar'), array( array('variable', '-', '[^/]++', 'bar'), array('text', '/foo'), ), @@ -136,7 +136,7 @@ class RouteCompilerTest extends TestCase array( 'Route with nested placeholders', array('/{static{var}static}'), - '/{static', '#^/\{static(?P[^/]+)static\}$#s', array('var'), array( + '/{static', '#^/\{static(?P[^/]+)static\}$#sD', array('var'), array( array('text', 'static}'), array('variable', '', '[^/]+', 'var'), array('text', '/{static'), @@ -146,7 +146,7 @@ class RouteCompilerTest extends TestCase array( 'Route without separator between variables', array('/{w}{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => '(y|Y)')), - '', '#^/(?P[^/\.]+)(?P[^/\.]+)(?P(y|Y))(?:(?P[^/\.]++)(?:\.(?P<_format>[^/]++))?)?$#s', array('w', 'x', 'y', 'z', '_format'), array( + '', '#^/(?P[^/\.]+)(?P[^/\.]+)(?P(y|Y))(?:(?P[^/\.]++)(?:\.(?P<_format>[^/]++))?)?$#sD', array('w', 'x', 'y', 'z', '_format'), array( array('variable', '.', '[^/]++', '_format'), array('variable', '', '[^/\.]++', 'z'), array('variable', '', '(y|Y)', 'y'), @@ -158,7 +158,7 @@ class RouteCompilerTest extends TestCase array( 'Route with a format', array('/foo/{bar}.{_format}'), - '/foo', '#^/foo/(?P[^/\.]++)\.(?P<_format>[^/]++)$#s', array('bar', '_format'), array( + '/foo', '#^/foo/(?P[^/\.]++)\.(?P<_format>[^/]++)$#sD', array('bar', '_format'), array( array('variable', '.', '[^/]++', '_format'), array('variable', '/', '[^/\.]++', 'bar'), array('text', '/foo'), @@ -168,7 +168,7 @@ class RouteCompilerTest extends TestCase array( 'Static non UTF-8 route', array("/fo\xE9"), - "/fo\xE9", "#^/fo\xE9$#s", array(), array( + "/fo\xE9", "#^/fo\xE9$#sD", array(), array( array('text', "/fo\xE9"), ), ), @@ -176,7 +176,7 @@ class RouteCompilerTest extends TestCase array( 'Route with an explicit UTF-8 requirement', array('/{bar}', array('bar' => null), array('bar' => '.'), array('utf8' => true)), - '', '#^/(?P.)?$#su', array('bar'), array( + '', '#^/(?P.)?$#sDu', array('bar'), array( array('variable', '/', '.', 'bar', true), ), ), @@ -206,7 +206,7 @@ class RouteCompilerTest extends TestCase array( 'Static UTF-8 route', array('/foé'), - '/foé', '#^/foé$#su', array(), array( + '/foé', '#^/foé$#sDu', array(), array( array('text', '/foé'), ), 'patterns', @@ -215,7 +215,7 @@ class RouteCompilerTest extends TestCase array( 'Route with an implicit UTF-8 requirement', array('/{bar}', array('bar' => null), array('bar' => 'é')), - '', '#^/(?Pé)?$#su', array('bar'), array( + '', '#^/(?Pé)?$#sDu', array('bar'), array( array('variable', '/', 'é', 'bar', true), ), 'requirements', @@ -224,7 +224,7 @@ class RouteCompilerTest extends TestCase array( 'Route with a UTF-8 class requirement', array('/{bar}', array('bar' => null), array('bar' => '\pM')), - '', '#^/(?P\pM)?$#su', array('bar'), array( + '', '#^/(?P\pM)?$#sDu', array('bar'), array( array('variable', '/', '\pM', 'bar', true), ), 'requirements', @@ -233,7 +233,7 @@ class RouteCompilerTest extends TestCase array( 'Route with a UTF-8 separator', array('/foo/{bar}§{_format}', array(), array(), array('compiler_class' => Utf8RouteCompiler::class)), - '/foo', '#^/foo/(?P[^/§]++)§(?P<_format>[^/]++)$#su', array('bar', '_format'), array( + '/foo', '#^/foo/(?P[^/§]++)§(?P<_format>[^/]++)$#sDu', array('bar', '_format'), array( array('variable', '§', '[^/]++', '_format', true), array('variable', '/', '[^/§]++', 'bar', true), array('text', '/foo'), @@ -327,21 +327,21 @@ class RouteCompilerTest extends TestCase array( 'Route with host pattern', array('/hello', array(), array(), array(), 'www.example.com'), - '/hello', '#^/hello$#s', array(), array(), array( + '/hello', '#^/hello$#sD', array(), array(), array( array('text', '/hello'), ), - '#^www\.example\.com$#si', array(), array( + '#^www\.example\.com$#sDi', array(), array( array('text', 'www.example.com'), ), ), array( 'Route with host pattern and some variables', array('/hello/{name}', array(), array(), array(), 'www.example.{tld}'), - '/hello', '#^/hello/(?P[^/]++)$#s', array('tld', 'name'), array('name'), array( + '/hello', '#^/hello/(?P[^/]++)$#sD', array('tld', 'name'), array('name'), array( array('variable', '/', '[^/]++', 'name'), array('text', '/hello'), ), - '#^www\.example\.(?P[^\.]++)$#si', array('tld'), array( + '#^www\.example\.(?P[^\.]++)$#sDi', array('tld'), array( array('variable', '.', '[^\.]++', 'tld'), array('text', 'www.example'), ), @@ -349,10 +349,10 @@ class RouteCompilerTest extends TestCase array( 'Route with variable at beginning of host', array('/hello', array(), array(), array(), '{locale}.example.{tld}'), - '/hello', '#^/hello$#s', array('locale', 'tld'), array(), array( + '/hello', '#^/hello$#sD', array('locale', 'tld'), array(), array( array('text', '/hello'), ), - '#^(?P[^\.]++)\.example\.(?P[^\.]++)$#si', array('locale', 'tld'), array( + '#^(?P[^\.]++)\.example\.(?P[^\.]++)$#sDi', array('locale', 'tld'), array( array('variable', '.', '[^\.]++', 'tld'), array('text', '.example'), array('variable', '', '[^\.]++', 'locale'), @@ -361,10 +361,10 @@ class RouteCompilerTest extends TestCase array( 'Route with host variables that has a default value', array('/hello', array('locale' => 'a', 'tld' => 'b'), array(), array(), '{locale}.example.{tld}'), - '/hello', '#^/hello$#s', array('locale', 'tld'), array(), array( + '/hello', '#^/hello$#sD', array('locale', 'tld'), array(), array( array('text', '/hello'), ), - '#^(?P[^\.]++)\.example\.(?P[^\.]++)$#si', array('locale', 'tld'), array( + '#^(?P[^\.]++)\.example\.(?P[^\.]++)$#sDi', array('locale', 'tld'), array( array('variable', '.', '[^\.]++', 'tld'), array('text', '.example'), array('variable', '', '[^\.]++', 'locale'), diff --git a/vendor/symfony/routing/Tests/RouteTest.php b/vendor/symfony/routing/Tests/RouteTest.php index ff7e320c..c7af058e 100644 --- a/vendor/symfony/routing/Tests/RouteTest.php +++ b/vendor/symfony/routing/Tests/RouteTest.php @@ -245,7 +245,7 @@ class RouteTest extends TestCase */ public function testSerializedRepresentationKeepsWorking() { - $serialized = 'C:31:"Symfony\Component\Routing\Route":934:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":569:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:30:"#^/prefix(?:/(?P\d+))?$#s";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:39:"#^(?P[^\.]++)\.example\.net$#si";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}'; + $serialized = 'C:31:"Symfony\Component\Routing\Route":936:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":571:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:31:"#^/prefix(?:/(?P\d+))?$#sD";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:40:"#^(?P[^\.]++)\.example\.net$#sDi";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}'; $unserialized = unserialize($serialized); $route = new Route('/prefix/{foo}', array('foo' => 'default'), array('foo' => '\d+')); diff --git a/vendor/symfony/routing/Tests/RouterTest.php b/vendor/symfony/routing/Tests/RouterTest.php index 409959ee..3e3d43f8 100644 --- a/vendor/symfony/routing/Tests/RouterTest.php +++ b/vendor/symfony/routing/Tests/RouterTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Routing\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\Router; use Symfony\Component\HttpFoundation\Request; @@ -83,7 +84,7 @@ class RouterTest extends TestCase { $this->router->setOption('resource_type', 'ResourceType'); - $routeCollection = $this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock(); + $routeCollection = new RouteCollection(); $this->loader->expects($this->once()) ->method('load')->with('routing.yml', 'ResourceType') @@ -101,7 +102,7 @@ class RouterTest extends TestCase $this->loader->expects($this->once()) ->method('load')->with('routing.yml', null) - ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock())); + ->will($this->returnValue(new RouteCollection())); $this->assertInstanceOf('Symfony\\Component\\Routing\\Matcher\\UrlMatcher', $this->router->getMatcher()); } @@ -123,7 +124,7 @@ class RouterTest extends TestCase $this->loader->expects($this->once()) ->method('load')->with('routing.yml', null) - ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock())); + ->will($this->returnValue(new RouteCollection())); $this->assertInstanceOf('Symfony\\Component\\Routing\\Generator\\UrlGenerator', $this->router->getGenerator()); } diff --git a/vendor/symfony/routing/composer.json b/vendor/symfony/routing/composer.json index 2ad746ec..4d820cc2 100644 --- a/vendor/symfony/routing/composer.json +++ b/vendor/symfony/routing/composer.json @@ -19,7 +19,7 @@ "php": "^5.5.9|>=7.0.8" }, "require-dev": { - "symfony/config": "~2.8|~3.0|~4.0", + "symfony/config": "^3.3.1|~4.0", "symfony/http-foundation": "~2.8|~3.0|~4.0", "symfony/yaml": "~3.4|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", @@ -29,7 +29,7 @@ "psr/log": "~1.0" }, "conflict": { - "symfony/config": "<2.8", + "symfony/config": "<3.3.1", "symfony/dependency-injection": "<3.3", "symfony/yaml": "<3.4" }, diff --git a/vendor/symfony/thanks/src/Command/ThanksCommand.php b/vendor/symfony/thanks/src/Command/ThanksCommand.php index e96d404c..cafbb933 100644 --- a/vendor/symfony/thanks/src/Command/ThanksCommand.php +++ b/vendor/symfony/thanks/src/Command/ThanksCommand.php @@ -13,11 +13,13 @@ namespace Symfony\Thanks\Command; use Composer\Command\BaseCommand; use Composer\Composer; +use Composer\Downloader\TransportException; use Composer\Json\JsonFile; use Composer\Util\RemoteFilesystem; use Composer\Factory; use Composer\Plugin\PluginEvents; use Composer\Plugin\PreFileDownloadEvent; +use Hirak\Prestissimo\CurlRemoteFilesystem; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -166,7 +168,8 @@ class ThanksCommand extends BaseCommand } } - $repos = $this->callGitHub($rfs, sprintf("query{\n%s}", $graphql)); + $failures = []; + $repos = $this->callGitHub($rfs, sprintf("query{\n%s}", $graphql), $failures); $template = '%1$s: addStar(input:{clientMutationId:"%s",starrableId:"%s"}){clientMutationId}'."\n"; $graphql = ''; @@ -192,17 +195,29 @@ class ThanksCommand extends BaseCommand } } + if ($failures) { + $output->writeln(''); + $output->writeln('Some repositories could not be starred, please run composer update and try again:'); + + foreach ($failures as $alias => $message) { + $output->writeln(sprintf(' * %s - %s', $aliases[$alias][1], $message)); + } + } + $output->writeln(sprintf("\nThanks to you! %s", $this->love)); + $output->writeln("Please consider contributing back in any way if you can!"); return 0; } - private function callGitHub(RemoteFilesystem $rfs, $graphql) + private function callGitHub(RemoteFilesystem $rfs, $graphql, &$failures = []) { if ($eventDispatcher = $this->getComposer()->getEventDispatcher()) { $preFileDownloadEvent = new PreFileDownloadEvent(PluginEvents::PRE_FILE_DOWNLOAD, $rfs, 'https://api.github.com/graphql'); $eventDispatcher->dispatch($preFileDownloadEvent->getName(), $preFileDownloadEvent); - $rfs = $preFileDownloadEvent->getRemoteFilesystem(); + if (!$preFileDownloadEvent->getRemoteFilesystem() instanceof CurlRemoteFilesystem) { + $rfs = $preFileDownloadEvent->getRemoteFilesystem(); + } } $result = $rfs->getContents('github.com', 'https://api.github.com/graphql', false, [ @@ -214,6 +229,19 @@ class ThanksCommand extends BaseCommand ]); $result = json_decode($result, true); + if (isset($result['errors'][0]['message'])) { + if (!$result['data']) { + throw new TransportException($result['errors'][0]['message']); + } + + foreach ($result['errors'] as $error) { + foreach ($error['path'] as $path) { + $failures += [$path => $error['message']]; + unset($result['data'][$path]); + } + } + } + return $result['data']; } diff --git a/vendor/symfony/translation/CHANGELOG.md b/vendor/symfony/translation/CHANGELOG.md index 105a67e2..527b8049 100644 --- a/vendor/symfony/translation/CHANGELOG.md +++ b/vendor/symfony/translation/CHANGELOG.md @@ -1,6 +1,20 @@ CHANGELOG ========= +4.1.0 +----- + + * The `FileDumper::setBackup()` method is deprecated. + * The `TranslationWriter::disableBackup()` method is deprecated. + * The `XliffFileDumper` will write "name" on the "unit" node when dumping XLIFF 2.0. + +4.0.0 +----- + + * removed the backup feature of the `FileDumper` class + * removed `TranslationWriter::writeTranslations()` method + * removed support for passing `MessageSelector` instances to the constructor of the `Translator` class + 3.4.0 ----- diff --git a/vendor/symfony/translation/Command/XliffLintCommand.php b/vendor/symfony/translation/Command/XliffLintCommand.php index fead5edc..2caa6abe 100644 --- a/vendor/symfony/translation/Command/XliffLintCommand.php +++ b/vendor/symfony/translation/Command/XliffLintCommand.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Translation\Command; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Exception\RuntimeException; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -33,7 +34,7 @@ class XliffLintCommand extends Command private $directoryIteratorProvider; private $isReadableProvider; - public function __construct($name = null, $directoryIteratorProvider = null, $isReadableProvider = null) + public function __construct(string $name = null, callable $directoryIteratorProvider = null, callable $isReadableProvider = null) { parent::__construct($name); @@ -81,14 +82,14 @@ EOF if (!$filename) { if (!$stdin = $this->getStdin()) { - throw new \RuntimeException('Please provide a filename or pipe file content to STDIN.'); + throw new RuntimeException('Please provide a filename or pipe file content to STDIN.'); } return $this->display($io, array($this->validate($stdin))); } if (!$this->isReadable($filename)) { - throw new \RuntimeException(sprintf('File or directory "%s" is not readable.', $filename)); + throw new RuntimeException(sprintf('File or directory "%s" is not readable.', $filename)); } $filesInfo = array(); @@ -101,6 +102,8 @@ EOF private function validate($content, $file = null) { + $errors = array(); + // Avoid: Warning DOMDocument::loadXML(): Empty string supplied as input if ('' === trim($content)) { return array('file' => $file, 'valid' => true); @@ -110,22 +113,33 @@ EOF $document = new \DOMDocument(); $document->loadXML($content); - if ($document->schemaValidate(__DIR__.'/../Resources/schemas/xliff-core-1.2-strict.xsd')) { - return array('file' => $file, 'valid' => true); + + if (null !== $targetLanguage = $this->getTargetLanguageFromFile($document)) { + $expectedFileExtension = sprintf('%s.xlf', str_replace('-', '_', $targetLanguage)); + $realFileExtension = explode('.', basename($file), 2)[1] ?? ''; + + if ($expectedFileExtension !== $realFileExtension) { + $errors[] = array( + 'line' => -1, + 'column' => -1, + 'message' => sprintf('There is a mismatch between the file extension ("%s") and the "%s" value used in the "target-language" attribute of the file.', $realFileExtension, $targetLanguage), + ); + } } - $errorMessages = array_map(function ($error) { - return array( - 'line' => $error->line, - 'column' => $error->column, - 'message' => trim($error->message), - ); - }, libxml_get_errors()); + $document->schemaValidate(__DIR__.'/../Resources/schemas/xliff-core-1.2-strict.xsd'); + foreach (libxml_get_errors() as $xmlError) { + $errors[] = array( + 'line' => $xmlError->line, + 'column' => $xmlError->column, + 'message' => trim($xmlError->message), + ); + } libxml_clear_errors(); libxml_use_internal_errors(false); - return array('file' => $file, 'valid' => false, 'messages' => $errorMessages); + return array('file' => $file, 'valid' => 0 === count($errors), 'messages' => $errors); } private function display(SymfonyStyle $io, array $files) @@ -136,7 +150,7 @@ EOF case 'json': return $this->displayJson($io, $files); default: - throw new \InvalidArgumentException(sprintf('The format "%s" is not supported.', $this->format)); + throw new InvalidArgumentException(sprintf('The format "%s" is not supported.', $this->format)); } } @@ -242,4 +256,15 @@ EOF return $default($fileOrDirectory); } + + private function getTargetLanguageFromFile(\DOMDocument $xliffContents): ?string + { + foreach ($xliffContents->getElementsByTagName('file')[0]->attributes ?? array() as $attribute) { + if ('target-language' === $attribute->nodeName) { + return $attribute->nodeValue; + } + } + + return null; + } } diff --git a/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php b/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php index 1ca79cf0..e620226e 100644 --- a/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php +++ b/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php @@ -23,7 +23,7 @@ class TranslationDumperPass implements CompilerPassInterface private $writerServiceId; private $dumperTag; - public function __construct($writerServiceId = 'translation.writer', $dumperTag = 'translation.dumper') + public function __construct(string $writerServiceId = 'translation.writer', string $dumperTag = 'translation.dumper') { $this->writerServiceId = $writerServiceId; $this->dumperTag = $dumperTag; diff --git a/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php b/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php index 06105187..18c67f68 100644 --- a/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php +++ b/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php @@ -24,7 +24,7 @@ class TranslationExtractorPass implements CompilerPassInterface private $extractorServiceId; private $extractorTag; - public function __construct($extractorServiceId = 'translation.extractor', $extractorTag = 'translation.extractor') + public function __construct(string $extractorServiceId = 'translation.extractor', string $extractorTag = 'translation.extractor') { $this->extractorServiceId = $extractorServiceId; $this->extractorTag = $extractorTag; diff --git a/vendor/symfony/translation/DependencyInjection/TranslatorPass.php b/vendor/symfony/translation/DependencyInjection/TranslatorPass.php index db2a2a1e..1f7839db 100644 --- a/vendor/symfony/translation/DependencyInjection/TranslatorPass.php +++ b/vendor/symfony/translation/DependencyInjection/TranslatorPass.php @@ -24,12 +24,8 @@ class TranslatorPass implements CompilerPassInterface private $debugCommandServiceId; private $updateCommandServiceId; - public function __construct($translatorServiceId = 'translator.default', $readerServiceId = 'translation.loader', $loaderTag = 'translation.loader', $debugCommandServiceId = 'console.command.translation_debug', $updateCommandServiceId = 'console.command.translation_update') + public function __construct(string $translatorServiceId = 'translator.default', string $readerServiceId = 'translation.reader', string $loaderTag = 'translation.loader', string $debugCommandServiceId = 'console.command.translation_debug', string $updateCommandServiceId = 'console.command.translation_update') { - if ('translation.loader' === $readerServiceId && 2 > func_num_args()) { - @trigger_error('The default value for $readerServiceId will change in 4.0 to "translation.reader".', E_USER_DEPRECATED); - } - $this->translatorServiceId = $translatorServiceId; $this->readerServiceId = $readerServiceId; $this->loaderTag = $loaderTag; @@ -62,18 +58,6 @@ class TranslatorPass implements CompilerPassInterface } } - // Duplicated code to support "translation.reader", to be removed in 4.0 - if ('translation.reader' !== $this->readerServiceId) { - if ($container->hasDefinition('translation.reader')) { - $definition = $container->getDefinition('translation.reader'); - foreach ($loaders as $id => $formats) { - foreach ($formats as $format) { - $definition->addMethodCall('addLoader', array($format, $loaderRefs[$id])); - } - } - } - } - $container ->findDefinition($this->translatorServiceId) ->replaceArgument(0, ServiceLocatorTagPass::register($container, $loaderRefs)) diff --git a/vendor/symfony/translation/Dumper/FileDumper.php b/vendor/symfony/translation/Dumper/FileDumper.php index 7296d8cc..5a67b3a0 100644 --- a/vendor/symfony/translation/Dumper/FileDumper.php +++ b/vendor/symfony/translation/Dumper/FileDumper.php @@ -17,7 +17,6 @@ use Symfony\Component\Translation\Exception\RuntimeException; /** * FileDumper is an implementation of DumperInterface that dump a message catalogue to file(s). - * Performs backup of already existing files. * * Options: * - path (mandatory): the directory where the files should be saved @@ -33,13 +32,6 @@ abstract class FileDumper implements DumperInterface */ protected $relativePathTemplate = '%domain%.%locale%.%extension%'; - /** - * Make file backup before the dump. - * - * @var bool - */ - private $backup = true; - /** * Sets the template for the relative paths to files. * @@ -54,10 +46,16 @@ abstract class FileDumper implements DumperInterface * Sets backup flag. * * @param bool + * + * @deprecated since Symfony 4.1 */ public function setBackup($backup) { - $this->backup = $backup; + @trigger_error(sprintf('The %s() method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED); + + if (false !== $backup) { + throw new \LogicException('The backup feature is no longer supported.'); + } } /** @@ -71,14 +69,8 @@ abstract class FileDumper implements DumperInterface // save a file for each domain foreach ($messages->getDomains() as $domain) { - // backup $fullpath = $options['path'].'/'.$this->getRelativePath($domain, $messages->getLocale()); - if (file_exists($fullpath)) { - if ($this->backup) { - @trigger_error('Creating a backup while dumping a message catalogue is deprecated since Symfony 3.1 and will be removed in 4.0. Use TranslationWriter::disableBackup() to disable the backup.', E_USER_DEPRECATED); - copy($fullpath, $fullpath.'~'); - } - } else { + if (!file_exists($fullpath)) { $directory = dirname($fullpath); if (!file_exists($directory) && !@mkdir($directory, 0777, true)) { throw new RuntimeException(sprintf('Unable to create directory "%s".', $directory)); @@ -109,13 +101,8 @@ abstract class FileDumper implements DumperInterface /** * Gets the relative file path using the template. - * - * @param string $domain The domain - * @param string $locale The locale - * - * @return string The relative file path */ - private function getRelativePath($domain, $locale) + private function getRelativePath(string $domain, string $locale): string { return strtr($this->relativePathTemplate, array( '%domain%' => $domain, diff --git a/vendor/symfony/translation/Dumper/JsonFileDumper.php b/vendor/symfony/translation/Dumper/JsonFileDumper.php index 08b538e1..32bdaf51 100644 --- a/vendor/symfony/translation/Dumper/JsonFileDumper.php +++ b/vendor/symfony/translation/Dumper/JsonFileDumper.php @@ -28,7 +28,7 @@ class JsonFileDumper extends FileDumper if (isset($options['json_encoding'])) { $flags = $options['json_encoding']; } else { - $flags = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0; + $flags = JSON_PRETTY_PRINT; } return json_encode($messages->all($domain), $flags); diff --git a/vendor/symfony/translation/Dumper/XliffFileDumper.php b/vendor/symfony/translation/Dumper/XliffFileDumper.php index d7e5ecc7..afeae3ac 100644 --- a/vendor/symfony/translation/Dumper/XliffFileDumper.php +++ b/vendor/symfony/translation/Dumper/XliffFileDumper.php @@ -146,6 +146,11 @@ class XliffFileDumper extends FileDumper foreach ($messages->all($domain) as $source => $target) { $translation = $dom->createElement('unit'); $translation->setAttribute('id', strtr(substr(base64_encode(hash('sha256', $source, true)), 0, 7), '/+', '._')); + $name = $source; + if (strlen($source) > 80) { + $name = substr(md5($source), -7); + } + $translation->setAttribute('name', $name); $metadata = $messages->getMetadata($source, $domain); // Add notes section diff --git a/vendor/symfony/translation/Dumper/YamlFileDumper.php b/vendor/symfony/translation/Dumper/YamlFileDumper.php index ecf00fa6..db9e4b36 100644 --- a/vendor/symfony/translation/Dumper/YamlFileDumper.php +++ b/vendor/symfony/translation/Dumper/YamlFileDumper.php @@ -25,7 +25,7 @@ class YamlFileDumper extends FileDumper { private $extension; - public function __construct(/**string */$extension = 'yml') + public function __construct(string $extension = 'yml') { $this->extension = $extension; } diff --git a/vendor/symfony/translation/Extractor/AbstractFileExtractor.php b/vendor/symfony/translation/Extractor/AbstractFileExtractor.php index b9c524e8..40b36451 100644 --- a/vendor/symfony/translation/Extractor/AbstractFileExtractor.php +++ b/vendor/symfony/translation/Extractor/AbstractFileExtractor.php @@ -43,12 +43,7 @@ abstract class AbstractFileExtractor return $files; } - /** - * @param string $file - * - * @return \SplFileInfo - */ - private function toSplFileInfo($file) + private function toSplFileInfo(string $file): \SplFileInfo { return ($file instanceof \SplFileInfo) ? $file : new \SplFileInfo($file); } diff --git a/vendor/symfony/translation/Extractor/PhpExtractor.php b/vendor/symfony/translation/Extractor/PhpExtractor.php index ab641ba9..f364bdec 100644 --- a/vendor/symfony/translation/Extractor/PhpExtractor.php +++ b/vendor/symfony/translation/Extractor/PhpExtractor.php @@ -83,10 +83,8 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface foreach ($files as $file) { $this->parseTokens(token_get_all(file_get_contents($file)), $catalog); - if (\PHP_VERSION_ID >= 70000) { - // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098 - gc_mem_caches(); - } + // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098 + gc_mem_caches(); } } diff --git a/vendor/symfony/translation/Loader/IcuDatFileLoader.php b/vendor/symfony/translation/Loader/IcuDatFileLoader.php index 71ba90a3..822bc362 100644 --- a/vendor/symfony/translation/Loader/IcuDatFileLoader.php +++ b/vendor/symfony/translation/Loader/IcuDatFileLoader.php @@ -39,7 +39,6 @@ class IcuDatFileLoader extends IcuResFileLoader try { $rb = new \ResourceBundle($locale, $resource); } catch (\Exception $e) { - // HHVM compatibility: constructor throws on invalid resource $rb = null; } diff --git a/vendor/symfony/translation/Loader/IcuResFileLoader.php b/vendor/symfony/translation/Loader/IcuResFileLoader.php index 6b5b5e12..927cae16 100644 --- a/vendor/symfony/translation/Loader/IcuResFileLoader.php +++ b/vendor/symfony/translation/Loader/IcuResFileLoader.php @@ -39,7 +39,6 @@ class IcuResFileLoader implements LoaderInterface try { $rb = new \ResourceBundle($locale, $resource); } catch (\Exception $e) { - // HHVM compatibility: constructor throws on invalid resource $rb = null; } diff --git a/vendor/symfony/translation/Loader/MoFileLoader.php b/vendor/symfony/translation/Loader/MoFileLoader.php index aad2bba2..918bf94a 100644 --- a/vendor/symfony/translation/Loader/MoFileLoader.php +++ b/vendor/symfony/translation/Loader/MoFileLoader.php @@ -134,11 +134,8 @@ class MoFileLoader extends FileLoader * Reads an unsigned long from stream respecting endianness. * * @param resource $stream - * @param bool $isBigEndian - * - * @return int */ - private function readLong($stream, $isBigEndian) + private function readLong($stream, bool $isBigEndian): int { $result = unpack($isBigEndian ? 'N1' : 'V1', fread($stream, 4)); $result = current($result); diff --git a/vendor/symfony/translation/Loader/XliffFileLoader.php b/vendor/symfony/translation/Loader/XliffFileLoader.php index 8e4e5a78..b20d4909 100644 --- a/vendor/symfony/translation/Loader/XliffFileLoader.php +++ b/vendor/symfony/translation/Loader/XliffFileLoader.php @@ -75,7 +75,7 @@ class XliffFileLoader implements LoaderInterface * @param MessageCatalogue $catalogue Catalogue where we'll collect messages and metadata * @param string $domain The domain */ - private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, $domain) + private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain) { $xml = simplexml_import_dom($dom); $encoding = strtoupper($dom->encoding); @@ -115,12 +115,7 @@ class XliffFileLoader implements LoaderInterface } } - /** - * @param \DOMDocument $dom - * @param MessageCatalogue $catalogue - * @param string $domain - */ - private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, $domain) + private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain) { $xml = simplexml_import_dom($dom); $encoding = strtoupper($dom->encoding); @@ -128,48 +123,44 @@ class XliffFileLoader implements LoaderInterface $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:2.0'); foreach ($xml->xpath('//xliff:unit') as $unit) { - $segment = $unit->segment; - $source = $segment->source; + foreach ($unit->segment as $segment) { + $source = $segment->source; - // If the xlf file has another encoding specified, try to convert it because - // simple_xml will always return utf-8 encoded values - $target = $this->utf8ToCharset((string) (isset($segment->target) ? $segment->target : $source), $encoding); + // If the xlf file has another encoding specified, try to convert it because + // simple_xml will always return utf-8 encoded values + $target = $this->utf8ToCharset((string) (isset($segment->target) ? $segment->target : $source), $encoding); - $catalogue->set((string) $source, $target, $domain); + $catalogue->set((string) $source, $target, $domain); - $metadata = array(); - if (isset($segment->target) && $segment->target->attributes()) { - $metadata['target-attributes'] = array(); - foreach ($segment->target->attributes() as $key => $value) { - $metadata['target-attributes'][$key] = (string) $value; - } - } - - if (isset($unit->notes)) { - $metadata['notes'] = array(); - foreach ($unit->notes->note as $noteNode) { - $note = array(); - foreach ($noteNode->attributes() as $key => $value) { - $note[$key] = (string) $value; + $metadata = array(); + if (isset($segment->target) && $segment->target->attributes()) { + $metadata['target-attributes'] = array(); + foreach ($segment->target->attributes() as $key => $value) { + $metadata['target-attributes'][$key] = (string) $value; } - $note['content'] = (string) $noteNode; - $metadata['notes'][] = $note; } - } - $catalogue->setMetadata((string) $source, $metadata, $domain); + if (isset($unit->notes)) { + $metadata['notes'] = array(); + foreach ($unit->notes->note as $noteNode) { + $note = array(); + foreach ($noteNode->attributes() as $key => $value) { + $note[$key] = (string) $value; + } + $note['content'] = (string) $noteNode; + $metadata['notes'][] = $note; + } + } + + $catalogue->setMetadata((string) $source, $metadata, $domain); + } } } /** * Convert a UTF8 string to the specified encoding. - * - * @param string $content String to decode - * @param string $encoding Target encoding - * - * @return string */ - private function utf8ToCharset($content, $encoding = null) + private function utf8ToCharset(string $content, string $encoding = null): string { if ('UTF-8' !== $encoding && !empty($encoding)) { return mb_convert_encoding($content, $encoding, 'UTF-8'); @@ -181,13 +172,9 @@ class XliffFileLoader implements LoaderInterface /** * Validates and parses the given file into a DOMDocument. * - * @param string $file - * @param \DOMDocument $dom - * @param string $schema source of the schema - * * @throws InvalidResourceException */ - private function validateSchema($file, \DOMDocument $dom, $schema) + private function validateSchema(string $file, \DOMDocument $dom, string $schema) { $internalErrors = libxml_use_internal_errors(true); @@ -224,13 +211,8 @@ class XliffFileLoader implements LoaderInterface /** * Internally changes the URI of a dependent xsd to be loaded locally. - * - * @param string $schemaSource Current content of schema file - * @param string $xmlUri External URI of XML to convert to local - * - * @return string */ - private function fixXmlLocation($schemaSource, $xmlUri) + private function fixXmlLocation(string $schemaSource, string $xmlUri): string { $newPath = str_replace('\\', '/', __DIR__).'/schema/dic/xliff-core/xml.xsd'; $parts = explode('/', $newPath); @@ -254,12 +236,8 @@ class XliffFileLoader implements LoaderInterface /** * Returns the XML errors of the internal XML parser. - * - * @param bool $internalErrors - * - * @return array An array of errors */ - private function getXmlErrors($internalErrors) + private function getXmlErrors(bool $internalErrors): array { $errors = array(); foreach (libxml_get_errors() as $error) { @@ -283,13 +261,9 @@ class XliffFileLoader implements LoaderInterface * Gets xliff file version based on the root "version" attribute. * Defaults to 1.2 for backwards compatibility. * - * @param \DOMDocument $dom - * * @throws InvalidArgumentException - * - * @return string */ - private function getVersionNumber(\DOMDocument $dom) + private function getVersionNumber(\DOMDocument $dom): string { /** @var \DOMNode $xliff */ foreach ($dom->getElementsByTagName('xliff') as $xliff) { @@ -312,13 +286,7 @@ class XliffFileLoader implements LoaderInterface return '1.2'; } - /** - * @param \SimpleXMLElement|null $noteElement - * @param string|null $encoding - * - * @return array - */ - private function parseNotesMetadata(\SimpleXMLElement $noteElement = null, $encoding = null) + private function parseNotesMetadata(\SimpleXMLElement $noteElement = null, string $encoding = null): array { $notes = array(); diff --git a/vendor/symfony/translation/Loader/YamlFileLoader.php b/vendor/symfony/translation/Loader/YamlFileLoader.php index 07914f26..ef84c32f 100644 --- a/vendor/symfony/translation/Loader/YamlFileLoader.php +++ b/vendor/symfony/translation/Loader/YamlFileLoader.php @@ -15,6 +15,7 @@ use Symfony\Component\Translation\Exception\InvalidResourceException; use Symfony\Component\Translation\Exception\LogicException; use Symfony\Component\Yaml\Parser as YamlParser; use Symfony\Component\Yaml\Exception\ParseException; +use Symfony\Component\Yaml\Yaml; /** * YamlFileLoader loads translations from Yaml files. @@ -38,18 +39,10 @@ class YamlFileLoader extends FileLoader $this->yamlParser = new YamlParser(); } - $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($resource, &$prevErrorHandler) { - $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$resource.'"$0', $message) : $message; - - return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false; - }); - try { - $messages = $this->yamlParser->parseFile($resource); + $messages = $this->yamlParser->parseFile($resource, Yaml::PARSE_CONSTANT); } catch (ParseException $e) { throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e); - } finally { - restore_error_handler(); } return $messages; diff --git a/vendor/symfony/translation/MessageCatalogue.php b/vendor/symfony/translation/MessageCatalogue.php index df917bbb..c36ea30e 100644 --- a/vendor/symfony/translation/MessageCatalogue.php +++ b/vendor/symfony/translation/MessageCatalogue.php @@ -30,7 +30,7 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf * @param string $locale The locale * @param array $messages An array of messages classified by domain */ - public function __construct($locale, array $messages = array()) + public function __construct(?string $locale, array $messages = array()) { $this->locale = $locale; $this->messages = $messages; diff --git a/vendor/symfony/translation/MessageCatalogueInterface.php b/vendor/symfony/translation/MessageCatalogueInterface.php index 4dad27fb..e0dbb2bd 100644 --- a/vendor/symfony/translation/MessageCatalogueInterface.php +++ b/vendor/symfony/translation/MessageCatalogueInterface.php @@ -105,7 +105,7 @@ interface MessageCatalogueInterface * * The two catalogues must have the same locale. */ - public function addCatalogue(MessageCatalogueInterface $catalogue); + public function addCatalogue(self $catalogue); /** * Merges translations from the given Catalogue into the current one @@ -113,7 +113,7 @@ interface MessageCatalogueInterface * * This is used to provide default translations when they do not exist for the current locale. */ - public function addFallbackCatalogue(MessageCatalogueInterface $catalogue); + public function addFallbackCatalogue(self $catalogue); /** * Gets the fallback catalogue. diff --git a/vendor/symfony/translation/PluralizationRules.php b/vendor/symfony/translation/PluralizationRules.php index 38dde743..48a6c608 100644 --- a/vendor/symfony/translation/PluralizationRules.php +++ b/vendor/symfony/translation/PluralizationRules.php @@ -107,6 +107,7 @@ class PluralizationRules case 'nl': case 'nn': case 'no': + case 'oc': case 'om': case 'or': case 'pa': diff --git a/vendor/symfony/translation/Resources/schemas/xliff-core-1.2-strict.xsd b/vendor/symfony/translation/Resources/schemas/xliff-core-1.2-strict.xsd index 056f5f95..dface628 100644 --- a/vendor/symfony/translation/Resources/schemas/xliff-core-1.2-strict.xsd +++ b/vendor/symfony/translation/Resources/schemas/xliff-core-1.2-strict.xsd @@ -3,16 +3,16 @@