From 3ddd4c1cc210f3d70594c5115eac9118a55c9e93 Mon Sep 17 00:00:00 2001 From: widmogrod Date: Tue, 12 Dec 2017 23:56:11 +0100 Subject: [PATCH] Update php-cs-fixer --- .php_cs | 102 +++-- composer.json | 2 +- composer.lock | 640 +++++++++++++++++++++++++++++--- example/MaybeMonadAndCollectionTest.php | 12 +- src/FantasyLand/Apply.php | 2 +- src/FantasyLand/Semigroup.php | 2 +- src/Functional/functions.php | 8 +- src/Monad/Identity.php | 2 +- test/Monad/MaybeTest.php | 4 +- test/Primitive/ListtTest.php | 4 +- test/Primitive/NumTest.php | 4 +- test/Primitive/ProductTest.php | 8 +- test/Primitive/StringgTest.php | 4 +- test/Primitive/SumTest.php | 8 +- 14 files changed, 666 insertions(+), 136 deletions(-) diff --git a/.php_cs b/.php_cs index ab8d1a3..a686bda 100644 --- a/.php_cs +++ b/.php_cs @@ -1,58 +1,50 @@ exclude('vendor') - ->in(__DIR__) -; - -return Symfony\CS\Config\Config::create() - ->level(Symfony\CS\FixerInterface::NONE_LEVEL) - ->fixers([ - 'psr0', - 'encoding', - 'short_tag', - 'braces', - 'elseif', - 'eof_ending', - 'function_call_space', - 'function_declaration', // ? - 'indentation', - 'line_after_namespace', - 'linefeed', - 'lowercase_constants', - 'lowercase_keywords', - 'php_closing_tag', - 'single_line_after_imports', - 'trailing_spaces', - 'visibility', - 'array_element_white_space_after_comma', - 'blankline_after_open_tag', - 'duplicate_semicolon', - 'extra_empty_lines', - 'function_typehint_space', - 'namespace_no_leading_whitespace', - 'no_blank_lines_after_class_opening', - 'no_empty_lines_after_phpdocs', - 'phpdoc_scalar', - 'phpdoc_separation', - 'phpdoc_types', - 'remove_leading_slash_use', - 'remove_lines_between_uses', - 'return', - 'self_accessor', - 'short_bool_cast', - 'single_array_no_trailing_comma', - 'spaces_before_semicolon', - 'spaces_cast', - 'standardize_not_equal', - 'ternary_spaces', - 'trim_array_spaces', - 'unused_use', - 'whitespacy_lines', - 'align_double_arrow', - 'header_comment', - 'newline_after_open_tag', - 'short_array_syntax', + ->in(__DIR__); +return PhpCsFixer\Config::create() + ->setUsingCache(true) + ->setRules([ + '@PSR2' => true, + 'encoding' => true, + 'braces' => true, + 'elseif' => true, + 'no_spaces_after_function_name' => true, + 'function_declaration' => true, + 'indentation_type' => true, + 'blank_line_after_namespace' => true, + 'line_ending' => true, + 'lowercase_constants' => true, + 'lowercase_keywords' => true, + 'no_closing_tag' => true, + 'single_line_after_imports' => true, + 'no_trailing_whitespace' => true, + 'visibility_required' => true, + 'whitespace_after_comma_in_array' => true, + 'blank_line_after_opening_tag' => true, + 'no_empty_statement' => true, + 'no_extra_consecutive_blank_lines' => true, + 'function_typehint_space' => true, + 'no_leading_namespace_whitespace' => true, + 'no_blank_lines_after_class_opening' => true, + 'no_blank_lines_after_phpdoc' => true, + 'phpdoc_scalar' => true, + 'phpdoc_types' => true, + 'no_leading_import_slash' => true, + 'no_extra_consecutive_blank_lines' => ['use'], + 'blank_line_before_return' => true, + 'self_accessor' => true, + 'no_short_bool_cast' => true, + 'no_trailing_comma_in_singleline_array' => true, + 'no_singleline_whitespace_before_semicolons' => true, + 'cast_spaces' => true, + 'standardize_not_equals' => true, + 'ternary_operator_spaces' => true, + 'trim_array_spaces' => true, + 'no_unused_imports' => true, + 'no_whitespace_in_blank_line' => true, + 'header_comment' => false, + 'linebreak_after_opening_tag' => true, + 'array_syntax' => ['syntax' => 'short'], ]) - ->finder($finder) -; + ->setFinder($finder); \ No newline at end of file diff --git a/composer.json b/composer.json index f96beed..0e49578 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ }, "require-dev": { "phpunit/phpunit": "^4.7", - "friendsofphp/php-cs-fixer": "^1.12", + "friendsofphp/php-cs-fixer": "^2", "codeclimate/php-test-reporter": "^0.4.4" }, "license": "MIT", diff --git a/composer.lock b/composer.lock index f8d4e76..8e6d076 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "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": "5da0bfae1d0b289a97759d208768384b", + "content-hash": "11bacaf078cb372c95433d25c250ac3f", "packages": [], "packages-dev": [ { @@ -67,6 +67,136 @@ "time": "2017-02-15T22:25:47+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": "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/instantiator", "version": "1.1.0", "source": { @@ -121,36 +251,106 @@ "time": "2017-07-22T11:58:36+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": "friendsofphp/php-cs-fixer", - "version": "v1.13.3", + "version": "v2.9.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "387e4c86c9dc0e1e4c475291fc114ec45b98e624" + "reference": "454ddbe65da6a9297446f442bad244e8a99a9a38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/387e4c86c9dc0e1e4c475291fc114ec45b98e624", - "reference": "387e4c86c9dc0e1e4c475291fc114ec45b98e624", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/454ddbe65da6a9297446f442bad244e8a99a9a38", + "reference": "454ddbe65da6a9297446f442bad244e8a99a9a38", "shasum": "" }, "require": { + "composer/semver": "^1.4", + "doctrine/annotations": "^1.2", + "ext-json": "*", "ext-tokenizer": "*", - "php": "^5.3.6 || >=7.0 <7.2", - "sebastian/diff": "^1.1", - "symfony/console": "^2.3 || ^3.0", - "symfony/event-dispatcher": "^2.1 || ^3.0", - "symfony/filesystem": "^2.1 || ^3.0", - "symfony/finder": "^2.1 || ^3.0", - "symfony/process": "^2.3 || ^3.0", - "symfony/stopwatch": "^2.5 || ^3.0" + "gecko-packages/gecko-php-unit": "^2.0 || ^3.0", + "php": "^5.6 || >=7.0 <7.3", + "php-cs-fixer/diff": "^1.2", + "symfony/console": "^3.2 || ^4.0", + "symfony/event-dispatcher": "^3.0 || ^4.0", + "symfony/filesystem": "^3.0 || ^4.0", + "symfony/finder": "^3.0 || ^4.0", + "symfony/options-resolver": "^3.0 || ^4.0", + "symfony/polyfill-php70": "^1.0", + "symfony/polyfill-php72": "^1.4", + "symfony/process": "^3.0 || ^4.0", + "symfony/stopwatch": "^3.0 || ^4.0" }, "conflict": { - "hhvm": "<3.9" + "hhvm": "*" }, "require-dev": { - "phpunit/phpunit": "^4.5|^5", - "satooshi/php-coveralls": "^1.0" + "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev", + "justinrainbow/json-schema": "^5.0", + "mikey179/vfsstream": "^1.6", + "php-coveralls/php-coveralls": "^2.0", + "php-cs-fixer/accessible-object": "^1.0", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "symfony/phpunit-bridge": "^3.2.2 || ^4.0" + }, + "suggest": { + "ext-mbstring": "For handling non-UTF8 characters in cache signature.", + "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." }, "bin": [ "php-cs-fixer" @@ -158,8 +358,15 @@ "type": "application", "autoload": { "psr-4": { - "Symfony\\CS\\": "Symfony/CS/" - } + "PhpCsFixer\\": "src/" + }, + "classmap": [ + "tests/Test/Assert/AssertTokensTrait.php", + "tests/Test/AbstractFixerTestCase.php", + "tests/Test/AbstractIntegrationTestCase.php", + "tests/Test/IntegrationCase.php", + "tests/Test/IntegrationCaseFactory.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -176,7 +383,56 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2017-09-11T14:11:16+00:00" + "time": "2017-12-08T16:36:20+00:00" + }, + { + "name": "gecko-packages/gecko-php-unit", + "version": "v3.0", + "source": { + "type": "git", + "url": "https://github.com/GeckoPackages/GeckoPHPUnit.git", + "reference": "6a866551dffc2154c1b091bae3a7877d39c25ca3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GeckoPackages/GeckoPHPUnit/zipball/6a866551dffc2154c1b091bae3a7877d39c25ca3", + "reference": "6a866551dffc2154c1b091bae3a7877d39c25ca3", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "suggest": { + "ext-dom": "When testing with xml.", + "ext-libxml": "When testing with xml.", + "phpunit/phpunit": "This is an extension for it so make sure you have it some way." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "GeckoPackages\\PHPUnit\\": "src/PHPUnit" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Additional PHPUnit asserts and constraints.", + "homepage": "https://github.com/GeckoPackages", + "keywords": [ + "extension", + "filesystem", + "phpunit" + ], + "time": "2017-08-23T07:46:41+00:00" }, { "name": "guzzle/guzzle", @@ -381,6 +637,102 @@ "time": "2017-07-12T22:42:45+00:00" }, { + "name": "paragonie/random_compat", + "version": "v2.0.11", + "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." + }, + "type": "library", + "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" + ], + "time": "2017-09-27T21:40:39+00:00" + }, + { + "name": "php-cs-fixer/diff", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "f0ef6133d674137e902fdf8a6f2e8e97e14a087b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/f0ef6133d674137e902fdf8a6f2e8e97e14a087b", + "reference": "f0ef6133d674137e902fdf8a6f2e8e97e14a087b", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.4.3", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "SpacePossum" + } + ], + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "time": "2017-10-19T09:58:18+00:00" + }, + { "name": "phpdocumentor/reflection-common", "version": "1.0.1", "source": { @@ -1638,30 +1990,30 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.1", + "version": "v4.0.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4" + "reference": "6223fb2b68e7059e8d5843c0103999a84e7275cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca20b8f9ef149f40ff656d52965f240d85f7a8e4", - "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6223fb2b68e7059e8d5843c0103999a84e7275cf", + "reference": "6223fb2b68e7059e8d5843c0103999a84e7275cf", "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": "", @@ -1670,7 +2022,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1697,29 +2049,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-11-09T14:14:31+00:00" + "time": "2017-11-09T17:30:28+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.1", + "version": "v4.0.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f" + "reference": "c9d4a26759ff75a077e4e334315cb632739b661a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/de56eee71e0a128d8c54ccc1909cdefd574bad0f", - "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/c9d4a26759ff75a077e4e334315cb632739b661a", + "reference": "c9d4a26759ff75a077e4e334315cb632739b661a", "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.0-dev" } }, "autoload": { @@ -1746,29 +2098,29 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-11-19T18:59:05+00:00" + "time": "2017-11-21T14:14:53+00:00" }, { "name": "symfony/finder", - "version": "v3.4.1", + "version": "v4.0.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a" + "reference": "c9cdda4dc4a3182d8d6daeebce4a25fef078ea4c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/dac8d7db537bac7ad8143eb11360a8c2231f251a", - "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a", + "url": "https://api.github.com/repos/symfony/finder/zipball/c9cdda4dc4a3182d8d6daeebce4a25fef078ea4c", + "reference": "c9cdda4dc4a3182d8d6daeebce4a25fef078ea4c", "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.0-dev" } }, "autoload": { @@ -1795,7 +2147,61 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-11-05T16:10:10+00:00" + "time": "2017-11-07T14:45:01+00:00" + }, + { + "name": "symfony/options-resolver", + "version": "v4.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "ef617a2867c7d889d4ecee3c29595698d87474a4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ef617a2867c7d889d4ecee3c29595698d87474a4", + "reference": "ef617a2867c7d889d4ecee3c29595698d87474a4", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "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 OptionsResolver Component", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "time": "2017-11-07T14:45:01+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1857,26 +2263,140 @@ "time": "2017-10-11T12:05:26+00:00" }, { + "name": "symfony/polyfill-php70", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff", + "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "~1.0|~2.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6-dev" + } + }, + "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" + ], + "time": "2017-10-11T12:05:26+00:00" + }, + { + "name": "symfony/polyfill-php72", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/6de4f4884b97abbbed9f0a84a95ff2ff77254254", + "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6-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": "2017-10-11T12:05:26+00:00" + }, + { "name": "symfony/process", - "version": "v3.4.1", + "version": "v4.0.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea" + "reference": "685dc11afcaaea72d7fd11c26835d12b091338f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/db25e810fd5e124085e3777257d0cf4ae533d0ea", - "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea", + "url": "https://api.github.com/repos/symfony/process/zipball/685dc11afcaaea72d7fd11c26835d12b091338f4", + "reference": "685dc11afcaaea72d7fd11c26835d12b091338f4", "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.0-dev" } }, "autoload": { @@ -1903,29 +2423,29 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-11-22T12:18:49+00:00" + "time": "2017-11-22T12:29:35+00:00" }, { "name": "symfony/stopwatch", - "version": "v3.4.1", + "version": "v4.0.1", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1" + "reference": "ac0e49150555c703fef6b696d8eaba1db7a3ca03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/52510fe1aefdc1c5d2076ac6030421d387e689d1", - "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/ac0e49150555c703fef6b696d8eaba1db7a3ca03", + "reference": "ac0e49150555c703fef6b696d8eaba1db7a3ca03", "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.0-dev" } }, "autoload": { @@ -1952,7 +2472,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2017-11-07T14:28:09+00:00" + "time": "2017-11-09T12:45:29+00:00" }, { "name": "symfony/yaml", @@ -2069,7 +2589,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.0" + "php": ">=7.1" }, "platform-dev": [] } diff --git a/example/MaybeMonadAndCollectionTest.php b/example/MaybeMonadAndCollectionTest.php index 17cbdc0..2bb85b8 100644 --- a/example/MaybeMonadAndCollectionTest.php +++ b/example/MaybeMonadAndCollectionTest.php @@ -22,12 +22,12 @@ class MaybeMonadAndCollectionTest extends \PHPUnit_Framework_TestCase }); $listOfFirstImages = f\pipeline( - Listt::of - , f\map(m\maybeNull) - , f\bind(f\bind($get('meta'))) - , f\bind(f\bind($get('images'))) - , f\bind(f\bind($get(0))) - , f\join + Listt::of, + f\map(m\maybeNull), + f\bind(f\bind($get('meta'))), + f\bind(f\bind($get('images'))), + f\bind(f\bind($get(0))), + f\join ); $result = $listOfFirstImages($data); diff --git a/src/FantasyLand/Apply.php b/src/FantasyLand/Apply.php index 99b689d..e3e4567 100644 --- a/src/FantasyLand/Apply.php +++ b/src/FantasyLand/Apply.php @@ -9,5 +9,5 @@ interface Apply extends Functor * * @return self */ - public function ap(Apply $b); + public function ap(self $b); } diff --git a/src/FantasyLand/Semigroup.php b/src/FantasyLand/Semigroup.php index 5cff780..2ec7f3e 100644 --- a/src/FantasyLand/Semigroup.php +++ b/src/FantasyLand/Semigroup.php @@ -11,5 +11,5 @@ interface Semigroup * * @return Semigroup */ - public function concat(Semigroup $value); + public function concat(self $value); } diff --git a/src/Functional/functions.php b/src/Functional/functions.php index 7f18f2c..658dd28 100644 --- a/src/Functional/functions.php +++ b/src/Functional/functions.php @@ -724,7 +724,8 @@ function liftM2( Monad $ma = null, Monad $mb = null ) { - return call_user_func_array(curryN(3, + return call_user_func_array(curryN( + 3, function ( callable $transformation, Monad $ma, @@ -735,7 +736,8 @@ function liftM2( return call_user_func($transformation, $a, $b); }); }); - }), func_get_args()); + } + ), func_get_args()); } /** @@ -950,7 +952,7 @@ function match(array $patterns, $value = null) } throw new \Exception(sprintf( - 'Cannot match "%s" type. Searching for %s', + 'Cannot match "%s" type. Defined patterns are %s', $givenType, implode(', ', array_keys($patterns)) )); diff --git a/src/Monad/Identity.php b/src/Monad/Identity.php index b2b40f7..4c84128 100644 --- a/src/Monad/Identity.php +++ b/src/Monad/Identity.php @@ -6,7 +6,7 @@ use Widmogrod\Common; use Widmogrod\FantasyLand; class Identity implements - FantasyLand\Monad , + FantasyLand\Monad, Common\ValueOfInterface { const of = 'Widmogrod\Monad\Identity::of'; diff --git a/test/Monad/MaybeTest.php b/test/Monad/MaybeTest.php index 0c1e93a..21d438e 100644 --- a/test/Monad/MaybeTest.php +++ b/test/Monad/MaybeTest.php @@ -124,7 +124,9 @@ class MaybeTest extends \PHPUnit_Framework_TestCase { MonoidLaws::test( f\curryN(3, [$this, 'assertEquals']), - $x, $y, $z + $x, + $y, + $z ); } diff --git a/test/Primitive/ListtTest.php b/test/Primitive/ListtTest.php index d237e56..e428f40 100644 --- a/test/Primitive/ListtTest.php +++ b/test/Primitive/ListtTest.php @@ -128,7 +128,9 @@ class ListtTest extends \PHPUnit_Framework_TestCase { MonoidLaws::test( f\curryN(3, [$this, 'assertEquals']), - $x, $y, $z + $x, + $y, + $z ); } diff --git a/test/Primitive/NumTest.php b/test/Primitive/NumTest.php index 7e43aa8..9e1b948 100644 --- a/test/Primitive/NumTest.php +++ b/test/Primitive/NumTest.php @@ -18,7 +18,9 @@ class NumTest extends \PHPUnit_Framework_TestCase ) { SetoidLaws::test( f\curryN(3, [$this, 'assertEquals']), - $a, $b, $c + $a, + $b, + $c ); } diff --git a/test/Primitive/ProductTest.php b/test/Primitive/ProductTest.php index c9e5c2b..fa25eb6 100644 --- a/test/Primitive/ProductTest.php +++ b/test/Primitive/ProductTest.php @@ -19,7 +19,9 @@ class ProductTest extends \PHPUnit_Framework_TestCase ) { SetoidLaws::test( f\curryN(3, [$this, 'assertEquals']), - $a, $b, $c + $a, + $b, + $c ); } @@ -33,7 +35,9 @@ class ProductTest extends \PHPUnit_Framework_TestCase ) { MonoidLaws::test( f\curryN(3, [$this, 'assertEquals']), - $a, $b, $c + $a, + $b, + $c ); } diff --git a/test/Primitive/StringgTest.php b/test/Primitive/StringgTest.php index 3572ca9..e6c65e7 100644 --- a/test/Primitive/StringgTest.php +++ b/test/Primitive/StringgTest.php @@ -16,7 +16,9 @@ class StringgTest extends \PHPUnit_Framework_TestCase { MonoidLaws::test( f\curryN(3, [$this, 'assertEquals']), - $x, $y, $z + $x, + $y, + $z ); } diff --git a/test/Primitive/SumTest.php b/test/Primitive/SumTest.php index 40cdfd4..3e2d41b 100644 --- a/test/Primitive/SumTest.php +++ b/test/Primitive/SumTest.php @@ -19,7 +19,9 @@ class SumTest extends \PHPUnit_Framework_TestCase ) { SetoidLaws::test( f\curryN(3, [$this, 'assertEquals']), - $a, $b, $c + $a, + $b, + $c ); } @@ -33,7 +35,9 @@ class SumTest extends \PHPUnit_Framework_TestCase ) { MonoidLaws::test( f\curryN(3, [$this, 'assertEquals']), - $a, $b, $c + $a, + $b, + $c ); } -- 2.11.0