diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index bcabec41..ff56c8f9 100755
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -52,5 +52,8 @@ class Kernel extends HttpKernel
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+ 'role' => \Zizaco\Entrust\Middleware\EntrustRole::class,
+ 'permission' => \Zizaco\Entrust\Middleware\EntrustPermission::class,
+ 'ability' => \Zizaco\Entrust\Middleware\EntrustAbility::class,
];
}
diff --git a/app/Models/Permission.php b/app/Models/Permission.php
new file mode 100644
index 00000000..d32d8f2c
--- /dev/null
+++ b/app/Models/Permission.php
@@ -0,0 +1,8 @@
+=7.0",
- "laravel/framework": "5.3.*",
+ "laravel/framework": "5.4.*",
"yajra/laravel-datatables-oracle": "~6.0",
"barryvdh/laravel-ide-helper": "^2.1",
- "infyomlabs/laravel-generator": "5.3.x-dev",
- "laravelcollective/html": "dev-master",
+ "infyomlabs/laravel-generator": "dev-master",
+ "laravelcollective/html": "5.4.x",
"infyomlabs/adminlte-templates": "5.3.x-dev",
"infyomlabs/swagger-generator": "dev-master",
"jlapp/swaggervel": "dev-master",
- "doctrine/dbal": "~2.3"
+ "doctrine/dbal": "~2.3",
+ "zizaco/entrust": "5.2.x-dev"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
@@ -32,6 +33,9 @@
}
},
"autoload-dev": {
+ "psr-4": {
+ "Tests\\": "tests/"
+ },
"classmap": [
"tests/TestCase.php"
]
diff --git a/composer.lock b/composer.lock
index 05bb1318..dc0fb12f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,28 +4,27 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "074ffb16baec47c024a685e011aaa9f2",
- "content-hash": "9b6b62c185fde476001993debd60c3c0",
+ "content-hash": "c5760af5357e75d54b4e360b828a544f",
"packages": [
{
"name": "barryvdh/laravel-ide-helper",
- "version": "v2.2.1",
+ "version": "v2.3.2",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-ide-helper.git",
- "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463"
+ "reference": "e82de98cef0d6597b1b686be0b5813a3a4bb53c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/28af7cd19ca41cc0c63dd1de2b46c2b84d31c463",
- "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463",
+ "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/e82de98cef0d6597b1b686be0b5813a3a4bb53c5",
+ "reference": "e82de98cef0d6597b1b686be0b5813a3a4bb53c5",
"shasum": ""
},
"require": {
"barryvdh/reflection-docblock": "^2.0.4",
- "illuminate/console": "^5.0,<5.4",
- "illuminate/filesystem": "^5.0,<5.4",
- "illuminate/support": "^5.0,<5.4",
+ "illuminate/console": "^5.0,<5.5",
+ "illuminate/filesystem": "^5.0,<5.5",
+ "illuminate/support": "^5.0,<5.5",
"php": ">=5.4.0",
"symfony/class-loader": "^2.3|^3.0"
},
@@ -41,7 +40,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
},
"autoload": {
@@ -71,7 +70,7 @@
"phpstorm",
"sublime"
],
- "time": "2016-07-04 11:52:48"
+ "time": "2017-02-22T12:27:33+00:00"
},
{
"name": "barryvdh/reflection-docblock",
@@ -120,126 +119,39 @@
"email": "mike.vanriel@naenius.com"
}
],
- "time": "2016-06-13 19:28:20"
- },
- {
- "name": "classpreloader/classpreloader",
- "version": "3.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ClassPreloader/ClassPreloader.git",
- "reference": "9b10b913c2bdf90c3d2e0d726b454fb7f77c552a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/9b10b913c2bdf90c3d2e0d726b454fb7f77c552a",
- "reference": "9b10b913c2bdf90c3d2e0d726b454fb7f77c552a",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "^1.0|^2.0",
- "php": ">=5.5.9"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8|^5.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-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": "2015-11-09 22:51:51"
- },
- {
- "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-24 07:27:01"
+ "time": "2016-06-13T19:28:20+00:00"
},
{
"name": "doctrine/annotations",
- "version": "v1.2.7",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
+ "reference": "54cacc9b81758b14e3ce750f205a393d52339e97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
- "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97",
+ "reference": "54cacc9b81758b14e3ce750f205a393d52339e97",
"shasum": ""
},
"require": {
"doctrine/lexer": "1.*",
- "php": ">=5.3.2"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
"doctrine/cache": "1.*",
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "^5.7"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "1.4.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Annotations\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -275,20 +187,20 @@
"docblock",
"parser"
],
- "time": "2015-08-31 12:32:49"
+ "time": "2017-02-24T16:22:25+00:00"
},
{
"name": "doctrine/cache",
- "version": "v1.6.0",
+ "version": "v1.6.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
+ "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
- "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/b6f544a20f4807e81f7044d31e679ccbb1866dc3",
+ "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3",
"shasum": ""
},
"require": {
@@ -345,32 +257,33 @@
"cache",
"caching"
],
- "time": "2015-12-31 16:37:02"
+ "time": "2016-10-29T11:16:17+00:00"
},
{
"name": "doctrine/collections",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
+ "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
+ "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
+ "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "doctrine/coding-standard": "~0.1@dev",
+ "phpunit/phpunit": "^5.7"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -411,20 +324,20 @@
"collections",
"iterator"
],
- "time": "2015-04-14 22:21:58"
+ "time": "2017-01-03T10:49:41+00:00"
},
{
"name": "doctrine/common",
- "version": "v2.6.1",
+ "version": "v2.7.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
- "reference": "a579557bc689580c19fee4e27487a67fe60defc0"
+ "reference": "930297026c8009a567ac051fd545bf6124150347"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0",
- "reference": "a579557bc689580c19fee4e27487a67fe60defc0",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/930297026c8009a567ac051fd545bf6124150347",
+ "reference": "930297026c8009a567ac051fd545bf6124150347",
"shasum": ""
},
"require": {
@@ -433,10 +346,10 @@
"doctrine/collections": "1.*",
"doctrine/inflector": "1.*",
"doctrine/lexer": "1.*",
- "php": "~5.5|~7.0"
+ "php": "~5.6|~7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.8|~5.0"
+ "phpunit/phpunit": "^5.4.6"
},
"type": "library",
"extra": {
@@ -484,24 +397,24 @@
"persistence",
"spl"
],
- "time": "2015-12-25 13:18:31"
+ "time": "2017-01-13T14:02:13+00:00"
},
{
"name": "doctrine/dbal",
- "version": "v2.5.5",
+ "version": "v2.5.12",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9"
+ "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
- "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/7b9e911f9d8b30d43b96853dab26898c710d8f44",
+ "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44",
"shasum": ""
},
"require": {
- "doctrine/common": ">=2.4,<2.7-dev",
+ "doctrine/common": ">=2.4,<2.8-dev",
"php": ">=5.3.2"
},
"require-dev": {
@@ -555,7 +468,7 @@
"persistence",
"queryobject"
],
- "time": "2016-09-09 19:13:33"
+ "time": "2017-02-08T12:53:47+00:00"
},
{
"name": "doctrine/inflector",
@@ -622,7 +535,7 @@
"singularize",
"string"
],
- "time": "2015-11-06 14:35:42"
+ "time": "2015-11-06T14:35:42+00:00"
},
{
"name": "doctrine/lexer",
@@ -676,7 +589,7 @@
"lexer",
"parser"
],
- "time": "2014-09-09 13:34:57"
+ "time": "2014-09-09T13:34:57+00:00"
},
{
"name": "dompdf/dompdf",
@@ -737,7 +650,49 @@
],
"description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
"homepage": "https://github.com/dompdf/dompdf",
- "time": "2016-05-11 00:36:29"
+ "time": "2016-05-11T00:36:29+00:00"
+ },
+ {
+ "name": "erusev/parsedown",
+ "version": "1.6.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/erusev/parsedown.git",
+ "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/erusev/parsedown/zipball/1bf24f7334fe16c88bf9d467863309ceaf285b01",
+ "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "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"
+ ],
+ "time": "2017-03-29T16:04:15+00:00"
},
{
"name": "infyomlabs/adminlte-templates",
@@ -745,12 +700,12 @@
"source": {
"type": "git",
"url": "https://github.com/InfyOmLabs/adminlte-templates.git",
- "reference": "f0d01636f993554b23835a698272c7e7623db081"
+ "reference": "7f89d68fdb20f36f4cf5c449d265c91a2908d468"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/InfyOmLabs/adminlte-templates/zipball/f0d01636f993554b23835a698272c7e7623db081",
- "reference": "f0d01636f993554b23835a698272c7e7623db081",
+ "url": "https://api.github.com/repos/InfyOmLabs/adminlte-templates/zipball/7f89d68fdb20f36f4cf5c449d265c91a2908d468",
+ "reference": "7f89d68fdb20f36f4cf5c449d265c91a2908d468",
"shasum": ""
},
"require": {
@@ -782,20 +737,20 @@
"laravel",
"templates"
],
- "time": "2016-09-24 11:41:12"
+ "time": "2017-05-20T10:43:37+00:00"
},
{
"name": "infyomlabs/laravel-generator",
- "version": "5.3.x-dev",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/InfyOmLabs/laravel-generator.git",
- "reference": "892a1462ec9a8ad2eaf97c252f0fe81abc574f7b"
+ "reference": "a2038b2ae6c72987e79e830896cc6d12c06e4ee7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/InfyOmLabs/laravel-generator/zipball/892a1462ec9a8ad2eaf97c252f0fe81abc574f7b",
- "reference": "892a1462ec9a8ad2eaf97c252f0fe81abc574f7b",
+ "url": "https://api.github.com/repos/InfyOmLabs/laravel-generator/zipball/a2038b2ae6c72987e79e830896cc6d12c06e4ee7",
+ "reference": "a2038b2ae6c72987e79e830896cc6d12c06e4ee7",
"shasum": ""
},
"require": {
@@ -804,10 +759,6 @@
"php": ">=5.5.9",
"prettus/l5-repository": "~2.1"
},
- "require-dev": {
- "mockery/mockery": "~0.9",
- "phpunit/phpunit": "~5.0"
- },
"type": "library",
"autoload": {
"psr-4": {
@@ -841,7 +792,7 @@
"test",
"view"
],
- "time": "2016-10-05 04:22:34"
+ "time": "2016-08-18T14:19:50+00:00"
},
{
"name": "infyomlabs/swagger-generator",
@@ -878,111 +829,24 @@
"swagger",
"templates"
],
- "time": "2016-02-14 10:41:03"
- },
- {
- "name": "jakub-onderka/php-console-color",
- "version": "0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "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-08 15:00:19"
- },
- {
- "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/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jakub Onderka",
- "email": "acci@acci.cz",
- "homepage": "http://www.acci.cz/"
- }
- ],
- "time": "2015-04-20 18:58:01"
+ "time": "2016-02-14T10:41:03+00:00"
},
{
"name": "jeremeamia/SuperClosure",
- "version": "2.2.0",
+ "version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/jeremeamia/super_closure.git",
- "reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938"
+ "reference": "443c3df3207f176a1b41576ee2a66968a507b3db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/29a88be2a4846d27c1613aed0c9071dfad7b5938",
- "reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938",
+ "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/443c3df3207f176a1b41576ee2a66968a507b3db",
+ "reference": "443c3df3207f176a1b41576ee2a66968a507b3db",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^1.2|^2.0",
+ "nikic/php-parser": "^1.2|^2.0|^3.0",
"php": ">=5.4",
"symfony/polyfill-php56": "^1.0"
},
@@ -992,7 +856,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
},
"autoload": {
@@ -1023,7 +887,7 @@
"serialize",
"tokenizer"
],
- "time": "2015-12-05 17:17:57"
+ "time": "2016-12-07T09:37:55+00:00"
},
{
"name": "jlapp/swaggervel",
@@ -1068,7 +932,7 @@
"laravel",
"swagger"
],
- "time": "2016-01-25 15:38:17"
+ "time": "2016-01-25T15:38:17+00:00"
},
{
"name": "laracasts/flash",
@@ -1111,46 +975,44 @@
}
],
"description": "Easy flash notifications",
- "time": "2016-07-11 20:46:02"
+ "time": "2016-07-11T20:46:02+00:00"
},
{
"name": "laravel/framework",
- "version": "v5.3.18",
+ "version": "v5.4.25",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "9bee167d173857c25966c19afdaa66f127ca6784"
+ "reference": "6bcc9b1f542b3deed16d51f6aa1fe318ab407c2a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/9bee167d173857c25966c19afdaa66f127ca6784",
- "reference": "9bee167d173857c25966c19afdaa66f127ca6784",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/6bcc9b1f542b3deed16d51f6aa1fe318ab407c2a",
+ "reference": "6bcc9b1f542b3deed16d51f6aa1fe318ab407c2a",
"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.*",
"ramsey/uuid": "~3.0",
- "swiftmailer/swiftmailer": "~5.1",
- "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.*",
+ "swiftmailer/swiftmailer": "~5.4",
+ "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": {
@@ -1187,31 +1049,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/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": {
@@ -1239,41 +1104,36 @@
"framework",
"laravel"
],
- "time": "2016-10-08 01:51:20"
+ "time": "2017-06-07T13:35:12+00:00"
},
{
"name": "laravelcollective/html",
- "version": "dev-master",
+ "version": "v5.4.8",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
- "reference": "c4c87916c34e04aa9d4e860315ab1858304d786a"
+ "reference": "9b8f51e7a2368911c896f5d42757886bae0717b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/LaravelCollective/html/zipball/c4c87916c34e04aa9d4e860315ab1858304d786a",
- "reference": "c4c87916c34e04aa9d4e860315ab1858304d786a",
+ "url": "https://api.github.com/repos/LaravelCollective/html/zipball/9b8f51e7a2368911c896f5d42757886bae0717b5",
+ "reference": "9b8f51e7a2368911c896f5d42757886bae0717b5",
"shasum": ""
},
"require": {
- "illuminate/http": "5.3.*",
- "illuminate/routing": "5.3.*",
- "illuminate/session": "5.3.*",
- "illuminate/support": "5.3.*",
- "illuminate/view": "5.3.*",
+ "illuminate/http": "5.4.*",
+ "illuminate/routing": "5.4.*",
+ "illuminate/session": "5.4.*",
+ "illuminate/support": "5.4.*",
+ "illuminate/view": "5.4.*",
"php": ">=5.6.4"
},
"require-dev": {
- "illuminate/database": "5.3.*",
+ "illuminate/database": "5.4.*",
"mockery/mockery": "~0.9.4",
"phpunit/phpunit": "~5.4"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.3-dev"
- }
- },
"autoload": {
"psr-4": {
"Collective\\Html\\": "src/"
@@ -1298,24 +1158,24 @@
],
"description": "HTML and Form Builders for the Laravel Framework",
"homepage": "http://laravelcollective.com",
- "time": "2016-08-04 03:49:50"
+ "time": "2017-05-22T06:35:07+00:00"
},
{
"name": "league/flysystem",
- "version": "1.0.28",
+ "version": "1.0.40",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "a9663643ff2d16d7f66ed1e0d3212c5491bc9044"
+ "reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a9663643ff2d16d7f66ed1e0d3212c5491bc9044",
- "reference": "a9663643ff2d16d7f66ed1e0d3212c5491bc9044",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3828f0b24e2c1918bb362d57a53205d6dc8fde61",
+ "reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61",
"shasum": ""
},
"require": {
- "php": ">=5.4.0"
+ "php": ">=5.5.9"
},
"conflict": {
"league/flysystem-sftp": "<1.0.6"
@@ -1333,12 +1193,12 @@
"league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
"league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
"league/flysystem-copy": "Allows you to use Copy.com storage",
- "league/flysystem-dropbox": "Allows you to use Dropbox storage",
"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"
+ "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
+ "spatie/flysystem-dropbox": "Allows you to use Dropbox storage"
},
"type": "library",
"extra": {
@@ -1381,26 +1241,27 @@
"sftp",
"storage"
],
- "time": "2016-10-07 12:20:37"
+ "time": "2017-04-28T10:15:08+00:00"
},
{
"name": "league/fractal",
- "version": "0.14.0",
+ "version": "0.16.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/fractal.git",
- "reference": "56ad8933fbb40328ca3321c84143b2c16186eebf"
+ "reference": "d0445305e308d9207430680acfd580557b679ddc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/fractal/zipball/56ad8933fbb40328ca3321c84143b2c16186eebf",
- "reference": "56ad8933fbb40328ca3321c84143b2c16186eebf",
+ "url": "https://api.github.com/repos/thephpleague/fractal/zipball/d0445305e308d9207430680acfd580557b679ddc",
+ "reference": "d0445305e308d9207430680acfd580557b679ddc",
"shasum": ""
},
"require": {
"php": ">=5.4"
},
"require-dev": {
+ "doctrine/orm": "^2.5",
"illuminate/contracts": "~5.0",
"mockery/mockery": "~0.9",
"pagerfanta/pagerfanta": "~1.0.0",
@@ -1444,31 +1305,32 @@
"league",
"rest"
],
- "time": "2016-07-21 09:56:14"
+ "time": "2017-03-12T01:28:43+00:00"
},
{
"name": "maatwebsite/excel",
- "version": "2.1.6",
+ "version": "2.1.17",
"source": {
"type": "git",
"url": "https://github.com/Maatwebsite/Laravel-Excel.git",
- "reference": "700eba02f76f2971c81726a4f6a04121c1977e64"
+ "reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/700eba02f76f2971c81726a4f6a04121c1977e64",
- "reference": "700eba02f76f2971c81726a4f6a04121c1977e64",
+ "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d",
+ "reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d",
"shasum": ""
},
"require": {
- "illuminate/cache": "5.0.*|5.1.*|5.2.*|5.3.*",
- "illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*",
- "illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*",
- "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*",
+ "illuminate/cache": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
+ "illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
+ "illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
+ "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
+ "jeremeamia/superclosure": "^2.3",
"nesbot/carbon": "~1.0",
"php": ">=5.5",
"phpoffice/phpexcel": "1.8.*",
- "tijsverkoyen/css-to-inline-styles": "~1.5"
+ "tijsverkoyen/css-to-inline-styles": "~2.0"
},
"require-dev": {
"mockery/mockery": "~0.9",
@@ -1477,10 +1339,10 @@
"phpunit/phpunit": "~4.0"
},
"suggest": {
- "illuminate/http": "5.0.*|5.1.*|5.2.*|5.3.*",
- "illuminate/queue": "5.0.*|5.1.*|5.2.*|5.3.*",
- "illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*",
- "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*"
+ "illuminate/http": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
+ "illuminate/queue": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
+ "illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
+ "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*"
},
"type": "library",
"autoload": {
@@ -1511,20 +1373,20 @@
"import",
"laravel"
],
- "time": "2016-09-15 21:03:21"
+ "time": "2017-04-04T18:28:12+00:00"
},
{
"name": "monolog/monolog",
- "version": "1.21.0",
+ "version": "1.22.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+ "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952",
- "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0",
+ "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0",
"shasum": ""
},
"require": {
@@ -1535,7 +1397,7 @@
"psr/log-implementation": "1.0.0"
},
"require-dev": {
- "aws/aws-sdk-php": "^2.4.9",
+ "aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
"jakub-onderka/php-parallel-lint": "0.9",
@@ -1589,20 +1451,20 @@
"logging",
"psr-3"
],
- "time": "2016-07-29 03:23:52"
+ "time": "2017-03-13T07:08:03+00:00"
},
{
"name": "mtdowling/cron-expression",
- "version": "v1.1.0",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/mtdowling/cron-expression.git",
- "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5"
+ "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
- "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
+ "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
+ "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
"shasum": ""
},
"require": {
@@ -1613,8 +1475,8 @@
},
"type": "library",
"autoload": {
- "psr-0": {
- "Cron": "src/"
+ "psr-4": {
+ "Cron\\": "src/Cron/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1633,30 +1495,36 @@
"cron",
"schedule"
],
- "time": "2016-01-26 21:23:30"
+ "time": "2017-01-23T04:29:33+00:00"
},
{
"name": "nesbot/carbon",
- "version": "1.21.0",
+ "version": "1.22.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7"
+ "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
- "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
+ "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
- "symfony/translation": "~2.6|~3.0"
+ "symfony/translation": "~2.6 || ~3.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0|~5.0"
+ "friendsofphp/php-cs-fixer": "~2",
+ "phpunit/phpunit": "~4.0 || ~5.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.23-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Carbon\\": "src/Carbon/"
@@ -1680,28 +1548,28 @@
"datetime",
"time"
],
- "time": "2015-11-04 20:07:17"
+ "time": "2017-01-16T07:55:07+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v2.1.1",
+ "version": "v3.0.5",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0"
+ "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4dd659edadffdc2143e4753df655d866dbfeedf0",
- "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2b9e2f71b722f7c53918ab0c25f7646c2013f17d",
+ "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
- "php": ">=5.4"
+ "php": ">=5.5"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "~4.0|~5.0"
},
"bin": [
"bin/php-parse"
@@ -1709,7 +1577,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -1731,20 +1599,20 @@
"parser",
"php"
],
- "time": "2016-09-16 12:04:44"
+ "time": "2017-03-05T18:23:57+00:00"
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.2",
+ "version": "v2.0.10",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
+ "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
- "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+ "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
"shasum": ""
},
"require": {
@@ -1779,7 +1647,7 @@
"pseudorandom",
"random"
],
- "time": "2016-04-03 06:00:07"
+ "time": "2017-03-13T16:27:32+00:00"
},
{
"name": "phenx/php-font-lib",
@@ -1813,7 +1681,7 @@
],
"description": "A library to read, parse, export and make subsets of different types of font files.",
"homepage": "https://github.com/PhenX/php-font-lib",
- "time": "2015-05-06 20:02:39"
+ "time": "2015-05-06T20:02:39+00:00"
},
{
"name": "phenx/php-svg-lib",
@@ -1847,7 +1715,7 @@
],
"description": "A library to read, parse and export to PDF SVG files.",
"homepage": "https://github.com/PhenX/php-svg-lib",
- "time": "2015-05-06 18:49:49"
+ "time": "2015-05-06T18:49:49+00:00"
},
{
"name": "phpoffice/phpexcel",
@@ -1904,20 +1772,20 @@
"xls",
"xlsx"
],
- "time": "2015-05-01 07:00:55"
+ "time": "2015-05-01T07:00:55+00:00"
},
{
"name": "prettus/l5-repository",
- "version": "2.6.6",
+ "version": "2.6.18",
"source": {
"type": "git",
"url": "https://github.com/andersao/l5-repository.git",
- "reference": "05945e652bfdacd456128d69bcae91701ccc9e32"
+ "reference": "5fbab77b9f295f0c3d2bb1f8b1e42f6ff0affad7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/andersao/l5-repository/zipball/05945e652bfdacd456128d69bcae91701ccc9e32",
- "reference": "05945e652bfdacd456128d69bcae91701ccc9e32",
+ "url": "https://api.github.com/repos/andersao/l5-repository/zipball/5fbab77b9f295f0c3d2bb1f8b1e42f6ff0affad7",
+ "reference": "5fbab77b9f295f0c3d2bb1f8b1e42f6ff0affad7",
"shasum": ""
},
"require": {
@@ -1964,7 +1832,7 @@
"model",
"repository"
],
- "time": "2016-06-27 10:43:22"
+ "time": "2017-03-29T10:49:41+00:00"
},
{
"name": "prettus/laravel-validation",
@@ -2004,20 +1872,20 @@
"service",
"validation"
],
- "time": "2015-06-08 23:53:46"
+ "time": "2015-06-08T23:53:46+00:00"
},
{
"name": "psr/log",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "5277094ed527a1c4477177d102fe4c53551953e0"
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0",
- "reference": "5277094ed527a1c4477177d102fe4c53551953e0",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"shasum": ""
},
"require": {
@@ -2051,109 +1919,39 @@
"psr",
"psr-3"
],
- "time": "2016-09-19 16:02:08"
- },
- {
- "name": "psy/psysh",
- "version": "v0.7.2",
- "source": {
- "type": "git",
- "url": "https://github.com/bobthecow/psysh.git",
- "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e64e10b20f8d229cac76399e1f3edddb57a0f280",
- "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280",
- "shasum": ""
- },
- "require": {
- "dnoegel/php-xdg-base-dir": "0.1",
- "jakub-onderka/php-console-highlighter": "0.3.*",
- "nikic/php-parser": "^1.2.1|~2.0",
- "php": ">=5.3.9",
- "symfony/console": "~2.3.10|^2.4.2|~3.0",
- "symfony/var-dumper": "~2.7|~3.0"
- },
- "require-dev": {
- "fabpot/php-cs-fixer": "~1.5",
- "phpunit/phpunit": "~3.7|~4.0|~5.0",
- "squizlabs/php_codesniffer": "~2.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."
- },
- "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": "2016-03-09 05:03:14"
+ "time": "2016-10-10T12:19:37+00:00"
},
{
"name": "ramsey/uuid",
- "version": "3.5.1",
+ "version": "3.6.1",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
- "reference": "a07797b986671b0dc823885a81d5e3516b931599"
+ "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/uuid/zipball/a07797b986671b0dc823885a81d5e3516b931599",
- "reference": "a07797b986671b0dc823885a81d5e3516b931599",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
+ "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
"shasum": ""
},
"require": {
"paragonie/random_compat": "^1.0|^2.0",
- "php": ">=5.4"
+ "php": "^5.4 || ^7.0"
},
"replace": {
"rhumsaa/uuid": "self.version"
},
"require-dev": {
"apigen/apigen": "^4.1",
- "codeception/aspect-mock": "1.0.0",
- "goaop/framework": "1.0.0-alpha.2",
+ "codeception/aspect-mock": "^1.0 | ^2.0",
+ "doctrine/annotations": "~1.2.0",
+ "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
"ircmaxell/random-lib": "^1.1",
"jakub-onderka/php-parallel-lint": "^0.9.0",
"mockery/mockery": "^0.9.4",
"moontoast/math": "^1.1",
+ "php-mock/php-mock-phpunit": "^0.3|^1.1",
"phpunit/phpunit": "^4.7|>=5.0 <5.4",
"satooshi/php-coveralls": "^0.6.1",
"squizlabs/php_codesniffer": "^2.3"
@@ -2203,27 +2001,28 @@
"identifier",
"uuid"
],
- "time": "2016-10-02 15:51:17"
+ "time": "2017-03-26T20:37:53+00:00"
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v5.4.3",
+ "version": "v5.4.8",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153"
+ "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
- "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/9a06dc570a0367850280eefd3f1dc2da45aef517",
+ "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "mockery/mockery": "~0.9.1"
+ "mockery/mockery": "~0.9.1",
+ "symfony/phpunit-bridge": "~3.2"
},
"type": "library",
"extra": {
@@ -2256,20 +2055,20 @@
"mail",
"mailer"
],
- "time": "2016-07-08 11:51:25"
+ "time": "2017-05-01T15:54:03+00:00"
},
{
"name": "symfony/class-loader",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/class-loader.git",
- "reference": "bcb072aba46ddf3b1a496438c63be6be647739aa"
+ "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/class-loader/zipball/bcb072aba46ddf3b1a496438c63be6be647739aa",
- "reference": "bcb072aba46ddf3b1a496438c63be6be647739aa",
+ "url": "https://api.github.com/repos/symfony/class-loader/zipball/386a294d621576302e7cc36965d6ed53b8c73c4f",
+ "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f",
"shasum": ""
},
"require": {
@@ -2285,7 +2084,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -2312,20 +2111,20 @@
],
"description": "Symfony ClassLoader Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 23:30:54"
+ "time": "2017-06-02T09:51:43+00:00"
},
{
"name": "symfony/console",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "6cb0872fb57b38b3b09ff213c21ed693956b9eb0"
+ "reference": "70d2a29b2911cbdc91a7e268046c395278238b2e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/6cb0872fb57b38b3b09ff213c21ed693956b9eb0",
- "reference": "6cb0872fb57b38b3b09ff213c21ed693956b9eb0",
+ "url": "https://api.github.com/repos/symfony/console/zipball/70d2a29b2911cbdc91a7e268046c395278238b2e",
+ "reference": "70d2a29b2911cbdc91a7e268046c395278238b2e",
"shasum": ""
},
"require": {
@@ -2333,20 +2132,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": {
@@ -2373,20 +2180,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2016-09-28 00:11:12"
+ "time": "2017-06-02T19:24:58+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v3.1.5",
+ "version": "v3.1.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "ca809c64072e0fe61c1c7fb3c76cdc32265042ac"
+ "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/ca809c64072e0fe61c1c7fb3c76cdc32265042ac",
- "reference": "ca809c64072e0fe61c1c7fb3c76cdc32265042ac",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d",
+ "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d",
"shasum": ""
},
"require": {
@@ -2426,20 +2233,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 11:02:40"
+ "time": "2017-01-02T20:31:54+00:00"
},
{
"name": "symfony/debug",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "e2b3f74a67fc928adc3c1b9027f73e1bc01190a8"
+ "reference": "e9c50482841ef696e8fa1470d950a79c8921f45d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/e2b3f74a67fc928adc3c1b9027f73e1bc01190a8",
- "reference": "e2b3f74a67fc928adc3c1b9027f73e1bc01190a8",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/e9c50482841ef696e8fa1470d950a79c8921f45d",
+ "reference": "e9c50482841ef696e8fa1470d950a79c8921f45d",
"shasum": ""
},
"require": {
@@ -2450,13 +2257,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": {
@@ -2483,29 +2289,32 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 11:02:40"
+ "time": "2017-06-01T21:01:25+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5"
+ "reference": "4054a102470665451108f9b59305c79176ef98f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
- "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4054a102470665451108f9b59305c79176ef98f0",
+ "reference": "4054a102470665451108f9b59305c79176ef98f0",
"shasum": ""
},
"require": {
"php": ">=5.5.9"
},
+ "conflict": {
+ "symfony/dependency-injection": "<3.3"
+ },
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.8|~3.0",
- "symfony/dependency-injection": "~2.8|~3.0",
+ "symfony/dependency-injection": "~3.3",
"symfony/expression-language": "~2.8|~3.0",
"symfony/stopwatch": "~2.8|~3.0"
},
@@ -2516,7 +2325,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -2543,20 +2352,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2016-07-19 10:45:57"
+ "time": "2017-06-04T18:15:29+00:00"
},
{
"name": "symfony/finder",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f"
+ "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
- "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4",
+ "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4",
"shasum": ""
},
"require": {
@@ -2565,7 +2374,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -2592,20 +2401,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2016-09-28 00:11:12"
+ "time": "2017-06-01T21:01:25+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "5114f1becca9f29e3af94374f1689c83c1aa3d97"
+ "reference": "80eb5a1f968448b77da9e8b2c0827f6e8d767846"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5114f1becca9f29e3af94374f1689c83c1aa3d97",
- "reference": "5114f1becca9f29e3af94374f1689c83c1aa3d97",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/80eb5a1f968448b77da9e8b2c0827f6e8d767846",
+ "reference": "80eb5a1f968448b77da9e8b2c0827f6e8d767846",
"shasum": ""
},
"require": {
@@ -2618,7 +2427,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -2645,20 +2454,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2016-09-21 20:55:10"
+ "time": "2017-06-05T13:06:51+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "dc339d6eebadfa6e39c52868b4d4a715eff13c69"
+ "reference": "be8280f7fa8e95b86514f1e1be997668a53b2888"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/dc339d6eebadfa6e39c52868b4d4a715eff13c69",
- "reference": "dc339d6eebadfa6e39c52868b4d4a715eff13c69",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/be8280f7fa8e95b86514f1e1be997668a53b2888",
+ "reference": "be8280f7fa8e95b86514f1e1be997668a53b2888",
"shasum": ""
},
"require": {
@@ -2666,18 +2475,22 @@
"psr/log": "~1.0",
"symfony/debug": "~2.8|~3.0",
"symfony/event-dispatcher": "~2.8|~3.0",
- "symfony/http-foundation": "~2.8.8|~3.0.8|~3.1.2|~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",
@@ -2686,7 +2499,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": "",
@@ -2700,7 +2513,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -2727,20 +2540,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2016-10-03 19:01:06"
+ "time": "2017-06-06T03:59:58+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.2.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "dff51f72b0706335131b00a7f49606168c582594"
+ "reference": "f29dca382a6485c3cbe6379f0c61230167681937"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
- "reference": "dff51f72b0706335131b00a7f49606168c582594",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937",
+ "reference": "f29dca382a6485c3cbe6379f0c61230167681937",
"shasum": ""
},
"require": {
@@ -2752,7 +2565,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -2786,20 +2599,20 @@
"portable",
"shim"
],
- "time": "2016-05-18 14:26:46"
+ "time": "2017-06-09T14:24:12+00:00"
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.2.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a"
+ "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a",
- "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929",
+ "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929",
"shasum": ""
},
"require": {
@@ -2809,7 +2622,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -2842,20 +2655,20 @@
"portable",
"shim"
],
- "time": "2016-05-18 14:26:46"
+ "time": "2017-06-09T08:25:21+00:00"
},
{
"name": "symfony/polyfill-util",
- "version": "v1.2.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
- "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99"
+ "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99",
- "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d",
+ "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d",
"shasum": ""
},
"require": {
@@ -2864,7 +2677,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -2894,20 +2707,20 @@
"polyfill",
"shim"
],
- "time": "2016-05-18 14:26:46"
+ "time": "2017-06-09T08:25:21+00:00"
},
{
"name": "symfony/process",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "66de154ae86b1a07001da9fbffd620206e4faf94"
+ "reference": "8e30690c67aafb6c7992d6d8eb0d707807dd3eaf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/66de154ae86b1a07001da9fbffd620206e4faf94",
- "reference": "66de154ae86b1a07001da9fbffd620206e4faf94",
+ "url": "https://api.github.com/repos/symfony/process/zipball/8e30690c67aafb6c7992d6d8eb0d707807dd3eaf",
+ "reference": "8e30690c67aafb6c7992d6d8eb0d707807dd3eaf",
"shasum": ""
},
"require": {
@@ -2916,7 +2729,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -2943,36 +2756,39 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2016-09-29 14:13:09"
+ "time": "2017-05-22T12:32:03+00:00"
},
{
"name": "symfony/routing",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "8edf62498a1a4c57ba317664a4b698339c10cdf6"
+ "reference": "39804eeafea5cca851946e1eed122eb94459fdb4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/8edf62498a1a4c57ba317664a4b698339c10cdf6",
- "reference": "8edf62498a1a4c57ba317664a4b698339c10cdf6",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/39804eeafea5cca851946e1eed122eb94459fdb4",
+ "reference": "39804eeafea5cca851946e1eed122eb94459fdb4",
"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",
@@ -2985,7 +2801,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -3018,20 +2834,20 @@
"uri",
"url"
],
- "time": "2016-08-16 14:58:24"
+ "time": "2017-06-02T09:51:43+00:00"
},
{
"name": "symfony/translation",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "93013a18d272e59dab8e67f583155b78c68947eb"
+ "reference": "dc3b2a0c6cfff60327ba1c043a82092735397543"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/93013a18d272e59dab8e67f583155b78c68947eb",
- "reference": "93013a18d272e59dab8e67f583155b78c68947eb",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/dc3b2a0c6cfff60327ba1c043a82092735397543",
+ "reference": "dc3b2a0c6cfff60327ba1c043a82092735397543",
"shasum": ""
},
"require": {
@@ -3039,13 +2855,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",
@@ -3055,7 +2872,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -3082,36 +2899,41 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 11:02:40"
+ "time": "2017-05-22T07:42:36+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "70bfe927b86ba9999aeebd829715b0bb2cd39a10"
+ "reference": "347c4247a3e40018810b476fcd5dec36d46d08dc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/70bfe927b86ba9999aeebd829715b0bb2cd39a10",
- "reference": "70bfe927b86ba9999aeebd829715b0bb2cd39a10",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/347c4247a3e40018810b476fcd5dec36d46d08dc",
+ "reference": "347c4247a3e40018810b476fcd5dec36d46d08dc",
"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": {
@@ -3145,33 +2967,33 @@
"debug",
"dump"
],
- "time": "2016-09-29 14:13:09"
+ "time": "2017-06-02T09:10:29+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": {
@@ -3181,7 +3003,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD"
+ "BSD-3-Clause"
],
"authors": [
{
@@ -3192,7 +3014,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-08 16:14:14"
+ "time": "2016-09-20T12:50:39+00:00"
},
{
"name": "vlucas/phpdotenv",
@@ -3242,20 +3064,20 @@
"env",
"environment"
],
- "time": "2016-09-01 10:05:43"
+ "time": "2016-09-01T10:05:43+00:00"
},
{
"name": "yajra/laravel-datatables-oracle",
- "version": "v6.19.0",
+ "version": "v6.24.1",
"source": {
"type": "git",
"url": "https://github.com/yajra/laravel-datatables.git",
- "reference": "818c2fc6186ad081c5ad3a8956acce8c39fb08c2"
+ "reference": "593a9205c7d9816d2d8b639ca08000ae5c5f378c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/818c2fc6186ad081c5ad3a8956acce8c39fb08c2",
- "reference": "818c2fc6186ad081c5ad3a8956acce8c39fb08c2",
+ "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/593a9205c7d9816d2d8b639ca08000ae5c5f378c",
+ "reference": "593a9205c7d9816d2d8b639ca08000ae5c5f378c",
"shasum": ""
},
"require": {
@@ -3266,7 +3088,7 @@
"illuminate/support": "~5.0",
"illuminate/view": "~5.0",
"laravelcollective/html": "~5.0",
- "league/fractal": "~0.12",
+ "league/fractal": "~0.14",
"maatwebsite/excel": "^2.0",
"php": ">=5.5.9"
},
@@ -3302,29 +3124,30 @@
"laravel4",
"laravel5"
],
- "time": "2016-09-24 02:58:13"
+ "time": "2017-01-24T02:46:52+00:00"
},
{
"name": "zircote/swagger-php",
- "version": "2.0.7",
+ "version": "2.0.10",
"source": {
"type": "git",
"url": "https://github.com/zircote/swagger-php.git",
- "reference": "299df0b51f641225ed50ba5199b21e8cfc34e4f4"
+ "reference": "68e25262d95b9f70f145b488f49be0d6cc73302b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zircote/swagger-php/zipball/299df0b51f641225ed50ba5199b21e8cfc34e4f4",
- "reference": "299df0b51f641225ed50ba5199b21e8cfc34e4f4",
+ "url": "https://api.github.com/repos/zircote/swagger-php/zipball/68e25262d95b9f70f145b488f49be0d6cc73302b",
+ "reference": "68e25262d95b9f70f145b488f49be0d6cc73302b",
"shasum": ""
},
"require": {
"doctrine/annotations": "*",
- "php": ">=5.4.0",
+ "php": ">=5.6",
"symfony/finder": "*"
},
"require-dev": {
- "squizlabs/php_codesniffer": "2.*",
+ "phpunit/phpunit": ">=4.8 <=5.6",
+ "squizlabs/php_codesniffer": ">=2.7",
"zendframework/zend-form": "<2.8"
},
"bin": [
@@ -3363,7 +3186,75 @@
"rest",
"service discovery"
],
- "time": "2016-05-27 09:35:51"
+ "time": "2017-05-12T22:02:20+00:00"
+ },
+ {
+ "name": "zizaco/entrust",
+ "version": "5.2.x-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Zizaco/entrust.git",
+ "reference": "3623cc052937d9e62543402b50f24065720d44b9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Zizaco/entrust/zipball/3623cc052937d9e62543402b50f24065720d44b9",
+ "reference": "3623cc052937d9e62543402b50f24065720d44b9",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/cache": "~5.0",
+ "illuminate/console": "~5.0",
+ "illuminate/support": "~5.0",
+ "php": ">=5.5.0"
+ },
+ "require-dev": {
+ "illuminate/database": "~5.0",
+ "mockery/mockery": "dev-master",
+ "phpunit/phpunit": "~4.1",
+ "sami/sami": "dev-master"
+ },
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "src/commands"
+ ],
+ "psr-4": {
+ "Zizaco\\Entrust\\": "src/Entrust/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Andrew Elkins",
+ "homepage": "http://andrewelkins.com"
+ },
+ {
+ "name": "Zizaco Zizuini",
+ "email": "zizaco@gmail.com"
+ },
+ {
+ "name": "Ben Batschelet",
+ "homepage": "http://github.com/bbatsche"
+ },
+ {
+ "name": "Michele Angioni",
+ "email": "michele.angioni@gmail.com"
+ }
+ ],
+ "description": "This package provides a flexible way to add Role-based Permissions to Laravel",
+ "keywords": [
+ "acl",
+ "auth",
+ "illuminate",
+ "laravel",
+ "permission",
+ "roles"
+ ],
+ "time": "2016-12-29T06:25:06+00:00"
}
],
"packages-dev": [
@@ -3419,7 +3310,7 @@
"constructor",
"instantiate"
],
- "time": "2015-06-14 21:17:01"
+ "time": "2015-06-14T21:17:01+00:00"
},
{
"name": "fzaninotto/faker",
@@ -3467,7 +3358,7 @@
"faker",
"fixtures"
],
- "time": "2016-04-29 12:21:54"
+ "time": "2016-04-29T12:21:54+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -3512,20 +3403,20 @@
"keywords": [
"test"
],
- "time": "2015-05-11 14:41:42"
+ "time": "2015-05-11T14:41:42+00:00"
},
{
"name": "mockery/mockery",
- "version": "0.9.5",
+ "version": "0.9.9",
"source": {
"type": "git",
- "url": "https://github.com/padraic/mockery.git",
- "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2"
+ "url": "https://github.com/mockery/mockery.git",
+ "reference": "6fdb61243844dc924071d3404bb23994ea0b6856"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/padraic/mockery/zipball/4db079511a283e5aba1b3c2fb19037c645e70fc2",
- "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/6fdb61243844dc924071d3404bb23994ea0b6856",
+ "reference": "6fdb61243844dc924071d3404bb23994ea0b6856",
"shasum": ""
},
"require": {
@@ -3577,20 +3468,20 @@
"test double",
"testing"
],
- "time": "2016-05-22 21:52:33"
+ "time": "2017-02-28T12:52:32+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.5.4",
+ "version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f"
+ "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
- "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
+ "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
"shasum": ""
},
"require": {
@@ -3619,7 +3510,7 @@
"object",
"object graph"
],
- "time": "2016-09-16 13:37:59"
+ "time": "2017-04-12T18:52:22+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -3673,7 +3564,7 @@
"reflection",
"static analysis"
],
- "time": "2015-12-27 11:43:31"
+ "time": "2015-12-27T11:43:31+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
@@ -3718,20 +3609,20 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2016-09-30 07:12:33"
+ "time": "2016-09-30T07:12:33+00:00"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "0.2",
+ "version": "0.2.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
+ "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
- "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+ "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
"shasum": ""
},
"require": {
@@ -3765,31 +3656,32 @@
"email": "me@mikevanriel.com"
}
],
- "time": "2016-06-10 07:14:17"
+ "time": "2016-11-25T06:54:22+00:00"
},
{
"name": "phpspec/prophecy",
- "version": "v1.6.1",
+ "version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
+ "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
- "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
+ "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
- "sebastian/comparator": "^1.1",
- "sebastian/recursion-context": "^1.0"
+ "sebastian/comparator": "^1.1|^2.0",
+ "sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
- "phpspec/phpspec": "^2.0"
+ "phpspec/phpspec": "^2.5|^3.2",
+ "phpunit/phpunit": "^4.8 || ^5.6.5"
},
"type": "library",
"extra": {
@@ -3827,39 +3719,39 @@
"spy",
"stub"
],
- "time": "2016-06-07 08:13:47"
+ "time": "2017-03-02T20:05:34+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "4.0.1",
+ "version": "4.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3"
+ "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5f3f7e736d6319d5f1fc402aff8b026da26709a3",
- "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+ "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
"shasum": ""
},
"require": {
+ "ext-dom": "*",
+ "ext-xmlwriter": "*",
"php": "^5.6 || ^7.0",
- "phpunit/php-file-iterator": "~1.3",
- "phpunit/php-text-template": "~1.2",
- "phpunit/php-token-stream": "^1.4.2",
- "sebastian/code-unit-reverse-lookup": "~1.0",
+ "phpunit/php-file-iterator": "^1.3",
+ "phpunit/php-text-template": "^1.2",
+ "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+ "sebastian/code-unit-reverse-lookup": "^1.0",
"sebastian/environment": "^1.3.2 || ^2.0",
- "sebastian/version": "~1.0|~2.0"
+ "sebastian/version": "^1.0 || ^2.0"
},
"require-dev": {
- "ext-xdebug": ">=2.1.4",
- "phpunit/phpunit": "^5.4"
+ "ext-xdebug": "^2.1.4",
+ "phpunit/phpunit": "^5.7"
},
"suggest": {
- "ext-dom": "*",
- "ext-xdebug": ">=2.4.0",
- "ext-xmlwriter": "*"
+ "ext-xdebug": "^2.5.1"
},
"type": "library",
"extra": {
@@ -3890,20 +3782,20 @@
"testing",
"xunit"
],
- "time": "2016-07-26 14:39:29"
+ "time": "2017-04-02T07:44:40+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "1.4.1",
+ "version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+ "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
- "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+ "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
"shasum": ""
},
"require": {
@@ -3937,7 +3829,7 @@
"filesystem",
"iterator"
],
- "time": "2015-06-21 13:08:43"
+ "time": "2016-10-03T07:40:28+00:00"
},
{
"name": "phpunit/php-text-template",
@@ -3978,29 +3870,34 @@
"keywords": [
"template"
],
- "time": "2015-06-21 13:50:34"
+ "time": "2015-06-21T13:50:34+00:00"
},
{
"name": "phpunit/php-timer",
- "version": "1.0.8",
+ "version": "1.0.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+ "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
- "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+ "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4|~5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
"autoload": {
"classmap": [
"src/"
@@ -4022,20 +3919,20 @@
"keywords": [
"timer"
],
- "time": "2016-05-12 18:03:57"
+ "time": "2017-02-26T11:10:40+00:00"
},
{
"name": "phpunit/php-token-stream",
- "version": "1.4.8",
+ "version": "1.4.11",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+ "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
+ "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
"shasum": ""
},
"require": {
@@ -4071,20 +3968,20 @@
"keywords": [
"tokenizer"
],
- "time": "2015-09-15 10:49:45"
+ "time": "2017-02-27T10:12:30+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "5.6.1",
+ "version": "5.7.20",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "60c32c5b5e79c2248001efa2560f831da11cc2d7"
+ "reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60c32c5b5e79c2248001efa2560f831da11cc2d7",
- "reference": "60c32c5b5e79c2248001efa2560f831da11cc2d7",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3cb94a5f8c07a03c8b7527ed7468a2926203f58b",
+ "reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b",
"shasum": ""
},
"require": {
@@ -4095,20 +3992,20 @@
"ext-xml": "*",
"myclabs/deep-copy": "~1.3",
"php": "^5.6 || ^7.0",
- "phpspec/prophecy": "^1.3.1",
- "phpunit/php-code-coverage": "^4.0.1",
+ "phpspec/prophecy": "^1.6.2",
+ "phpunit/php-code-coverage": "^4.0.4",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "^3.2",
- "sebastian/comparator": "~1.1",
- "sebastian/diff": "~1.2",
- "sebastian/environment": "^1.3 || ^2.0",
- "sebastian/exporter": "~1.2",
- "sebastian/global-state": "~1.0",
- "sebastian/object-enumerator": "~1.0",
+ "sebastian/comparator": "^1.2.4",
+ "sebastian/diff": "^1.4.3",
+ "sebastian/environment": "^1.3.4 || ^2.0",
+ "sebastian/exporter": "~2.0",
+ "sebastian/global-state": "^1.1",
+ "sebastian/object-enumerator": "~2.0",
"sebastian/resource-operations": "~1.0",
- "sebastian/version": "~1.0|~2.0",
+ "sebastian/version": "~1.0.3|~2.0",
"symfony/yaml": "~2.1|~3.0"
},
"conflict": {
@@ -4127,7 +4024,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.6.x-dev"
+ "dev-master": "5.7.x-dev"
}
},
"autoload": {
@@ -4153,27 +4050,27 @@
"testing",
"xunit"
],
- "time": "2016-10-07 13:03:26"
+ "time": "2017-05-22T07:42:55+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "3.3.1",
+ "version": "3.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "03500345483e1e17b52e2e4d34a89c9408ab2902"
+ "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/03500345483e1e17b52e2e4d34a89c9408ab2902",
- "reference": "03500345483e1e17b52e2e4d34a89c9408ab2902",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+ "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.6 || ^7.0",
"phpunit/php-text-template": "^1.2",
- "sebastian/exporter": "^1.2"
+ "sebastian/exporter": "^1.2 || ^2.0"
},
"conflict": {
"phpunit/phpunit": "<5.4.0"
@@ -4212,27 +4109,27 @@
"mock",
"xunit"
],
- "time": "2016-10-04 11:03:26"
+ "time": "2016-12-08T20:27:08+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
- "version": "1.0.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
- "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
+ "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
- "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+ "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
"shasum": ""
},
"require": {
- "php": ">=5.6"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~5"
+ "phpunit/phpunit": "^5.7 || ^6.0"
},
"type": "library",
"extra": {
@@ -4257,26 +4154,26 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2016-02-13 06:45:14"
+ "time": "2017-03-04T06:30:41+00:00"
},
{
"name": "sebastian/comparator",
- "version": "1.2.0",
+ "version": "1.2.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+ "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+ "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"
+ "sebastian/exporter": "~1.2 || ~2.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
@@ -4321,27 +4218,27 @@
"compare",
"equality"
],
- "time": "2015-07-26 15:48:44"
+ "time": "2017-01-29T09:50:25+00:00"
},
{
"name": "sebastian/diff",
- "version": "1.4.1",
+ "version": "1.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+ "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
- "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+ "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.8"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
@@ -4373,32 +4270,32 @@
"keywords": [
"diff"
],
- "time": "2015-12-08 07:14:41"
+ "time": "2017-05-22T07:24:03+00:00"
},
{
"name": "sebastian/environment",
- "version": "1.3.8",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
+ "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
- "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+ "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8 || ^5.0"
+ "phpunit/phpunit": "^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -4423,25 +4320,25 @@
"environment",
"hhvm"
],
- "time": "2016-08-18 05:49:44"
+ "time": "2016-11-26T07:53:53+00:00"
},
{
"name": "sebastian/exporter",
- "version": "1.2.2",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+ "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
- "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+ "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
- "sebastian/recursion-context": "~1.0"
+ "sebastian/recursion-context": "~2.0"
},
"require-dev": {
"ext-mbstring": "*",
@@ -4450,7 +4347,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -4490,7 +4387,7 @@
"export",
"exporter"
],
- "time": "2016-06-17 09:04:28"
+ "time": "2016-11-19T08:54:04+00:00"
},
{
"name": "sebastian/global-state",
@@ -4541,25 +4438,25 @@
"keywords": [
"global state"
],
- "time": "2015-10-12 03:26:01"
+ "time": "2015-10-12T03:26:01+00:00"
},
{
"name": "sebastian/object-enumerator",
- "version": "1.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
+ "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
- "reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
+ "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
"shasum": ""
},
"require": {
"php": ">=5.6",
- "sebastian/recursion-context": "~1.0"
+ "sebastian/recursion-context": "~2.0"
},
"require-dev": {
"phpunit/phpunit": "~5"
@@ -4567,7 +4464,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -4587,20 +4484,20 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "time": "2016-01-28 13:25:10"
+ "time": "2017-02-18T15:18:39+00:00"
},
{
"name": "sebastian/recursion-context",
- "version": "1.0.2",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+ "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
- "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+ "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
"shasum": ""
},
"require": {
@@ -4612,7 +4509,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -4640,7 +4537,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2015-11-11 19:50:13"
+ "time": "2016-11-19T07:33:16+00:00"
},
{
"name": "sebastian/resource-operations",
@@ -4682,20 +4579,20 @@
],
"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",
- "version": "2.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
- "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5"
+ "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
- "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+ "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
"shasum": ""
},
"require": {
@@ -4725,20 +4622,20 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2016-02-04 12:56:52"
+ "time": "2016-10-03T07:35:21+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v3.1.5",
+ "version": "v3.1.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "bb7395e8b1db3654de82b9f35d019958276de4d7"
+ "reference": "7eede2a901a19928494194f7d1815a77b9a473a0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/bb7395e8b1db3654de82b9f35d019958276de4d7",
- "reference": "bb7395e8b1db3654de82b9f35d019958276de4d7",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7eede2a901a19928494194f7d1815a77b9a473a0",
+ "reference": "7eede2a901a19928494194f7d1815a77b9a473a0",
"shasum": ""
},
"require": {
@@ -4781,29 +4678,35 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2016-08-05 08:37:39"
+ "time": "2017-01-21T17:13:55+00:00"
},
{
"name": "symfony/yaml",
- "version": "v3.1.5",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "368b9738d4033c8b93454cb0dbd45d305135a6d3"
+ "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/368b9738d4033c8b93454cb0dbd45d305135a6d3",
- "reference": "368b9738d4033c8b93454cb0dbd45d305135a6d3",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/9752a30000a8ca9f4b34b5227d15d0101b96b063",
+ "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063",
"shasum": ""
},
"require": {
"php": ">=5.5.9"
},
+ "require-dev": {
+ "symfony/console": "~2.8|~3.0"
+ },
+ "suggest": {
+ "symfony/console": "For validating YAML files using the lint command"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -4830,24 +4733,24 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-09-25 08:27:07"
+ "time": "2017-06-02T22:05:06+00:00"
},
{
"name": "webmozart/assert",
- "version": "1.1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "bb2d123231c095735130cc8f6d31385a44c7b308"
+ "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308",
- "reference": "bb2d123231c095735130cc8f6d31385a44c7b308",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
+ "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
"shasum": ""
},
"require": {
- "php": "^5.3.3|^7.0"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.6",
@@ -4856,7 +4759,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.3-dev"
}
},
"autoload": {
@@ -4880,22 +4783,22 @@
"check",
"validate"
],
- "time": "2016-08-09 15:02:57"
+ "time": "2016-11-23T20:04:58+00:00"
}
],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"infyomlabs/laravel-generator": 20,
- "laravelcollective/html": 20,
"infyomlabs/adminlte-templates": 20,
"infyomlabs/swagger-generator": 20,
- "jlapp/swaggervel": 20
+ "jlapp/swaggervel": 20,
+ "zizaco/entrust": 20
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=5.6.4"
+ "php": ">=7.0"
},
"platform-dev": []
}
diff --git a/config/app.php b/config/app.php
index 78397828..60d05bcf 100755
--- a/config/app.php
+++ b/config/app.php
@@ -93,8 +93,10 @@ return [
Collective\Html\HtmlServiceProvider::class,
Laracasts\Flash\FlashServiceProvider::class,
Prettus\Repository\Providers\RepositoryServiceProvider::class,
- \InfyOm\Generator\InfyOmGeneratorServiceProvider::class,
+ InfyOm\Generator\InfyOmGeneratorServiceProvider::class,
InfyOm\AdminLTETemplates\AdminLTETemplatesServiceProvider::class,
+ Zizaco\Entrust\EntrustServiceProvider::class,
+
/*
* Application Service Providers...
*/
@@ -118,6 +120,7 @@ return [
'Crypt' => Illuminate\Support\Facades\Crypt::class,
'DB' => Illuminate\Support\Facades\DB::class,
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
+ 'Entrust' => Zizaco\Entrust\EntrustFacade::class,
'Event' => Illuminate\Support\Facades\Event::class,
'File' => Illuminate\Support\Facades\File::class,
'Gate' => Illuminate\Support\Facades\Gate::class,
diff --git a/config/auth.php b/config/auth.php
index a57bdc77..56043f68 100755
--- a/config/auth.php
+++ b/config/auth.php
@@ -47,33 +47,12 @@ return [
],
],
- /*
- |--------------------------------------------------------------------------
- | User Providers
- |--------------------------------------------------------------------------
- |
- | All authentication drivers have a user provider. This defines how the
- | users are actually retrieved out of your database or other storage
- | mechanisms used by this application to persist your user's data.
- |
- | If you have multiple user tables or models you may configure multiple
- | sources which represent each model / table. These sources may then
- | be assigned to any extra authentication guards you have defined.
- |
- | Supported: "database", "eloquent"
- |
- */
-
'providers' => [
'users' => [
'driver' => 'eloquent',
- 'model' => App\User::class,
+ 'model' => App\Models\User::class,
+ 'table' => 'users',
],
-
- // 'users' => [
- // 'driver' => 'database',
- // 'table' => 'users',
- // ],
],
/*
diff --git a/config/entrust.php b/config/entrust.php
new file mode 100644
index 00000000..55635637
--- /dev/null
+++ b/config/entrust.php
@@ -0,0 +1,92 @@
+ 'App\Models\Role',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust Roles Table
+ |--------------------------------------------------------------------------
+ |
+ | This is the roles table used by Entrust to save roles to the database.
+ |
+ */
+ 'roles_table' => 'roles',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust Permission Model
+ |--------------------------------------------------------------------------
+ |
+ | This is the Permission model used by Entrust to create correct relations.
+ | Update the permission if it is in a different namespace.
+ |
+ */
+ 'permission' => 'App\Models\Permission',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust Permissions Table
+ |--------------------------------------------------------------------------
+ |
+ | This is the permissions table used by Entrust to save permissions to the
+ | database.
+ |
+ */
+ 'permissions_table' => 'permissions',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust permission_role Table
+ |--------------------------------------------------------------------------
+ |
+ | This is the permission_role table used by Entrust to save relationship
+ | between permissions and roles to the database.
+ |
+ */
+ 'permission_role_table' => 'permission_role',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Entrust role_user Table
+ |--------------------------------------------------------------------------
+ |
+ | This is the role_user table used by Entrust to save assigned roles to the
+ | database.
+ |
+ */
+ 'role_user_table' => 'role_user',
+
+ /*
+ |--------------------------------------------------------------------------
+ | User Foreign key on Entrust's role_user Table (Pivot)
+ |--------------------------------------------------------------------------
+ */
+ 'user_foreign_key' => 'user_id',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Role Foreign key on Entrust's role_user Table (Pivot)
+ |--------------------------------------------------------------------------
+ */
+ 'role_foreign_key' => 'role_id',
+
+];
diff --git a/database/migrations/2017_06_08_0000_create_users_table.php b/database/migrations/2017_06_08_0000_create_users_table.php
index 79a63f9f..6d8d4eba 100755
--- a/database/migrations/2017_06_08_0000_create_users_table.php
+++ b/database/migrations/2017_06_08_0000_create_users_table.php
@@ -15,9 +15,7 @@ class CreateUsersTable extends Migration
{
Schema::create('users', function (Blueprint $table) {
$table->increments('id');
- $table->string('name');
- $table->string('first_name')->nullable();
- $table->string('last_name')->nullable();
+ $table->string('name')->nullable();
$table->string('email')->unique();
$table->string('password');
$table->string('code')->nullable();
@@ -32,6 +30,53 @@ class CreateUsersTable extends Migration
$table->rememberToken();
$table->timestamps();
});
+
+ // Create table for storing roles
+ Schema::create('roles', function (Blueprint $table) {
+ $table->increments('id');
+ $table->string('name')->unique();
+ $table->string('display_name')->nullable();
+ $table->string('description')->nullable();
+ $table->timestamps();
+ });
+
+ // Create table for associating roles to users (Many-to-Many)
+ Schema::create('role_user', function (Blueprint $table) {
+ $table->integer('user_id')->unsigned();
+ $table->integer('role_id')->unsigned();
+
+ $table->foreign('user_id')->references('id')->on('users')
+ ->onUpdate('cascade')->onDelete('cascade');
+ $table->foreign('role_id')->references('id')->on('roles')
+ ->onUpdate('cascade')->onDelete('cascade');
+
+ $table->primary(['user_id', 'role_id']);
+ });
+
+ // Create table for storing permissions
+ Schema::create('permissions', function (Blueprint $table) {
+ $table->increments('id');
+ $table->string('name')->unique();
+ $table->string('display_name')->nullable();
+ $table->string('description')->nullable();
+ $table->timestamps();
+ });
+
+ // Create table for associating permissions to roles (Many-to-Many)
+ Schema::create('permission_role', function (Blueprint $table) {
+ $table->integer('permission_id')->unsigned();
+ $table->integer('role_id')->unsigned();
+
+ $table->foreign('permission_id')->references('id')->on('permissions')
+ ->onUpdate('cascade')->onDelete('cascade');
+ $table->foreign('role_id')->references('id')->on('roles')
+ ->onUpdate('cascade')->onDelete('cascade');
+
+ $table->primary(['permission_id', 'role_id']);
+ });
+
+ # create a default user/role
+
}
/**
@@ -42,5 +87,9 @@ class CreateUsersTable extends Migration
public function down()
{
Schema::drop('users');
+ Schema::drop('permission_role');
+ Schema::drop('permissions');
+ Schema::drop('role_user');
+ Schema::drop('roles');
}
}
diff --git a/database/seeds/AircraftClassesSeeder.php b/database/seeds/AircraftClassesSeeder.php
deleted file mode 100644
index f0f86634..00000000
--- a/database/seeds/AircraftClassesSeeder.php
+++ /dev/null
@@ -1,18 +0,0 @@
-user_seeder();
+ }
+
+ /**
+ * Add an initial admin user and roles
+ */
+ protected function user_seeder()
+ {
+ # 2 main groups
+ DB::table('roles')->insert(['id' => 1, 'name' => 'Administrators']);
+ DB::table('roles')->insert(['id' => 2, 'name' => 'Pilots']);
+
+ DB::table('users')->insert([
+ 'id' => 1,
+ 'name' => 'Admin User',
+ 'email' => 'admin@phpvms.net',
+ 'password' => bcrypt('admin'),
+ ]);
+
+ DB::table('role_user')->insert([
+ 'user_id' => 1, 'role_id' => 1
+ ]);
+ }
+}
diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php
new file mode 100644
index 00000000..c7aae1b8
--- /dev/null
+++ b/resources/views/vendor/mail/html/button.blade.php
@@ -0,0 +1,19 @@
+
diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php
new file mode 100644
index 00000000..c3f9360a
--- /dev/null
+++ b/resources/views/vendor/mail/html/footer.blade.php
@@ -0,0 +1,11 @@
+
+ |
+
+ |
+
diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php
new file mode 100644
index 00000000..eefabab9
--- /dev/null
+++ b/resources/views/vendor/mail/html/header.blade.php
@@ -0,0 +1,7 @@
+
+
+
diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php
new file mode 100644
index 00000000..991ae52a
--- /dev/null
+++ b/resources/views/vendor/mail/html/layout.blade.php
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $header or '' }}
+
+
+
+
+
+
+
+ |
+ {{ Illuminate\Mail\Markdown::parse($slot) }}
+
+ {{ $subcopy or '' }}
+ |
+
+
+ |
+
+
+ {{ $footer or '' }}
+
+ |
+
+
+
+
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
new file mode 100644
index 00000000..2ad23a66
--- /dev/null
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -0,0 +1,27 @@
+@component('mail::layout')
+ {{-- Header --}}
+ @slot('header')
+ @component('mail::header', ['url' => config('app.url')])
+ {{ config('app.name') }}
+ @endcomponent
+ @endslot
+
+ {{-- Body --}}
+ {{ $slot }}
+
+ {{-- Subcopy --}}
+ @isset($subcopy)
+ @slot('subcopy')
+ @component('mail::subcopy')
+ {{ $subcopy }}
+ @endcomponent
+ @endslot
+ @endisset
+
+ {{-- Footer --}}
+ @slot('footer')
+ @component('mail::footer')
+ © {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+ @endcomponent
+ @endslot
+@endcomponent
diff --git a/resources/views/vendor/mail/html/panel.blade.php b/resources/views/vendor/mail/html/panel.blade.php
new file mode 100644
index 00000000..f3970802
--- /dev/null
+++ b/resources/views/vendor/mail/html/panel.blade.php
@@ -0,0 +1,13 @@
+
+
+
+
+
+ |
+ {{ Illuminate\Mail\Markdown::parse($slot) }}
+ |
+
+
+ |
+
+
diff --git a/resources/views/vendor/mail/html/promotion.blade.php b/resources/views/vendor/mail/html/promotion.blade.php
new file mode 100644
index 00000000..0debcf8a
--- /dev/null
+++ b/resources/views/vendor/mail/html/promotion.blade.php
@@ -0,0 +1,7 @@
+
diff --git a/resources/views/vendor/mail/html/promotion/button.blade.php b/resources/views/vendor/mail/html/promotion/button.blade.php
new file mode 100644
index 00000000..8e79081c
--- /dev/null
+++ b/resources/views/vendor/mail/html/promotion/button.blade.php
@@ -0,0 +1,13 @@
+
diff --git a/resources/views/vendor/mail/html/subcopy.blade.php b/resources/views/vendor/mail/html/subcopy.blade.php
new file mode 100644
index 00000000..c3df7b4c
--- /dev/null
+++ b/resources/views/vendor/mail/html/subcopy.blade.php
@@ -0,0 +1,7 @@
+
+
+ |
+ {{ Illuminate\Mail\Markdown::parse($slot) }}
+ |
+
+
diff --git a/resources/views/vendor/mail/html/table.blade.php b/resources/views/vendor/mail/html/table.blade.php
new file mode 100644
index 00000000..a5f3348b
--- /dev/null
+++ b/resources/views/vendor/mail/html/table.blade.php
@@ -0,0 +1,3 @@
+
+{{ Illuminate\Mail\Markdown::parse($slot) }}
+
diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css
new file mode 100644
index 00000000..20659933
--- /dev/null
+++ b/resources/views/vendor/mail/html/themes/default.css
@@ -0,0 +1,285 @@
+/* Base */
+
+body, body *:not(html):not(style):not(br):not(tr):not(code) {
+ font-family: Avenir, Helvetica, sans-serif;
+ box-sizing: border-box;
+}
+
+body {
+ background-color: #f5f8fa;
+ color: #74787E;
+ height: 100%;
+ hyphens: auto;
+ line-height: 1.4;
+ margin: 0;
+ -moz-hyphens: auto;
+ -ms-word-break: break-all;
+ width: 100% !important;
+ -webkit-hyphens: auto;
+ -webkit-text-size-adjust: none;
+ word-break: break-all;
+ word-break: break-word;
+}
+
+p,
+ul,
+ol,
+blockquote {
+ line-height: 1.4;
+ text-align: left;
+}
+
+a {
+ color: #3869D4;
+}
+
+a img {
+ border: none;
+}
+
+/* Typography */
+
+h1 {
+ color: #2F3133;
+ font-size: 19px;
+ font-weight: bold;
+ margin-top: 0;
+ text-align: left;
+}
+
+h2 {
+ color: #2F3133;
+ font-size: 16px;
+ font-weight: bold;
+ margin-top: 0;
+ text-align: left;
+}
+
+h3 {
+ color: #2F3133;
+ font-size: 14px;
+ font-weight: bold;
+ margin-top: 0;
+ text-align: left;
+}
+
+p {
+ color: #74787E;
+ font-size: 16px;
+ line-height: 1.5em;
+ margin-top: 0;
+ text-align: left;
+}
+
+p.sub {
+ font-size: 12px;
+}
+
+img {
+ max-width: 100%;
+}
+
+/* Layout */
+
+.wrapper {
+ background-color: #f5f8fa;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 100%;
+}
+
+.content {
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 100%;
+}
+
+/* Header */
+
+.header {
+ padding: 25px 0;
+ text-align: center;
+}
+
+.header a {
+ color: #bbbfc3;
+ font-size: 19px;
+ font-weight: bold;
+ text-decoration: none;
+ text-shadow: 0 1px 0 white;
+}
+
+/* Body */
+
+.body {
+ background-color: #FFFFFF;
+ border-bottom: 1px solid #EDEFF2;
+ border-top: 1px solid #EDEFF2;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 100%;
+}
+
+.inner-body {
+ background-color: #FFFFFF;
+ margin: 0 auto;
+ padding: 0;
+ width: 570px;
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 570px;
+}
+
+/* Subcopy */
+
+.subcopy {
+ border-top: 1px solid #EDEFF2;
+ margin-top: 25px;
+ padding-top: 25px;
+}
+
+.subcopy p {
+ font-size: 12px;
+}
+
+/* Footer */
+
+.footer {
+ margin: 0 auto;
+ padding: 0;
+ text-align: center;
+ width: 570px;
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 570px;
+}
+
+.footer p {
+ color: #AEAEAE;
+ font-size: 12px;
+ text-align: center;
+}
+
+/* Tables */
+
+.table table {
+ margin: 30px auto;
+ width: 100%;
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 100%;
+}
+
+.table th {
+ border-bottom: 1px solid #EDEFF2;
+ padding-bottom: 8px;
+}
+
+.table td {
+ color: #74787E;
+ font-size: 15px;
+ line-height: 18px;
+ padding: 10px 0;
+}
+
+.content-cell {
+ padding: 35px;
+}
+
+/* Buttons */
+
+.action {
+ margin: 30px auto;
+ padding: 0;
+ text-align: center;
+ width: 100%;
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 100%;
+}
+
+.button {
+ border-radius: 3px;
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
+ color: #FFF;
+ display: inline-block;
+ text-decoration: none;
+ -webkit-text-size-adjust: none;
+}
+
+.button-blue {
+ background-color: #3097D1;
+ border-top: 10px solid #3097D1;
+ border-right: 18px solid #3097D1;
+ border-bottom: 10px solid #3097D1;
+ border-left: 18px solid #3097D1;
+}
+
+.button-green {
+ background-color: #2ab27b;
+ border-top: 10px solid #2ab27b;
+ border-right: 18px solid #2ab27b;
+ border-bottom: 10px solid #2ab27b;
+ border-left: 18px solid #2ab27b;
+}
+
+.button-red {
+ background-color: #bf5329;
+ border-top: 10px solid #bf5329;
+ border-right: 18px solid #bf5329;
+ border-bottom: 10px solid #bf5329;
+ border-left: 18px solid #bf5329;
+}
+
+/* Panels */
+
+.panel {
+ margin: 0 0 21px;
+}
+
+.panel-content {
+ background-color: #EDEFF2;
+ padding: 16px;
+}
+
+.panel-item {
+ padding: 0;
+}
+
+.panel-item p:last-of-type {
+ margin-bottom: 0;
+ padding-bottom: 0;
+}
+
+/* Promotions */
+
+.promotion {
+ background-color: #FFFFFF;
+ border: 2px dashed #9BA2AB;
+ margin: 0;
+ margin-bottom: 25px;
+ margin-top: 25px;
+ padding: 24px;
+ width: 100%;
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 100%;
+}
+
+.promotion h1 {
+ text-align: center;
+}
+
+.promotion p {
+ font-size: 15px;
+ text-align: center;
+}
diff --git a/resources/views/vendor/mail/markdown/button.blade.php b/resources/views/vendor/mail/markdown/button.blade.php
new file mode 100644
index 00000000..97444ebd
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/button.blade.php
@@ -0,0 +1 @@
+{{ $slot }}: {{ $url }}
diff --git a/resources/views/vendor/mail/markdown/footer.blade.php b/resources/views/vendor/mail/markdown/footer.blade.php
new file mode 100644
index 00000000..3338f620
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/footer.blade.php
@@ -0,0 +1 @@
+{{ $slot }}
diff --git a/resources/views/vendor/mail/markdown/header.blade.php b/resources/views/vendor/mail/markdown/header.blade.php
new file mode 100644
index 00000000..aaa3e575
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/header.blade.php
@@ -0,0 +1 @@
+[{{ $slot }}]({{ $url }})
diff --git a/resources/views/vendor/mail/markdown/layout.blade.php b/resources/views/vendor/mail/markdown/layout.blade.php
new file mode 100644
index 00000000..9378baa0
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/layout.blade.php
@@ -0,0 +1,9 @@
+{!! strip_tags($header) !!}
+
+{!! strip_tags($slot) !!}
+@isset($subcopy)
+
+{!! strip_tags($subcopy) !!}
+@endisset
+
+{!! strip_tags($footer) !!}
diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php
new file mode 100644
index 00000000..b409c71c
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/message.blade.php
@@ -0,0 +1,27 @@
+@component('mail::layout')
+ {{-- Header --}}
+ @slot('header')
+ @component('mail::header', ['url' => config('app.url')])
+ {{ config('app.name') }}
+ @endcomponent
+ @endslot
+
+ {{-- Body --}}
+ {{ $slot }}
+
+ {{-- Subcopy --}}
+ @isset($subcopy)
+ @slot('subcopy')
+ @component('mail::subcopy')
+ {{ $subcopy }}
+ @endcomponent
+ @endslot
+ @endisset
+
+ {{-- Footer --}}
+ @slot('footer')
+ @component('mail::footer')
+ © {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+ @endcomponent
+ @endslot
+@endcomponent
diff --git a/resources/views/vendor/mail/markdown/panel.blade.php b/resources/views/vendor/mail/markdown/panel.blade.php
new file mode 100644
index 00000000..3338f620
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/panel.blade.php
@@ -0,0 +1 @@
+{{ $slot }}
diff --git a/resources/views/vendor/mail/markdown/promotion.blade.php b/resources/views/vendor/mail/markdown/promotion.blade.php
new file mode 100644
index 00000000..3338f620
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/promotion.blade.php
@@ -0,0 +1 @@
+{{ $slot }}
diff --git a/resources/views/vendor/mail/markdown/promotion/button.blade.php b/resources/views/vendor/mail/markdown/promotion/button.blade.php
new file mode 100644
index 00000000..aaa3e575
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/promotion/button.blade.php
@@ -0,0 +1 @@
+[{{ $slot }}]({{ $url }})
diff --git a/resources/views/vendor/mail/markdown/subcopy.blade.php b/resources/views/vendor/mail/markdown/subcopy.blade.php
new file mode 100644
index 00000000..3338f620
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/subcopy.blade.php
@@ -0,0 +1 @@
+{{ $slot }}
diff --git a/resources/views/vendor/mail/markdown/table.blade.php b/resources/views/vendor/mail/markdown/table.blade.php
new file mode 100644
index 00000000..3338f620
--- /dev/null
+++ b/resources/views/vendor/mail/markdown/table.blade.php
@@ -0,0 +1 @@
+{{ $slot }}