diff --git a/composer.json b/composer.json index 3c08063..097681b 100644 --- a/composer.json +++ b/composer.json @@ -21,20 +21,19 @@ "minimum-stability": "stable", "name": "sellerlabs/illuminated", "require": { - "illuminate/auth": "^5.3", - "illuminate/contracts": "^5.3", - "illuminate/database": "^5.3", - "illuminate/session": "^5.3", - "illuminate/support": "^5.3", - "illuminate/view": "^5.3", + "illuminate/auth": "^5.4", + "illuminate/contracts": "^5.4", + "illuminate/database": "^5.4", + "illuminate/session": "^5.4", + "illuminate/support": "^5.4", + "illuminate/view": "^5.4", "league/commonmark": "^0.12", "sellerlabs/nucleus": "~0.5.0", - "tijsverkoyen/css-to-inline-styles": "~1.5", "vlucas/phpdotenv": "~2.0" }, "require-dev": { "doctrine/dbal": "~2.3", - "laravel/framework": "^5.3", + "laravel/framework": "^5.4", "mockery/mockery": "0.9.*@dev", "phpunit/phpunit": "~4.6@dev" } diff --git a/composer.lock b/composer.lock index d9e7a7c..1b7dd68 100644 --- a/composer.lock +++ b/composer.lock @@ -4,95 +4,8 @@ "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": "d9ecbfcdc56e2fba3876e7fa36cf572d", + "content-hash": "72230854bda5a05a06c6b4afb4afce05", "packages": [ - { - "name": "classpreloader/classpreloader", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/ClassPreloader/ClassPreloader.git", - "reference": "bc7206aa892b5a33f4680421b69b191efd32b096" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/bc7206aa892b5a33f4680421b69b191efd32b096", - "reference": "bc7206aa892b5a33f4680421b69b191efd32b096", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^1.0|^2.0|^3.0", - "php": ">=5.5.9" - }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "ClassPreloader\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com" - }, - { - "name": "Graham Campbell", - "email": "graham@alt-three.com" - } - ], - "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case", - "keywords": [ - "autoload", - "class", - "preload" - ], - "time": "2016-09-16T12:50:15+00:00" - }, - { - "name": "dnoegel/php-xdg-base-dir", - "version": "0.1", - "source": { - "type": "git", - "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/265b8593498b997dc2d31e75b89f053b5cc9621a", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "@stable" - }, - "type": "project", - "autoload": { - "psr-4": { - "XdgBaseDir\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24T07:27:01+00:00" - }, { "name": "doctrine/inflector", "version": "v1.1.0", @@ -161,77 +74,26 @@ "time": "2015-11-06T14:35:42+00:00" }, { - "name": "jakub-onderka/php-console-color", - "version": "0.1", + "name": "erusev/parsedown", + "version": "1.6.3", "source": { "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", - "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1" + "url": "https://github.com/erusev/parsedown.git", + "reference": "728952b90a333b5c6f77f06ea9422b94b585878d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1", - "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/728952b90a333b5c6f77f06ea9422b94b585878d", + "reference": "728952b90a333b5c6f77f06ea9422b94b585878d", "shasum": "" }, "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "jakub-onderka/php-code-style": "1.0", - "jakub-onderka/php-parallel-lint": "0.*", - "jakub-onderka/php-var-dump-check": "0.*", - "phpunit/phpunit": "3.7.*", - "squizlabs/php_codesniffer": "1.*" - }, - "type": "library", - "autoload": { - "psr-0": { - "JakubOnderka\\PhpConsoleColor": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "jakub.onderka@gmail.com", - "homepage": "http://www.acci.cz" - } - ], - "time": "2014-04-08T15:00:19+00:00" - }, - { - "name": "jakub-onderka/php-console-highlighter", - "version": "v0.3.2", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "shasum": "" - }, - "require": { - "jakub-onderka/php-console-color": "~0.1", "php": ">=5.3.0" }, - "require-dev": { - "jakub-onderka/php-code-style": "~1.0", - "jakub-onderka/php-parallel-lint": "~0.5", - "jakub-onderka/php-var-dump-check": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, "type": "library", "autoload": { "psr-0": { - "JakubOnderka\\PhpConsoleHighlighter": "src/" + "Parsedown": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -240,109 +102,55 @@ ], "authors": [ { - "name": "Jakub Onderka", - "email": "acci@acci.cz", - "homepage": "http://www.acci.cz/" + "name": "Emanuil Rusev", + "email": "hello@erusev.com", + "homepage": "http://erusev.com" } ], - "time": "2015-04-20T18:58:01+00:00" - }, - { - "name": "jeremeamia/SuperClosure", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/jeremeamia/super_closure.git", - "reference": "443c3df3207f176a1b41576ee2a66968a507b3db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/443c3df3207f176a1b41576ee2a66968a507b3db", - "reference": "443c3df3207f176a1b41576ee2a66968a507b3db", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^1.2|^2.0|^3.0", - "php": ">=5.4", - "symfony/polyfill-php56": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "SuperClosure\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia", - "role": "Developer" - } - ], - "description": "Serialize Closure objects, including their context and binding", - "homepage": "https://github.com/jeremeamia/super_closure", + "description": "Parser for Markdown.", + "homepage": "http://parsedown.org", "keywords": [ - "closure", - "function", - "lambda", - "parser", - "serializable", - "serialize", - "tokenizer" + "markdown", + "parser" ], - "time": "2016-12-07T09:37:55+00:00" + "time": "2017-05-14T14:47:48+00:00" }, { "name": "laravel/framework", - "version": "v5.3.31", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e641e75fc5b26ad0ba8c19b7e83b08cad1d03b89" + "reference": "442511fc62121085d184355e4f964c88942bbecb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e641e75fc5b26ad0ba8c19b7e83b08cad1d03b89", - "reference": "e641e75fc5b26ad0ba8c19b7e83b08cad1d03b89", + "url": "https://api.github.com/repos/laravel/framework/zipball/442511fc62121085d184355e4f964c88942bbecb", + "reference": "442511fc62121085d184355e4f964c88942bbecb", "shasum": "" }, "require": { - "classpreloader/classpreloader": "~3.0", "doctrine/inflector": "~1.0", + "erusev/parsedown": "~1.6", "ext-mbstring": "*", "ext-openssl": "*", - "jeremeamia/superclosure": "~2.2", "league/flysystem": "~1.0", "monolog/monolog": "~1.11", "mtdowling/cron-expression": "~1.0", "nesbot/carbon": "~1.20", "paragonie/random_compat": "~1.4|~2.0", "php": ">=5.6.4", - "psy/psysh": "0.7.*|0.8.*", "ramsey/uuid": "~3.0", "swiftmailer/swiftmailer": "~5.4", - "symfony/console": "3.1.*", - "symfony/debug": "3.1.*", - "symfony/finder": "3.1.*", - "symfony/http-foundation": "3.1.*", - "symfony/http-kernel": "3.1.*", - "symfony/process": "3.1.*", - "symfony/routing": "3.1.*", - "symfony/translation": "3.1.*", - "symfony/var-dumper": "3.1.*", + "symfony/console": "~3.2", + "symfony/debug": "~3.2", + "symfony/finder": "~3.2", + "symfony/http-foundation": "~3.2", + "symfony/http-kernel": "~3.2", + "symfony/process": "~3.2", + "symfony/routing": "~3.2", + "symfony/var-dumper": "~3.2", + "tijsverkoyen/css-to-inline-styles": "~2.2", "vlucas/phpdotenv": "~2.2" }, "replace": { @@ -379,31 +187,34 @@ }, "require-dev": { "aws/aws-sdk-php": "~3.0", + "doctrine/dbal": "~2.5", "mockery/mockery": "~0.9.4", "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~5.4", + "phpunit/phpunit": "~5.7", "predis/predis": "~1.0", - "symfony/css-selector": "3.1.*", - "symfony/dom-crawler": "3.1.*" + "symfony/css-selector": "~3.2", + "symfony/dom-crawler": "~3.2" }, "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.4).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).", "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 (~5.3|~6.0).", + "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-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 (~2.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (3.1.*).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (3.1.*).", - "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)." + "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.2).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.2).", + "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.3-dev" + "dev-master": "5.4-dev" } }, "autoload": { @@ -431,7 +242,7 @@ "framework", "laravel" ], - "time": "2017-03-24T16:31:06+00:00" + "time": "2017-06-30T13:43:07+00:00" }, { "name": "league/commonmark", @@ -797,57 +608,6 @@ ], "time": "2017-01-16T07:55:07+00:00" }, - { - "name": "nikic/php-parser", - "version": "v3.0.6", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "0808939f81c1347a3c8a82a5925385a08074b0f1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0808939f81c1347a3c8a82a5925385a08074b0f1", - "reference": "0808939f81c1347a3c8a82a5925385a08074b0f1", - "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": "2017-06-28T20:53:48+00:00" - }, { "name": "paragonie/random_compat", "version": "v2.0.10", @@ -943,79 +703,6 @@ ], "time": "2016-10-10T12:19:37+00:00" }, - { - "name": "psy/psysh", - "version": "v0.8.8", - "source": { - "type": "git", - "url": "https://github.com/bobthecow/psysh.git", - "reference": "fe65c30cbc55c71e61ba3a38b5a581149be31b8e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/fe65c30cbc55c71e61ba3a38b5a581149be31b8e", - "reference": "fe65c30cbc55c71e61ba3a38b5a581149be31b8e", - "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", - "symfony/var-dumper": "~2.7|~3.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~1.11", - "hoa/console": "~3.16|~1.14", - "phpunit/phpunit": "~4.4|~5.0", - "symfony/finder": "~2.1|~3.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." - }, - "bin": [ - "bin/psysh" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.8.x-dev" - } - }, - "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" - ], - "time": "2017-06-24T06:16:19+00:00" - }, { "name": "ramsey/uuid", "version": "3.6.1", @@ -1198,16 +885,16 @@ }, { "name": "symfony/console", - "version": "v3.1.10", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "047f16485d68c083bd5d9b73ff16f9cb9c1a9f52" + "reference": "a97e45d98c59510f085fa05225a1acb74dfe0546" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/047f16485d68c083bd5d9b73ff16f9cb9c1a9f52", - "reference": "047f16485d68c083bd5d9b73ff16f9cb9c1a9f52", + "url": "https://api.github.com/repos/symfony/console/zipball/a97e45d98c59510f085fa05225a1acb74dfe0546", + "reference": "a97e45d98c59510f085fa05225a1acb74dfe0546", "shasum": "" }, "require": { @@ -1215,20 +902,28 @@ "symfony/debug": "~2.8|~3.0", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.3" + }, "require-dev": { "psr/log": "~1.0", + "symfony/config": "~3.3", + "symfony/dependency-injection": "~3.3", "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/filesystem": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0", "symfony/process": "~2.8|~3.0" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", + "symfony/filesystem": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1255,11 +950,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:43:43+00:00" + "time": "2017-07-03T13:19:36+00:00" }, { "name": "symfony/css-selector", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -1312,16 +1007,16 @@ }, { "name": "symfony/debug", - "version": "v3.1.10", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "c6661361626b3cf5cf2089df98b3b5006a197e85" + "reference": "63b85a968486d95ff9542228dc2e4247f16f9743" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/c6661361626b3cf5cf2089df98b3b5006a197e85", - "reference": "c6661361626b3cf5cf2089df98b3b5006a197e85", + "url": "https://api.github.com/repos/symfony/debug/zipball/63b85a968486d95ff9542228dc2e4247f16f9743", + "reference": "63b85a968486d95ff9542228dc2e4247f16f9743", "shasum": "" }, "require": { @@ -1332,13 +1027,12 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.8|~3.0", "symfony/http-kernel": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1365,20 +1059,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-28T00:04:57+00:00" + "time": "2017-07-05T13:02:37+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "4054a102470665451108f9b59305c79176ef98f0" + "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4054a102470665451108f9b59305c79176ef98f0", - "reference": "4054a102470665451108f9b59305c79176ef98f0", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e", + "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e", "shasum": "" }, "require": { @@ -1428,20 +1122,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-06-04T18:15:29+00:00" + "time": "2017-06-09T14:53:08+00:00" }, { "name": "symfony/finder", - "version": "v3.1.10", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "59687a255d1562f2c17b012418273862083d85f7" + "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/59687a255d1562f2c17b012418273862083d85f7", - "reference": "59687a255d1562f2c17b012418273862083d85f7", + "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4", + "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4", "shasum": "" }, "require": { @@ -1450,7 +1144,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1477,20 +1171,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:31:54+00:00" + "time": "2017-06-01T21:01:25+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.1.10", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "cef0ad49a2e90455cfc649522025b5a2929648c0" + "reference": "f347a5f561b03db95ed666959db42bbbf429b7e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cef0ad49a2e90455cfc649522025b5a2929648c0", - "reference": "cef0ad49a2e90455cfc649522025b5a2929648c0", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f347a5f561b03db95ed666959db42bbbf429b7e5", + "reference": "f347a5f561b03db95ed666959db42bbbf429b7e5", "shasum": "" }, "require": { @@ -1503,7 +1197,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1530,20 +1224,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:43:43+00:00" + "time": "2017-06-24T09:29:48+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.1.10", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "c830387dec1b48c100473d10a6a356c3c3ae2a13" + "reference": "33f87c957122cfbd9d90de48698ee074b71106ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c830387dec1b48c100473d10a6a356c3c3ae2a13", - "reference": "c830387dec1b48c100473d10a6a356c3c3ae2a13", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/33f87c957122cfbd9d90de48698ee074b71106ea", + "reference": "33f87c957122cfbd9d90de48698ee074b71106ea", "shasum": "" }, "require": { @@ -1551,18 +1245,22 @@ "psr/log": "~1.0", "symfony/debug": "~2.8|~3.0", "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/http-foundation": "~2.8.13|~3.1.6|~3.2" + "symfony/http-foundation": "~3.3" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<2.8", + "symfony/dependency-injection": "<3.3", + "symfony/var-dumper": "<3.3", + "twig/twig": "<1.34|<2.4,>=2" }, "require-dev": { + "psr/cache": "~1.0", "symfony/browser-kit": "~2.8|~3.0", "symfony/class-loader": "~2.8|~3.0", "symfony/config": "~2.8|~3.0", "symfony/console": "~2.8|~3.0", "symfony/css-selector": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", "symfony/dom-crawler": "~2.8|~3.0", "symfony/expression-language": "~2.8|~3.0", "symfony/finder": "~2.8|~3.0", @@ -1571,7 +1269,7 @@ "symfony/stopwatch": "~2.8|~3.0", "symfony/templating": "~2.8|~3.0", "symfony/translation": "~2.8|~3.0", - "symfony/var-dumper": "~2.8|~3.0" + "symfony/var-dumper": "~3.3" }, "suggest": { "symfony/browser-kit": "", @@ -1585,7 +1283,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1612,7 +1310,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-01-28T02:53:17+00:00" + "time": "2017-07-05T13:28:15+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1673,126 +1371,18 @@ ], "time": "2017-06-09T14:24:12+00:00" }, - { - "name": "symfony/polyfill-php56", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php56\\": "" - }, - "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 5.6+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2017-06-09T08:25:21+00:00" - }, - { - "name": "symfony/polyfill-util", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Util\\": "" - } - }, - "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 utilities for portability of PHP codes", - "homepage": "https://symfony.com", - "keywords": [ - "compat", - "compatibility", - "polyfill", - "shim" - ], - "time": "2017-06-09T08:25:21+00:00" - }, { "name": "symfony/process", - "version": "v3.1.10", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "2605753c5f8c531623d24d002825ebb1d6a22248" + "reference": "5ab8949b682b1bf9d4511a228b5e045c96758c30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2605753c5f8c531623d24d002825ebb1d6a22248", - "reference": "2605753c5f8c531623d24d002825ebb1d6a22248", + "url": "https://api.github.com/repos/symfony/process/zipball/5ab8949b682b1bf9d4511a228b5e045c96758c30", + "reference": "5ab8949b682b1bf9d4511a228b5e045c96758c30", "shasum": "" }, "require": { @@ -1801,7 +1391,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1828,36 +1418,39 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:13:55+00:00" + "time": "2017-07-03T08:12:02+00:00" }, { "name": "symfony/routing", - "version": "v3.1.10", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "f25581d4eb0a82962c291917f826166f0dcd8a9a" + "reference": "dc70bbd0ca7b19259f63cdacc8af370bc32a4728" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/f25581d4eb0a82962c291917f826166f0dcd8a9a", - "reference": "f25581d4eb0a82962c291917f826166f0dcd8a9a", + "url": "https://api.github.com/repos/symfony/routing/zipball/dc70bbd0ca7b19259f63cdacc8af370bc32a4728", + "reference": "dc70bbd0ca7b19259f63cdacc8af370bc32a4728", "shasum": "" }, "require": { "php": ">=5.5.9" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<2.8", + "symfony/dependency-injection": "<3.3", + "symfony/yaml": "<3.3" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", "symfony/expression-language": "~2.8|~3.0", "symfony/http-foundation": "~2.8|~3.0", - "symfony/yaml": "~2.8|~3.0" + "symfony/yaml": "~3.3" }, "suggest": { "doctrine/annotations": "For using the annotation loader", @@ -1870,7 +1463,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1903,20 +1496,20 @@ "uri", "url" ], - "time": "2017-01-28T00:04:57+00:00" + "time": "2017-06-24T09:29:48+00:00" }, { "name": "symfony/translation", - "version": "v3.1.10", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "d5a20fab5f63f44c233c69b3041c3cb1d4945e45" + "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/d5a20fab5f63f44c233c69b3041c3cb1d4945e45", - "reference": "d5a20fab5f63f44c233c69b3041c3cb1d4945e45", + "url": "https://api.github.com/repos/symfony/translation/zipball/35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3", + "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3", "shasum": "" }, "require": { @@ -1924,13 +1517,14 @@ "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<2.8", + "symfony/yaml": "<3.3" }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", - "symfony/intl": "~2.8|~3.0", - "symfony/yaml": "~2.8|~3.0" + "symfony/intl": "^2.8.18|^3.2.5", + "symfony/yaml": "~3.3" }, "suggest": { "psr/log": "To use logging capability in translator", @@ -1940,7 +1534,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1967,36 +1561,41 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:01:39+00:00" + "time": "2017-06-24T16:45:30+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.1.10", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "16df11647e5b992d687cb4eeeb9a882d5f5c26b9" + "reference": "9ee920bba1d2ce877496dcafca7cbffff4dbe08a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/16df11647e5b992d687cb4eeeb9a882d5f5c26b9", - "reference": "16df11647e5b992d687cb4eeeb9a882d5f5c26b9", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9ee920bba1d2ce877496dcafca7cbffff4dbe08a", + "reference": "9ee920bba1d2ce877496dcafca7cbffff4dbe08a", "shasum": "" }, "require": { "php": ">=5.5.9", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + }, "require-dev": { - "twig/twig": "~1.20|~2.0" + "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-symfony_debug": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -2030,33 +1629,33 @@ "debug", "dump" ], - "time": "2017-01-24T13:02:38+00:00" + "time": "2017-07-05T13:02:37+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "1.5.5", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "9753fc340726e327e4d48b7c0604f85475ae0bc3" + "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/9753fc340726e327e4d48b7c0604f85475ae0bc3", - "reference": "9753fc340726e327e4d48b7c0604f85475ae0bc3", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b", + "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b", "shasum": "" }, "require": { - "php": ">=5.3.0", - "symfony/css-selector": "~2.1|~3.0" + "php": "^5.5 || ^7", + "symfony/css-selector": "^2.7|~3.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.8|5.1.*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -2066,7 +1665,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD" + "BSD-3-Clause" ], "authors": [ { @@ -2077,7 +1676,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": "2015-12-08T16:14:14+00:00" + "time": "2016-09-20T12:50:39+00:00" }, { "name": "vlucas/phpdotenv", @@ -3657,16 +3256,16 @@ }, { "name": "symfony/yaml", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063" + "reference": "1f93a8d19b8241617f5074a123e282575b821df8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/9752a30000a8ca9f4b34b5227d15d0101b96b063", - "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063", + "url": "https://api.github.com/repos/symfony/yaml/zipball/1f93a8d19b8241617f5074a123e282575b821df8", + "reference": "1f93a8d19b8241617f5074a123e282575b821df8", "shasum": "" }, "require": { @@ -3708,7 +3307,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-06-02T22:05:06+00:00" + "time": "2017-06-15T12:58:50+00:00" }, { "name": "webmozart/assert", diff --git a/src/SellerLabs/Illuminated/Contracts/Inliner/StyleInliner.php b/src/SellerLabs/Illuminated/Contracts/Inliner/StyleInliner.php deleted file mode 100644 index 9dc8567..0000000 --- a/src/SellerLabs/Illuminated/Contracts/Inliner/StyleInliner.php +++ /dev/null @@ -1,66 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - * - * This file is part of the Illuminated package - */ - -namespace SellerLabs\Illuminated\Contracts\Inliner; - -use Illuminate\Contracts\Mail\Mailer; -use Illuminate\Contracts\View\View; -use SellerLabs\Illuminated\Inliner\Exceptions\StylesheetNotFoundException; - -/** - * Interface StyleInliner. - * - * Converts CSS/HTML file combinations into a single string - * of HTML with inlined styles, which is useful for rendering the - * contents of an email since many services strip style blocks - * from emails. - * - * @author Eduardo Trujillo - * @package SellerLabs\Illuminated\Contracts\Inliner - */ -interface StyleInliner -{ - /** - * Inline CSS stylesheet into a HTML string or Laravel view. - * - * If a Laravel view is provided, the view will be rendered - * - * @param string|View $content - * @param string $stylesheet Name of the stylesheet file - * @param string $extension Extension of the stylesheet file - * @param bool $xhtml Whether or not to use XHTML for rendering - * - * @throws StylesheetNotFoundException - * @throws \TijsVerkoyen\CssToInlineStyles\Exception - * @return string - */ - public function inline( - $content, - $stylesheet, - $extension = '.css', - $xhtml = false - ); - - /** - * Inline the content and then send it over the mailer. - * - * @param Mailer $mailer - * @param mixed $content - * @param string $name - * @param callable $callback - */ - public function inlineAndSend( - Mailer $mailer, - $content, - $name, - callable $callback - ); -} diff --git a/src/SellerLabs/Illuminated/Hashing/AggregatedHashServiceProvider.php b/src/SellerLabs/Illuminated/Hashing/AggregatedHashServiceProvider.php index 30d9e9a..345f4b1 100644 --- a/src/SellerLabs/Illuminated/Hashing/AggregatedHashServiceProvider.php +++ b/src/SellerLabs/Illuminated/Hashing/AggregatedHashServiceProvider.php @@ -29,9 +29,10 @@ class AggregatedHashServiceProvider extends ServiceProvider */ public function register() { - $this->app->singleton(['hash', Hasher::class], function () { - return new AggregatedHasher(); - }); + $hasher = new AggregatedHasher(); + + $this->app->singleton('hash', $hasher); + $this->app->singleton(Hasher::class, $hasher); } /** diff --git a/src/SellerLabs/Illuminated/Inliner/Exceptions/StylesheetNotFoundException.php b/src/SellerLabs/Illuminated/Inliner/Exceptions/StylesheetNotFoundException.php deleted file mode 100644 index ac20cf9..0000000 --- a/src/SellerLabs/Illuminated/Inliner/Exceptions/StylesheetNotFoundException.php +++ /dev/null @@ -1,28 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - * - * This file is part of the Illuminated package - */ - -namespace SellerLabs\Illuminated\Inliner\Exceptions; - -use SellerLabs\Nucleus\Exceptions\CoreException; - -/** - * Class StylesheetNotFoundException. - * - * Thrown when the inliner is unable to locate a stylesheet - * based on the provided information - * - * @author Eduardo Trujillo - * @package SellerLabs\Illuminated\Inliner\Exceptions - */ -class StylesheetNotFoundException extends CoreException -{ - // -} diff --git a/src/SellerLabs/Illuminated/Inliner/InlinerServiceProvider.php b/src/SellerLabs/Illuminated/Inliner/InlinerServiceProvider.php deleted file mode 100644 index d8c98eb..0000000 --- a/src/SellerLabs/Illuminated/Inliner/InlinerServiceProvider.php +++ /dev/null @@ -1,60 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - * - * This file is part of the Illuminated package - */ - -namespace SellerLabs\Illuminated\Inliner; - -use SellerLabs\Illuminated\Contracts\Inliner\StyleInliner as InlinerContract; -use SellerLabs\Illuminated\Support\ServiceProvider; - -/** - * Class InlinerServiceProvider. - * - * @author Eduardo Trujillo - * @package SellerLabs\Illuminated\Inliner - */ -class InlinerServiceProvider extends ServiceProvider -{ - /** - * Indicates if loading of the provider is deferred. - * - * @var bool - */ - protected $defer = true; - - /** - * Register the service provider. - * - */ - public function register() - { - $this->app->bind( - InlinerContract::class, - function ($app) { - return new StyleInliner( - $app['config']['inliner.paths.stylesheets'], - $app['config']['inliner.options'] - ); - } - ); - } - - /** - * Return provide services in an array. - * - * @return array - */ - public function provides() - { - return [ - InlinerContract::class, - ]; - } -} diff --git a/src/SellerLabs/Illuminated/Inliner/StyleInliner.php b/src/SellerLabs/Illuminated/Inliner/StyleInliner.php deleted file mode 100644 index 1b69923..0000000 --- a/src/SellerLabs/Illuminated/Inliner/StyleInliner.php +++ /dev/null @@ -1,205 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - * - * This file is part of the Illuminated package - */ - -namespace SellerLabs\Illuminated\Inliner; - -use Illuminate\Contracts\Mail\Mailer; -use Illuminate\Contracts\View\View; -use Illuminate\Mail\Message; -use SellerLabs\Illuminated\Contracts\Inliner\StyleInliner as InlinerContract; -use SellerLabs\Illuminated\Inliner\Exceptions\StylesheetNotFoundException; -use SellerLabs\Nucleus\Foundation\BaseObject; -use Symfony\Component\Finder\Finder; -use Symfony\Component\Finder\SplFileInfo; -use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles; - -/** - * Class StyleInliner. - * - * Converts CSS/HTML file combinations into a single string - * of HTML with inlined styles, which is useful for rendering the - * contents of an email since many services strip style blocks - * from emails. - * - * @author Eduardo Trujillo - * @package SellerLabs\Illuminated\Inliner - */ -class StyleInliner extends BaseObject implements InlinerContract -{ - /** - * Internal inliner. - * - * @var CssToInlineStyles - */ - protected $internalInliner; - - /** - * Options. - * - * @var array - */ - protected $options; - - /** - * Array of directories where we can locate stylesheets. - * - * @var array - */ - protected $stylesheetPaths; - - /** - * Construct an instance of a StyleInliner. - * - * @param array $stylesheets - * @param array $options - */ - public function __construct(array $stylesheets, array $options = null) - { - parent::__construct(); - - $this->stylesheetPaths = $stylesheets; - $this->options = $options; - - if (is_null($this->options)) { - $this->options = [ - 'cleanup' => false, - 'use_inline_styles_block' => false, - 'strip_original_tags' => false, - 'exclude_media_queries' => false, - ]; - } - - $this->internalInliner = new CssToInlineStyles(); - - $this->configure(); - } - - /** - * Inline CSS stylesheet into a HTML string or Laravel view. - * - * If a Laravel view is provided, the view will be rendered - * - * @param string|View $content - * @param string $stylesheet Name of the stylesheet file - * @param string $extension Extension of the stylesheet file - * @param bool $xhtml Whether or not to use XHTML for rendering - * - * @throws StylesheetNotFoundException - * @throws \TijsVerkoyen\CssToInlineStyles\Exception - * @return string - */ - public function inline( - $content, - $stylesheet, - $extension = '.css', - $xhtml = false - ) { - // If the content is a Laravel view, then we will render it first - if ($content instanceof View) { - $content = $content->render(); - } - - // Set the HTML content of the inliner - $this->internalInliner->setHTML($content); - - // Resolve the stylesheet and set it as the CSS of the inliner - $this->internalInliner->setCSS( - $this->resolveStylesheet($stylesheet, $extension)->getContents() - ); - - // Inline the styles into style blocks - $result = $this->internalInliner->convert($xhtml); - - // Do some housekeeping before returning - $this->cleanup(); - - return $result; - } - - /** - * Attempt to resolve the file path of a stylesheet using its name. - * - * @param string $name - * @param string $extension - * - * @throws StylesheetNotFoundException - * @return mixed - */ - protected function resolveStylesheet($name, $extension = '.css') - { - $finder = new Finder(); - - $finder - ->files() - ->in($this->stylesheetPaths) - ->name($name . $extension); - - /** @var SplFileInfo $file */ - foreach ($finder as $file) { - return $file; - } - - throw new StylesheetNotFoundException(); - } - - /** - * Reset the internal inliner object. - */ - protected function cleanup() - { - $this->internalInliner->setHTML(''); - $this->internalInliner->setCSS(''); - } - - /** - * Configure the internal inliner. - */ - protected function configure() - { - $this->internalInliner->setCleanup($this->options['cleanup']); - - $this->internalInliner->setUseInlineStylesBlock( - $this->options['use_inline_styles_block'] - ); - $this->internalInliner->setStripOriginalStyleTags( - $this->options['strip_original_tags'] - ); - $this->internalInliner->setExcludeMediaQueries( - $this->options['exclude_media_queries'] - ); - } - - /** - * Inline the content and then send it over the mailer. - * - * @param Mailer $mailer - * @param mixed $content - * @param string $name - * @param callable $callback - */ - public function inlineAndSend( - Mailer $mailer, - $content, $name, - callable $callback - ) { - $content = $this->inline($content, $name); - - $mailer->send( - ['raw' => ''], - [], - function (Message $message) use ($content, $callback) { - $message->getSwiftMessage()->setBody($content, 'text/html'); - - $callback($message); - } - ); - } -} diff --git a/tests/SellerLabs/Illuminated/Inliner/InlinerServiceProviderTest.php b/tests/SellerLabs/Illuminated/Inliner/InlinerServiceProviderTest.php deleted file mode 100644 index d36579d..0000000 --- a/tests/SellerLabs/Illuminated/Inliner/InlinerServiceProviderTest.php +++ /dev/null @@ -1,90 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - * - * This file is part of the Illuminated package - */ - -namespace SellerLabs\Illuminated\Inliner; - -use Illuminate\Config\Repository; -use Illuminate\Foundation\Application; -use SellerLabs\Nucleus\Testing\TestCase; - -/** - * Class InlinerServiceProviderTest. - * - * @author Eduardo Trujillo - * @package SellerLabs\Illuminated\Inliner - */ -class InlinerServiceProviderTest extends TestCase -{ - /** - * @var Application - */ - protected $app; - - /** - * Setup the test. - */ - protected function setUp() - { - parent::setUp(); - - $this->app = new Application(); - - $this->app->bind( - 'config', - function () { - return new Repository( - [ - 'inliner' => [ - 'paths' => [ - 'stylesheets' => [ - 'some/path/n/stuff', - ], - ], - 'options' => [ - 'cleanup' => false, - 'use_inline_styles_block' => false, - 'strip_original_tags' => false, - 'exclude_media_queries' => false, - ], - ], - ] - ); - } - ); - } - - public function testRegister() - { - $provider = new InlinerServiceProvider($this->app); - - $provider->register(); - - $this->assertTrue( - $this->app->bound( - 'SellerLabs\Illuminated\Contracts\Inliner\StyleInliner' - ) - ); - - $this->assertInstanceOf( - 'SellerLabs\Illuminated\Contracts\Inliner\StyleInliner', - $this->app->make( - 'SellerLabs\Illuminated\Contracts\Inliner\StyleInliner' - ) - ); - } - - public function testProvides() - { - $provider = new InlinerServiceProvider($this->app); - - $this->assertInternalType('array', $provider->provides()); - } -} diff --git a/tests/SellerLabs/Illuminated/Inliner/StyleInlinerTest.php b/tests/SellerLabs/Illuminated/Inliner/StyleInlinerTest.php deleted file mode 100644 index 160ed67..0000000 --- a/tests/SellerLabs/Illuminated/Inliner/StyleInlinerTest.php +++ /dev/null @@ -1,116 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - * - * This file is part of the Illuminated package - */ - -namespace Tests\SellerLabs\Illuminated\Inliner; - -use Mockery; -use SellerLabs\Illuminated\Inliner\StyleInliner; -use SellerLabs\Nucleus\Testing\TestCase; - -/** - * Class StyleInlinerTest. - * - * @author Eduardo Trujillo - * @package Tests\SellerLabs\Illuminated\Inliner - */ -class StyleInlinerTest extends TestCase -{ - public function testConstructor() - { - $inliner = new StyleInliner( - ['some/path'], - [ - 'cleanup' => false, - 'use_inline_styles_block' => false, - 'strip_original_tags' => false, - 'exclude_media_queries' => false, - ] - ); - - $this->assertInstanceOf( - [ - 'SellerLabs\Illuminated\Inliner\StyleInliner', - ], - $inliner - ); - } - - public function testConstructorWithNoOptions() - { - $inliner = new StyleInliner(['some/path']); - - $this->assertInstanceOf( - [ - 'SellerLabs\Illuminated\Inliner\StyleInliner', - ], - $inliner - ); - } - - public function testInline() - { - $inliner = new StyleInliner([__DIR__ . '/../../../resources/']); - - $output = $inliner->inline('

Hi

', 'testing'); - - $this->assertTrue( - false !== strpos($output, 'style="font-size: 43px;"') - ); - } - - public function testInlineWithView() - { - $mock = Mockery::mock('Illuminate\Contracts\View\View'); - - $mock->shouldReceive('render')->andReturn( - '

Hi

' - ); - - $inliner = new StyleInliner([__DIR__ . '/../../../resources/']); - - $output = $inliner->inline($mock, 'testing'); - - $this->assertTrue( - false !== strpos($output, 'style="font-size: 43px;"') - ); - } - - public function testInlineAndSend() - { - $mock = Mockery::mock('Illuminate\Contracts\View\View'); - $mock->shouldReceive('render')->andReturn( - '

Hi

' - ); - - $mailer = Mockery::mock('Illuminate\Contracts\Mail\Mailer'); - $mailer->shouldReceive('send'); - - $inliner = new StyleInliner([__DIR__ . '/../../../resources/']); - - $inliner->inlineAndSend( - $mailer, - $mock, - 'testing', - function ($message) { - - } - ); - - $mailer->shouldHaveReceived( - 'send', - [ - Mockery::type('array'), - [], - Mockery::type('callable'), - ] - ); - } -} diff --git a/tests/SellerLabs/Illuminated/Style/StyleServiceProviderTest.php b/tests/SellerLabs/Illuminated/Style/StyleServiceProviderTest.php deleted file mode 100644 index ad6cdc3..0000000 --- a/tests/SellerLabs/Illuminated/Style/StyleServiceProviderTest.php +++ /dev/null @@ -1,50 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - * - * This file is part of the Illuminated package - */ - -namespace SellerLabs\Illuminated\Style; - -use Illuminate\Foundation\Application; -use Illuminate\Support\ServiceProvider; -use SellerLabs\Illuminated\Testing\ServiceProviderTestCase; -use SellerLabs\Standards\Console\CleanCommand; -use SellerLabs\Standards\Console\FixCommand; -use SellerLabs\Standards\Console\FormatCommand; -use SellerLabs\Standards\Console\InitCommand; -use SellerLabs\Standards\Console\ValidateCommand; - -/** - * Class StyleServiceProviderTest. - * - * @author Eduardo Trujillo - * @package SellerLabs\Illuminated\Style - */ -class StyleServiceProviderTest extends ServiceProviderTestCase -{ - protected $commands = [ - InitCommand::class, - FixCommand::class, - FormatCommand::class, - CleanCommand::class, - ValidateCommand::class, - ]; - - /** - * Make an instance of the service provider being tested. - * - * @param Application $app - * - * @return ServiceProvider - */ - public function make(Application $app) - { - return new StyleServiceProvider($app); - } -}