Commit 671cae96 by Prasong Putichanchai

Merge branch 'integration' into prasong

# Conflicts:
#	www/src/Controller/ProfilesController.php
parents 48da6edc 9a744ad6
...@@ -11,8 +11,10 @@ ...@@ -11,8 +11,10 @@
"cakephp/migrations": "^1.0", "cakephp/migrations": "^1.0",
"cakephp/plugin-installer": "^1.0", "cakephp/plugin-installer": "^1.0",
"josegonzalez/dotenv": "2.*", "josegonzalez/dotenv": "2.*",
"league/oauth2-github": "^2.0",
"maiconpinto/cakephp-adminlte-theme": "^1.0", "maiconpinto/cakephp-adminlte-theme": "^1.0",
"mobiledetect/mobiledetectlib": "2.*" "mobiledetect/mobiledetectlib": "2.*",
"muffin/oauth2": "dev-master"
}, },
"require-dev": { "require-dev": {
"cakephp/bake": "^1.1", "cakephp/bake": "^1.1",
......
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5d2403e6025a6e93d48090b20bac64fa", "content-hash": "ebc259e4faf59f493adbde15e8aa5e34",
"packages": [ "packages": [
{ {
"name": "aura/intl", "name": "aura/intl",
...@@ -103,21 +103,21 @@ ...@@ -103,21 +103,21 @@
}, },
{ {
"name": "cakephp/cakephp", "name": "cakephp/cakephp",
"version": "3.5.4", "version": "3.5.17",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/cakephp/cakephp.git", "url": "https://github.com/cakephp/cakephp.git",
"reference": "eb609aff20945f8bc86cfb1fd3c50e6c62a502b0" "reference": "7727f122bac708a6b5883472bb3b22aad1e68e3b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/cakephp/cakephp/zipball/eb609aff20945f8bc86cfb1fd3c50e6c62a502b0", "url": "https://api.github.com/repos/cakephp/cakephp/zipball/7727f122bac708a6b5883472bb3b22aad1e68e3b",
"reference": "eb609aff20945f8bc86cfb1fd3c50e6c62a502b0", "reference": "7727f122bac708a6b5883472bb3b22aad1e68e3b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"aura/intl": "^3.0.0", "aura/intl": "^3.0.0",
"cakephp/chronos": "^1.0.0", "cakephp/chronos": "^1.0.1",
"ext-intl": "*", "ext-intl": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"php": ">=5.6.0", "php": ">=5.6.0",
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
}, },
"require-dev": { "require-dev": {
"cakephp/cakephp-codesniffer": "^3.0", "cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "^5.7|^6.0" "phpunit/phpunit": "^5.7.14|^6.0"
}, },
"suggest": { "suggest": {
"ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.", "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Cake\\": "src" "Cake\\": "src/"
}, },
"files": [ "files": [
"src/Core/functions.php", "src/Core/functions.php",
...@@ -185,24 +185,24 @@ ...@@ -185,24 +185,24 @@
"rapid-development", "rapid-development",
"validation" "validation"
], ],
"time": "2017-10-16T02:25:27+00:00" "time": "2018-05-21T01:31:33+00:00"
}, },
{ {
"name": "cakephp/chronos", "name": "cakephp/chronos",
"version": "1.1.2", "version": "1.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/cakephp/chronos.git", "url": "https://github.com/cakephp/chronos.git",
"reference": "0621b191334d8dcb56907688986dd24eb8c38234" "reference": "85bcaea6a832684b32ef54b2487b0c14a172e9e6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/cakephp/chronos/zipball/0621b191334d8dcb56907688986dd24eb8c38234", "url": "https://api.github.com/repos/cakephp/chronos/zipball/85bcaea6a832684b32ef54b2487b0c14a172e9e6",
"reference": "0621b191334d8dcb56907688986dd24eb8c38234", "reference": "85bcaea6a832684b32ef54b2487b0c14a172e9e6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5.9" "php": "^5.5.9|^7"
}, },
"require-dev": { "require-dev": {
"athletic/athletic": "~0.1", "athletic/athletic": "~0.1",
...@@ -242,20 +242,20 @@ ...@@ -242,20 +242,20 @@
"datetime", "datetime",
"time" "time"
], ],
"time": "2017-04-27T01:27:49+00:00" "time": "2018-01-13T12:19:50+00:00"
}, },
{ {
"name": "cakephp/migrations", "name": "cakephp/migrations",
"version": "1.7.1", "version": "1.7.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/cakephp/migrations.git", "url": "https://github.com/cakephp/migrations.git",
"reference": "90d427d0a1ae974e4d6795cf8310724d0a5c07db" "reference": "a5612adfd2efa8c90d29cb3b0c969de872a99eda"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/cakephp/migrations/zipball/90d427d0a1ae974e4d6795cf8310724d0a5c07db", "url": "https://api.github.com/repos/cakephp/migrations/zipball/a5612adfd2efa8c90d29cb3b0c969de872a99eda",
"reference": "90d427d0a1ae974e4d6795cf8310724d0a5c07db", "reference": "a5612adfd2efa8c90d29cb3b0c969de872a99eda",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -267,6 +267,7 @@ ...@@ -267,6 +267,7 @@
"require-dev": { "require-dev": {
"cakephp/bake": "@stable", "cakephp/bake": "@stable",
"cakephp/cakephp": "~3.2", "cakephp/cakephp": "~3.2",
"cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "~4.1" "phpunit/phpunit": "~4.1"
}, },
"suggest": { "suggest": {
...@@ -294,20 +295,20 @@ ...@@ -294,20 +295,20 @@
"cakephp", "cakephp",
"migrations" "migrations"
], ],
"time": "2017-08-05T13:16:31+00:00" "time": "2017-12-12T21:01:38+00:00"
}, },
{ {
"name": "cakephp/plugin-installer", "name": "cakephp/plugin-installer",
"version": "1.0.0", "version": "1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/cakephp/plugin-installer.git", "url": "https://github.com/cakephp/plugin-installer.git",
"reference": "3449cb3251e3e741b123237765e278005565d8de" "reference": "41373d0678490502f45adc7be88aa22d24ac1843"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/cakephp/plugin-installer/zipball/3449cb3251e3e741b123237765e278005565d8de", "url": "https://api.github.com/repos/cakephp/plugin-installer/zipball/41373d0678490502f45adc7be88aa22d24ac1843",
"reference": "3449cb3251e3e741b123237765e278005565d8de", "reference": "41373d0678490502f45adc7be88aa22d24ac1843",
"shasum": "" "shasum": ""
}, },
"require-dev": { "require-dev": {
...@@ -335,27 +336,28 @@ ...@@ -335,27 +336,28 @@
} }
], ],
"description": "A composer installer for CakePHP 3.0+ plugins.", "description": "A composer installer for CakePHP 3.0+ plugins.",
"time": "2017-03-21T13:48:47+00:00" "time": "2017-12-24T21:09:29+00:00"
}, },
{ {
"name": "friendsofcake/bootstrap-ui", "name": "friendsofcake/bootstrap-ui",
"version": "1.2.1", "version": "1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/FriendsOfCake/bootstrap-ui.git", "url": "https://github.com/FriendsOfCake/bootstrap-ui.git",
"reference": "fd02bdcd2bb3f58fa7e68c4d770836e0ac9ac988" "reference": "373184478a1d3cd8b272cad60a3db55479dd3dc5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfCake/bootstrap-ui/zipball/fd02bdcd2bb3f58fa7e68c4d770836e0ac9ac988", "url": "https://api.github.com/repos/FriendsOfCake/bootstrap-ui/zipball/373184478a1d3cd8b272cad60a3db55479dd3dc5",
"reference": "fd02bdcd2bb3f58fa7e68c4d770836e0ac9ac988", "reference": "373184478a1d3cd8b272cad60a3db55479dd3dc5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"cakephp/cakephp": "~3.0" "cakephp/cakephp": "^3.5"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "<6.0" "cakephp/chronos": "^1.1",
"phpunit/phpunit": "^5.7.14|^6.0"
}, },
"type": "cakephp-plugin", "type": "cakephp-plugin",
"autoload": { "autoload": {
...@@ -385,7 +387,188 @@ ...@@ -385,7 +387,188 @@
"cakephp", "cakephp",
"twitter" "twitter"
], ],
"time": "2017-08-04T00:58:47+00:00" "time": "2018-04-16T21:52:50+00:00"
},
{
"name": "guzzlehttp/guzzle",
"version": "6.3.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
"reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
"shasum": ""
},
"require": {
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.4",
"php": ">=5.5"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
"psr/log": "^1.0"
},
"suggest": {
"psr/log": "Required for using the Log middleware"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.3-dev"
}
},
"autoload": {
"files": [
"src/functions_include.php"
],
"psr-4": {
"GuzzleHttp\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Guzzle is a PHP HTTP client library",
"homepage": "http://guzzlephp.org/",
"keywords": [
"client",
"curl",
"framework",
"http",
"http client",
"rest",
"web service"
],
"time": "2018-04-22T15:46:56+00:00"
},
{
"name": "guzzlehttp/promises",
"version": "v1.3.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
"reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
"shasum": ""
},
"require": {
"php": ">=5.5.0"
},
"require-dev": {
"phpunit/phpunit": "^4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Guzzle promises library",
"keywords": [
"promise"
],
"time": "2016-12-20T10:07:11+00:00"
},
{
"name": "guzzlehttp/psr7",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
"reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"psr/http-message": "~1.0"
},
"provide": {
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Psr7\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Tobias Schultze",
"homepage": "https://github.com/Tobion"
}
],
"description": "PSR-7 message implementation that also provides common utility methods",
"keywords": [
"http",
"message",
"request",
"response",
"stream",
"uri",
"url"
],
"time": "2017-03-20T17:10:46+00:00"
}, },
{ {
"name": "josegonzalez/dotenv", "name": "josegonzalez/dotenv",
...@@ -440,17 +623,139 @@ ...@@ -440,17 +623,139 @@
"time": "2017-01-03T01:04:05+00:00" "time": "2017-01-03T01:04:05+00:00"
}, },
{ {
"name": "league/oauth2-client",
"version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth2-client.git",
"reference": "aa2e3df188f0bfd87f7880cc880e906e99923580"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/aa2e3df188f0bfd87f7880cc880e906e99923580",
"reference": "aa2e3df188f0bfd87f7880cc880e906e99923580",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^6.0",
"paragonie/random_compat": "^1|^2",
"php": "^5.6|^7.0"
},
"require-dev": {
"eloquent/liberator": "^2.0",
"eloquent/phony-phpunit": "^1.0|^3.0",
"jakub-onderka/php-parallel-lint": "^0.9.2",
"phpunit/phpunit": "^5.7|^6.0",
"squizlabs/php_codesniffer": "^2.3|^3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-2.x": "2.0.x-dev"
}
},
"autoload": {
"psr-4": {
"League\\OAuth2\\Client\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Alex Bilbie",
"email": "hello@alexbilbie.com",
"homepage": "http://www.alexbilbie.com",
"role": "Developer"
},
{
"name": "Woody Gilk",
"homepage": "https://github.com/shadowhand",
"role": "Contributor"
}
],
"description": "OAuth 2.0 Client Library",
"keywords": [
"Authentication",
"SSO",
"authorization",
"identity",
"idp",
"oauth",
"oauth2",
"single sign on"
],
"time": "2018-01-13T05:27:58+00:00"
},
{
"name": "league/oauth2-github",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth2-github.git",
"reference": "e63d64f3ec167c09232d189c6b0c397458a99357"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/oauth2-github/zipball/e63d64f3ec167c09232d189c6b0c397458a99357",
"reference": "e63d64f3ec167c09232d189c6b0c397458a99357",
"shasum": ""
},
"require": {
"league/oauth2-client": "^2.0"
},
"require-dev": {
"mockery/mockery": "~0.9",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"League\\OAuth2\\Client\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Steven Maguire",
"email": "stevenmaguire@gmail.com",
"homepage": "https://github.com/stevenmaguire"
}
],
"description": "Github OAuth 2.0 Client Provider for The PHP League OAuth2-Client",
"keywords": [
"authorisation",
"authorization",
"client",
"github",
"oauth",
"oauth2"
],
"time": "2017-01-26T01:14:51+00:00"
},
{
"name": "m1/env", "name": "m1/env",
"version": "2.1.0", "version": "2.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/m1/Env.git", "url": "https://github.com/m1/Env.git",
"reference": "d87eddd031f2aa5450fa04bb1325de8a489b3cd0" "reference": "3589eae8e40d40be96de39222a6ca19c3af8eae4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/m1/Env/zipball/d87eddd031f2aa5450fa04bb1325de8a489b3cd0", "url": "https://api.github.com/repos/m1/Env/zipball/3589eae8e40d40be96de39222a6ca19c3af8eae4",
"reference": "d87eddd031f2aa5450fa04bb1325de8a489b3cd0", "reference": "3589eae8e40d40be96de39222a6ca19c3af8eae4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -495,20 +800,20 @@ ...@@ -495,20 +800,20 @@
"parser", "parser",
"support" "support"
], ],
"time": "2016-10-06T19:31:28+00:00" "time": "2018-05-16T22:40:58+00:00"
}, },
{ {
"name": "maiconpinto/cakephp-adminlte-theme", "name": "maiconpinto/cakephp-adminlte-theme",
"version": "1.0.7", "version": "1.0.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/maiconpinto/cakephp-adminlte-theme.git", "url": "https://github.com/maiconpinto/cakephp-adminlte-theme.git",
"reference": "2f41a2db457680fd16019c0593ba65c6691fa738" "reference": "34f1d9def3f9d7d99833840cff10dba6f828b033"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/maiconpinto/cakephp-adminlte-theme/zipball/2f41a2db457680fd16019c0593ba65c6691fa738", "url": "https://api.github.com/repos/maiconpinto/cakephp-adminlte-theme/zipball/34f1d9def3f9d7d99833840cff10dba6f828b033",
"reference": "2f41a2db457680fd16019c0593ba65c6691fa738", "reference": "34f1d9def3f9d7d99833840cff10dba6f828b033",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -543,27 +848,27 @@ ...@@ -543,27 +848,27 @@
"plugin", "plugin",
"templates" "templates"
], ],
"time": "2017-08-25T02:11:19+00:00" "time": "2018-03-31T00:50:13+00:00"
}, },
{ {
"name": "mobiledetect/mobiledetectlib", "name": "mobiledetect/mobiledetectlib",
"version": "2.8.26", "version": "2.8.31",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/serbanghita/Mobile-Detect.git", "url": "https://github.com/serbanghita/Mobile-Detect.git",
"reference": "a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297" "reference": "adb882ea3b9d154f087ecb2c333180dad6f4dd37"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297", "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/adb882ea3b9d154f087ecb2c333180dad6f4dd37",
"reference": "a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297", "reference": "adb882ea3b9d154f087ecb2c333180dad6f4dd37",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.0.0" "php": ">=5.0.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "*" "phpunit/phpunit": "~4.8.35||~5.7"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
...@@ -595,7 +900,118 @@ ...@@ -595,7 +900,118 @@
"mobile detector", "mobile detector",
"php mobile detect" "php mobile detect"
], ],
"time": "2017-08-29T18:23:54+00:00" "time": "2018-02-26T19:39:55+00:00"
},
{
"name": "muffin/oauth2",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/UseMuffin/OAuth2.git",
"reference": "45f508b3cb72906b093a4a20668fde6e305c839f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/UseMuffin/OAuth2/zipball/45f508b3cb72906b093a4a20668fde6e305c839f",
"reference": "45f508b3cb72906b093a4a20668fde6e305c839f",
"shasum": ""
},
"require-dev": {
"cakephp/cakephp": "^3.0",
"cakephp/cakephp-codesniffer": "^2.0",
"league/oauth2-github": "^0.2",
"phpunit/phpunit": "*"
},
"type": "cakephp-plugin",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Muffin\\OAuth2\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jad Bitar",
"homepage": "http://jadb.io",
"role": "Author"
},
{
"name": "ADmad",
"homepage": "https://github.com/ADmad",
"role": "Author"
},
{
"name": "Others",
"homepage": "https://github.com/usemuffin/oauth2/graphs/contributors"
}
],
"description": "CakePHP 3 authentication using the league/oauth2-client family",
"homepage": "https://github.com/usemuffin/oauth2",
"keywords": [
"Authentication",
"auth",
"cakephp",
"league",
"muffin",
"oauth2"
],
"time": "2016-08-30T17:55:56+00:00"
},
{
"name": "paragonie/random_compat",
"version": "v2.0.12",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
"reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
"shasum": ""
},
"require": {
"php": ">=5.2.0"
},
"require-dev": {
"phpunit/phpunit": "4.*|5.*"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
"type": "library",
"autoload": {
"files": [
"lib/random.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Paragon Initiative Enterprises",
"email": "security@paragonie.com",
"homepage": "https://paragonie.com"
}
],
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [
"csprng",
"pseudorandom",
"random"
],
"time": "2018-04-04T21:24:14+00:00"
}, },
{ {
"name": "psr/http-message", "name": "psr/http-message",
...@@ -762,30 +1178,31 @@ ...@@ -762,30 +1178,31 @@
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
"version": "v3.3.10", "version": "v3.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/config.git", "url": "https://github.com/symfony/config.git",
"reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd" "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/4ab62407bff9cd97c410a7feaef04c375aaa5cfd", "url": "https://api.github.com/repos/symfony/config/zipball/7c2a9d44f4433863e9bca682e7f03609234657f9",
"reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd", "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.5.9|>=7.0.8", "php": "^5.5.9|>=7.0.8",
"symfony/filesystem": "~2.8|~3.0" "symfony/filesystem": "~2.8|~3.0|~4.0"
}, },
"conflict": { "conflict": {
"symfony/dependency-injection": "<3.3", "symfony/dependency-injection": "<3.3",
"symfony/finder": "<3.3" "symfony/finder": "<3.3"
}, },
"require-dev": { "require-dev": {
"symfony/dependency-injection": "~3.3", "symfony/dependency-injection": "~3.3|~4.0",
"symfony/finder": "~3.3", "symfony/event-dispatcher": "~3.3|~4.0",
"symfony/yaml": "~3.0" "symfony/finder": "~3.3|~4.0",
"symfony/yaml": "~3.0|~4.0"
}, },
"suggest": { "suggest": {
"symfony/yaml": "To use the yaml reference dumper" "symfony/yaml": "To use the yaml reference dumper"
...@@ -793,7 +1210,7 @@ ...@@ -793,7 +1210,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -820,48 +1237,49 @@ ...@@ -820,48 +1237,49 @@
], ],
"description": "Symfony Config Component", "description": "Symfony Config Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-10-04T18:56:58+00:00" "time": "2018-03-19T22:32:39+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v3.3.10", "version": "v3.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "116bc56e45a8e5572e51eb43ab58c769a352366c" "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/116bc56e45a8e5572e51eb43ab58c769a352366c", "url": "https://api.github.com/repos/symfony/console/zipball/5b1fdfa8eb93464bcc36c34da39cedffef822cdf",
"reference": "116bc56e45a8e5572e51eb43ab58c769a352366c", "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.5.9|>=7.0.8", "php": "^5.5.9|>=7.0.8",
"symfony/debug": "~2.8|~3.0", "symfony/debug": "~2.8|~3.0|~4.0",
"symfony/polyfill-mbstring": "~1.0" "symfony/polyfill-mbstring": "~1.0"
}, },
"conflict": { "conflict": {
"symfony/dependency-injection": "<3.3" "symfony/dependency-injection": "<3.4",
"symfony/process": "<3.3"
}, },
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~3.3", "symfony/config": "~3.3|~4.0",
"symfony/dependency-injection": "~3.3", "symfony/dependency-injection": "~3.4|~4.0",
"symfony/event-dispatcher": "~2.8|~3.0", "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
"symfony/filesystem": "~2.8|~3.0", "symfony/lock": "~3.4|~4.0",
"symfony/process": "~2.8|~3.0" "symfony/process": "~3.3|~4.0"
}, },
"suggest": { "suggest": {
"psr/log": "For using the console logger", "psr/log-implementation": "For using the console logger",
"symfony/event-dispatcher": "", "symfony/event-dispatcher": "",
"symfony/filesystem": "", "symfony/lock": "",
"symfony/process": "" "symfony/process": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -888,20 +1306,20 @@ ...@@ -888,20 +1306,20 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-10-02T06:42:24+00:00" "time": "2018-04-30T01:22:56+00:00"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v3.3.10", "version": "v3.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd" "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd", "url": "https://api.github.com/repos/symfony/debug/zipball/1b95888cfd996484527cb41e8952d9a5eaf7454f",
"reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd", "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -912,12 +1330,12 @@ ...@@ -912,12 +1330,12 @@
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
}, },
"require-dev": { "require-dev": {
"symfony/http-kernel": "~2.8|~3.0" "symfony/http-kernel": "~2.8|~3.0|~4.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -944,20 +1362,20 @@ ...@@ -944,20 +1362,20 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-10-02T06:42:24+00:00" "time": "2018-04-30T16:53:52+00:00"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v3.3.10", "version": "v3.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1" "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/90bc45abf02ae6b7deb43895c1052cb0038506f1", "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541",
"reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1", "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -966,7 +1384,7 @@ ...@@ -966,7 +1384,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -993,20 +1411,20 @@ ...@@ -993,20 +1411,20 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-10-03T13:33:10+00:00" "time": "2018-02-22T10:48:49+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.5.0", "version": "v1.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" "reference": "3296adf6a6454a050679cde90f95350ad604b171"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
"reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", "reference": "3296adf6a6454a050679cde90f95350ad604b171",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1018,7 +1436,7 @@ ...@@ -1018,7 +1436,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.5-dev" "dev-master": "1.8-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -1052,27 +1470,30 @@ ...@@ -1052,27 +1470,30 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-06-14T15:44:48+00:00" "time": "2018-04-26T10:06:28+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v3.3.10", "version": "v3.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46" "reference": "033cfa61ef06ee0847e056e530201842b6e926c3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", "url": "https://api.github.com/repos/symfony/yaml/zipball/033cfa61ef06ee0847e056e530201842b6e926c3",
"reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", "reference": "033cfa61ef06ee0847e056e530201842b6e926c3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.5.9|>=7.0.8" "php": "^5.5.9|>=7.0.8"
}, },
"conflict": {
"symfony/console": "<3.4"
},
"require-dev": { "require-dev": {
"symfony/console": "~2.8|~3.0" "symfony/console": "~3.4|~4.0"
}, },
"suggest": { "suggest": {
"symfony/console": "For validating YAML files using the lint command" "symfony/console": "For validating YAML files using the lint command"
...@@ -1080,7 +1501,7 @@ ...@@ -1080,7 +1501,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -1107,20 +1528,20 @@ ...@@ -1107,20 +1528,20 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-10-05T14:43:42+00:00" "time": "2018-04-08T08:21:29+00:00"
}, },
{ {
"name": "zendframework/zend-diactoros", "name": "zendframework/zend-diactoros",
"version": "1.6.1", "version": "1.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zendframework/zend-diactoros.git", "url": "https://github.com/zendframework/zend-diactoros.git",
"reference": "c8664b92a6d5bc229e48b0923486c097e45a7877" "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/c8664b92a6d5bc229e48b0923486c097e45a7877", "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1",
"reference": "c8664b92a6d5bc229e48b0923486c097e45a7877", "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1139,8 +1560,8 @@ ...@@ -1139,8 +1560,8 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.6-dev", "dev-master": "1.7.x-dev",
"dev-develop": "1.7-dev" "dev-develop": "1.8.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -1159,32 +1580,204 @@ ...@@ -1159,32 +1580,204 @@
"psr", "psr",
"psr-7" "psr-7"
], ],
"time": "2017-10-12T15:24:51+00:00" "time": "2018-02-26T15:44:50+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "ajgl/breakpoint-twig-extension",
"version": "0.3.1",
"source": {
"type": "git",
"url": "https://github.com/ajgarlag/AjglBreakpointTwigExtension.git",
"reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/360ec6351ad7e1968ee78abb31430046c2e04fc5",
"reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5",
"shasum": ""
},
"require": {
"php": ">=5.6",
"twig/twig": "^1.14|^2.0"
},
"require-dev": {
"phpunit/phpunit": "^5",
"symfony/framework-bundle": "^2.7|^3.2",
"symfony/twig-bundle": "^2.7|^3.2"
},
"suggest": {
"ext-xdebug": "The Xdebug extension is required for the breakpoint to work",
"symfony/framework-bundle": "The framework bundle to integrate the extension into Symfony",
"symfony/twig-bundle": "The twig bundle to integrate the extension into Symfony"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.3.x-dev"
}
},
"autoload": {
"psr-4": {
"Ajgl\\Twig\\Extension\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Antonio J. García Lagar",
"email": "aj@garcialagar.es",
"homepage": "http://aj.garcialagar.es",
"role": "developer"
}
],
"description": "Twig extension to set breakpoints",
"homepage": "https://github.com/ajgarlag/AjglBreakpointTwigExtension",
"keywords": [
"Xdebug",
"breakpoint",
"twig"
],
"time": "2017-11-20T13:04:11+00:00"
},
{
"name": "aptoma/twig-markdown",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/aptoma/twig-markdown.git",
"reference": "64a9c5c7418c08faf91c4410b34bdb65fb25c23d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aptoma/twig-markdown/zipball/64a9c5c7418c08faf91c4410b34bdb65fb25c23d",
"reference": "64a9c5c7418c08faf91c4410b34bdb65fb25c23d",
"shasum": ""
},
"require": {
"twig/twig": "~1.12"
},
"require-dev": {
"codeclimate/php-test-reporter": "dev-master",
"erusev/parsedown": "^1.6",
"knplabs/github-api": "~1.2",
"league/commonmark": "~0.5",
"michelf/php-markdown": "~1",
"phpunit/phpunit": "~4.0",
"satooshi/php-coveralls": "~0.6"
},
"suggest": {
"knplabs/github-api": "Needed for using GitHub's Markdown engine provided through their API.",
"michelf/php-markdown": "Original Markdown engine with MarkdownExtra."
},
"type": "library",
"autoload": {
"psr-0": {
"Aptoma": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Joris Berthelot",
"email": "joris@berthelot.tel"
},
{
"name": "Gunnar Lium",
"email": "gunnar@aptoma.com"
}
],
"description": "Twig extension to work with Markdown content",
"keywords": [
"markdown",
"twig"
],
"time": "2015-10-23T20:27:08+00:00"
},
{
"name": "asm89/twig-cache-extension",
"version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/asm89/twig-cache-extension.git",
"reference": "630ea7abdc3fc62ba6786c02590a1560e449cf55"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/asm89/twig-cache-extension/zipball/630ea7abdc3fc62ba6786c02590a1560e449cf55",
"reference": "630ea7abdc3fc62ba6786c02590a1560e449cf55",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"twig/twig": "^1.0|^2.0"
},
"require-dev": {
"doctrine/cache": "~1.0"
},
"suggest": {
"psr/cache-implementation": "To make use of PSR-6 cache implementation via PsrCacheAdapter."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
}
},
"autoload": {
"psr-4": {
"": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Alexander",
"email": "iam.asm89@gmail.com"
}
],
"description": "Cache fragments of templates directly within Twig.",
"homepage": "https://github.com/asm89/twig-cache-extension",
"keywords": [
"cache",
"extension",
"twig"
],
"time": "2017-01-10T22:04:15+00:00"
},
{
"name": "cakephp/bake", "name": "cakephp/bake",
"version": "1.4.4", "version": "1.6.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/cakephp/bake.git", "url": "https://github.com/cakephp/bake.git",
"reference": "1457d59df095db2d5aee2f280eb576970f932194" "reference": "0ca2165ac770f8e3c7b278f3f022df14d7b0913a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/cakephp/bake/zipball/1457d59df095db2d5aee2f280eb576970f932194", "url": "https://api.github.com/repos/cakephp/bake/zipball/0ca2165ac770f8e3c7b278f3f022df14d7b0913a",
"reference": "1457d59df095db2d5aee2f280eb576970f932194", "reference": "0ca2165ac770f8e3c7b278f3f022df14d7b0913a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"cakephp/cakephp": ">=3.5.0,<4.0.0", "cakephp/cakephp": "^3.5.10",
"cakephp/plugin-installer": "~1.0", "cakephp/plugin-installer": "^1.0",
"php": ">=5.6.0" "php": ">=5.6.0",
"wyrihaximus/twig-view": "^4.2.1"
}, },
"require-dev": { "require-dev": {
"cakephp/cakephp-codesniffer": "^3.0", "cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "~5.7 | ~6.0" "phpunit/phpunit": "^5.7 | ^6.0"
}, },
"type": "cakephp-plugin", "type": "cakephp-plugin",
"autoload": { "autoload": {
...@@ -1208,20 +1801,20 @@ ...@@ -1208,20 +1801,20 @@
"bake", "bake",
"cakephp" "cakephp"
], ],
"time": "2017-10-14T20:01:15+00:00" "time": "2018-03-10T01:47:21+00:00"
}, },
{ {
"name": "cakephp/cakephp-codesniffer", "name": "cakephp/cakephp-codesniffer",
"version": "3.0.1", "version": "3.0.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/cakephp/cakephp-codesniffer.git", "url": "https://github.com/cakephp/cakephp-codesniffer.git",
"reference": "2c7b5724d2221d509e4cb060952838d0612d0063" "reference": "d77ac81199f2f1e5a8d8ebf96a5d6d7cd4e0542b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/2c7b5724d2221d509e4cb060952838d0612d0063", "url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/d77ac81199f2f1e5a8d8ebf96a5d6d7cd4e0542b",
"reference": "2c7b5724d2221d509e4cb060952838d0612d0063", "reference": "d77ac81199f2f1e5a8d8ebf96a5d6d7cd4e0542b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1253,20 +1846,20 @@ ...@@ -1253,20 +1846,20 @@
"codesniffer", "codesniffer",
"framework" "framework"
], ],
"time": "2017-07-28T01:42:31+00:00" "time": "2017-12-21T20:01:35+00:00"
}, },
{ {
"name": "cakephp/debug_kit", "name": "cakephp/debug_kit",
"version": "3.11.1", "version": "3.14.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/cakephp/debug_kit.git", "url": "https://github.com/cakephp/debug_kit.git",
"reference": "c36fdac8c5fd427b06dd7d8b2d01cb90a92dfd4c" "reference": "b5e11f386b9ff28694950f68ef3e0456c242051b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/cakephp/debug_kit/zipball/c36fdac8c5fd427b06dd7d8b2d01cb90a92dfd4c", "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/b5e11f386b9ff28694950f68ef3e0456c242051b",
"reference": "c36fdac8c5fd427b06dd7d8b2d01cb90a92dfd4c", "reference": "b5e11f386b9ff28694950f68ef3e0456c242051b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1313,20 +1906,20 @@ ...@@ -1313,20 +1906,20 @@
"debug", "debug",
"kit" "kit"
], ],
"time": "2017-08-29T07:49:35+00:00" "time": "2018-03-08T18:21:10+00:00"
}, },
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
"version": "1.0.8", "version": "1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/ca-bundle.git", "url": "https://github.com/composer/ca-bundle.git",
"reference": "9dd73a03951357922d8aee6cc084500de93e2343" "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/9dd73a03951357922d8aee6cc084500de93e2343", "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169",
"reference": "9dd73a03951357922d8aee6cc084500de93e2343", "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1335,12 +1928,9 @@ ...@@ -1335,12 +1928,9 @@
"php": "^5.3.2 || ^7.0" "php": "^5.3.2 || ^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.5", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
"psr/log": "^1.0", "psr/log": "^1.0",
"symfony/process": "^2.5 || ^3.0" "symfony/process": "^2.5 || ^3.0 || ^4.0"
},
"suggest": {
"symfony/process": "This is necessary to reliably check whether openssl_x509_parse is vulnerable on older php versions, but can be ignored on PHP 5.5.6+"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
...@@ -1372,39 +1962,42 @@ ...@@ -1372,39 +1962,42 @@
"ssl", "ssl",
"tls" "tls"
], ],
"time": "2017-09-11T07:24:36+00:00" "time": "2018-03-29T19:57:20+00:00"
}, },
{ {
"name": "composer/composer", "name": "composer/composer",
"version": "1.5.2", "version": "1.6.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/composer.git", "url": "https://github.com/composer/composer.git",
"reference": "c639623fa2178b404ed4bab80f0d1263853fa4ae" "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/c639623fa2178b404ed4bab80f0d1263853fa4ae", "url": "https://api.github.com/repos/composer/composer/zipball/b184a92419cc9a9c4c6a09db555a94d441cb11c9",
"reference": "c639623fa2178b404ed4bab80f0d1263853fa4ae", "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/ca-bundle": "^1.0", "composer/ca-bundle": "^1.0",
"composer/semver": "^1.0", "composer/semver": "^1.0",
"composer/spdx-licenses": "^1.0", "composer/spdx-licenses": "^1.2",
"justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
"php": "^5.3.2 || ^7.0", "php": "^5.3.2 || ^7.0",
"psr/log": "^1.0", "psr/log": "^1.0",
"seld/cli-prompt": "^1.0", "seld/cli-prompt": "^1.0",
"seld/jsonlint": "^1.4", "seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.0", "seld/phar-utils": "^1.0",
"symfony/console": "^2.7 || ^3.0", "symfony/console": "^2.7 || ^3.0 || ^4.0",
"symfony/filesystem": "^2.7 || ^3.0", "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
"symfony/finder": "^2.7 || ^3.0", "symfony/finder": "^2.7 || ^3.0 || ^4.0",
"symfony/process": "^2.7 || ^3.0" "symfony/process": "^2.7 || ^3.0 || ^4.0"
},
"conflict": {
"symfony/console": "2.8.38"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5", "phpunit/phpunit": "^4.8.35 || ^5.7",
"phpunit/phpunit-mock-objects": "^2.3 || ^3.0" "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
}, },
"suggest": { "suggest": {
...@@ -1418,7 +2011,7 @@ ...@@ -1418,7 +2011,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.5-dev" "dev-master": "1.6-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -1449,7 +2042,7 @@ ...@@ -1449,7 +2042,7 @@
"dependency", "dependency",
"package" "package"
], ],
"time": "2017-09-11T14:59:26+00:00" "time": "2018-05-04T09:44:59+00:00"
}, },
{ {
"name": "composer/semver", "name": "composer/semver",
...@@ -1515,23 +2108,23 @@ ...@@ -1515,23 +2108,23 @@
}, },
{ {
"name": "composer/spdx-licenses", "name": "composer/spdx-licenses",
"version": "1.1.6", "version": "1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/spdx-licenses.git", "url": "https://github.com/composer/spdx-licenses.git",
"reference": "2603a0d7ddc00a015deb576fa5297ca43dee6b1c" "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/2603a0d7ddc00a015deb576fa5297ca43dee6b1c", "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b",
"reference": "2603a0d7ddc00a015deb576fa5297ca43dee6b1c", "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3.2 || ^7.0" "php": "^5.3.2 || ^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
"phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
}, },
"type": "library", "type": "library",
...@@ -1572,7 +2165,7 @@ ...@@ -1572,7 +2165,7 @@
"spdx", "spdx",
"validator" "validator"
], ],
"time": "2017-04-03T19:08:52+00:00" "time": "2018-04-30T10:33:04+00:00"
}, },
{ {
"name": "dnoegel/php-xdg-base-dir", "name": "dnoegel/php-xdg-base-dir",
...@@ -1695,6 +2288,66 @@ ...@@ -1695,6 +2288,66 @@
"time": "2015-04-20T18:58:01+00:00" "time": "2015-04-20T18:58:01+00:00"
}, },
{ {
"name": "jasny/twig-extensions",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/jasny/twig-extensions.git",
"reference": "30bdf3a3903c021544f36332c9d5d4d563527da4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jasny/twig-extensions/zipball/30bdf3a3903c021544f36332c9d5d4d563527da4",
"reference": "30bdf3a3903c021544f36332c9d5d4d563527da4",
"shasum": ""
},
"require": {
"php": ">=7.0.0 | >=5.6.0",
"twig/twig": "^2.0 | ^1.12"
},
"require-dev": {
"ext-intl": "*",
"ext-pcre": "*",
"jasny/php-code-quality": "^2.1",
"phpunit/phpunit": "^5.0"
},
"suggest": {
"ext-intl": "Required for the use of the LocalDate Twig extension",
"ext-pcre": "Required for the use of the PCRE Twig extension"
},
"type": "library",
"autoload": {
"psr-4": {
"Jasny\\Twig\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Arnold Daniels",
"email": "arnold@jasny.net",
"homepage": "http://www.jasny.net"
}
],
"description": "A set of useful Twig filters",
"homepage": "http://github.com/jasny/twig-extensions#README",
"keywords": [
"PCRE",
"array",
"date",
"datetime",
"preg",
"regex",
"templating",
"text",
"time"
],
"time": "2017-09-13T07:38:01+00:00"
},
{
"name": "jdorn/sql-formatter", "name": "jdorn/sql-formatter",
"version": "v1.2.17", "version": "v1.2.17",
"source": { "source": {
...@@ -1746,16 +2399,16 @@ ...@@ -1746,16 +2399,16 @@
}, },
{ {
"name": "justinrainbow/json-schema", "name": "justinrainbow/json-schema",
"version": "5.2.5", "version": "5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/justinrainbow/json-schema.git", "url": "https://github.com/justinrainbow/json-schema.git",
"reference": "0d4fda8efdf216ade084a7f0aad5637572ce9835" "reference": "8560d4314577199ba51bf2032f02cd1315587c23"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/0d4fda8efdf216ade084a7f0aad5637572ce9835", "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23",
"reference": "0d4fda8efdf216ade084a7f0aad5637572ce9835", "reference": "8560d4314577199ba51bf2032f02cd1315587c23",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1764,7 +2417,7 @@ ...@@ -1764,7 +2417,7 @@
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^2.1", "friendsofphp/php-cs-fixer": "^2.1",
"json-schema/json-schema-test-suite": "1.2.0", "json-schema/json-schema-test-suite": "1.2.0",
"phpunit/phpunit": "^4.8.22" "phpunit/phpunit": "^4.8.35"
}, },
"bin": [ "bin": [
"bin/validate-json" "bin/validate-json"
...@@ -1808,20 +2461,20 @@ ...@@ -1808,20 +2461,20 @@
"json", "json",
"schema" "schema"
], ],
"time": "2017-10-10T13:22:37+00:00" "time": "2018-02-14T22:26:30+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v3.1.1", "version": "v3.1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "a1e8e1a30e1352f118feff1a8481066ddc2f234a" "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a1e8e1a30e1352f118feff1a8481066ddc2f234a", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
"reference": "a1e8e1a30e1352f118feff1a8481066ddc2f234a", "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1859,35 +2512,34 @@ ...@@ -1859,35 +2512,34 @@
"parser", "parser",
"php" "php"
], ],
"time": "2017-09-02T17:10:46+00:00" "time": "2018-02-28T20:30:58+00:00"
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.8.12", "version": "v0.9.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "1502354ebc70d59d8e3a87c325b0eb78a79da25b" "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/1502354ebc70d59d8e3a87c325b0eb78a79da25b", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
"reference": "1502354ebc70d59d8e3a87c325b0eb78a79da25b", "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"dnoegel/php-xdg-base-dir": "0.1", "dnoegel/php-xdg-base-dir": "0.1",
"jakub-onderka/php-console-highlighter": "0.3.*", "jakub-onderka/php-console-highlighter": "0.3.*",
"nikic/php-parser": "~1.3|~2.0|~3.0", "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
"php": ">=5.3.9", "php": ">=5.4.0",
"symfony/console": "~2.3.10|^2.4.2|~3.0", "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
"symfony/var-dumper": "~2.7|~3.0" "symfony/var-dumper": "~2.7|~3.0|~4.0"
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "~1.11", "hoa/console": "~2.15|~3.16",
"hoa/console": "~3.16|~1.14", "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
"phpunit/phpunit": "~4.4|~5.0", "symfony/finder": "~2.1|~3.0|~4.0"
"symfony/finder": "~2.1|~3.0"
}, },
"suggest": { "suggest": {
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
...@@ -1902,15 +2554,15 @@ ...@@ -1902,15 +2554,15 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-develop": "0.8.x-dev" "dev-develop": "0.9.x-dev"
} }
}, },
"autoload": { "autoload": {
"files": [ "files": [
"src/Psy/functions.php" "src/functions.php"
], ],
"psr-4": { "psr-4": {
"Psy\\": "src/Psy/" "Psy\\": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -1932,7 +2584,7 @@ ...@@ -1932,7 +2584,7 @@
"interactive", "interactive",
"shell" "shell"
], ],
"time": "2017-10-14T17:14:13+00:00" "time": "2018-04-18T12:32:50+00:00"
}, },
{ {
"name": "seld/cli-prompt", "name": "seld/cli-prompt",
...@@ -1984,23 +2636,23 @@ ...@@ -1984,23 +2636,23 @@
}, },
{ {
"name": "seld/jsonlint", "name": "seld/jsonlint",
"version": "1.6.1", "version": "1.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/jsonlint.git", "url": "https://github.com/Seldaek/jsonlint.git",
"reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77" "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77", "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
"reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77", "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3 || ^7.0" "php": "^5.3 || ^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.5" "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
}, },
"bin": [ "bin": [
"bin/jsonlint" "bin/jsonlint"
...@@ -2029,7 +2681,7 @@ ...@@ -2029,7 +2681,7 @@
"parser", "parser",
"validator" "validator"
], ],
"time": "2017-06-18T15:11:04+00:00" "time": "2018-01-24T12:46:19+00:00"
}, },
{ {
"name": "seld/phar-utils", "name": "seld/phar-utils",
...@@ -2077,16 +2729,16 @@ ...@@ -2077,16 +2729,16 @@
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
"version": "3.1.0", "version": "3.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "3c2d0a0fe39684ba0c1eb842a6a775d0b938d699" "reference": "4842476c434e375f9d3182ff7b89059583aa8b27"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/3c2d0a0fe39684ba0c1eb842a6a775d0b938d699", "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4842476c434e375f9d3182ff7b89059583aa8b27",
"reference": "3c2d0a0fe39684ba0c1eb842a6a775d0b938d699", "reference": "4842476c434e375f9d3182ff7b89059583aa8b27",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2096,7 +2748,7 @@ ...@@ -2096,7 +2748,7 @@
"php": ">=5.4.0" "php": ">=5.4.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0" "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
}, },
"bin": [ "bin": [
"bin/phpcs", "bin/phpcs",
...@@ -2124,20 +2776,20 @@ ...@@ -2124,20 +2776,20 @@
"phpcs", "phpcs",
"standards" "standards"
], ],
"time": "2017-09-19T22:47:14+00:00" "time": "2018-02-20T21:35:23+00:00"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v3.3.10", "version": "v3.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "773e19a491d97926f236942484cb541560ce862d" "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/773e19a491d97926f236942484cb541560ce862d", "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433",
"reference": "773e19a491d97926f236942484cb541560ce862d", "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2146,7 +2798,7 @@ ...@@ -2146,7 +2798,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2173,20 +2825,20 @@ ...@@ -2173,20 +2825,20 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-10-02T06:42:24+00:00" "time": "2018-04-04T05:07:11+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v3.3.10", "version": "v3.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "fdf89e57a723a29baf536e288d6e232c059697b1" "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/fdf89e57a723a29baf536e288d6e232c059697b1", "url": "https://api.github.com/repos/symfony/process/zipball/4b7d64e852886319e93ddfdecff0d744ab87658b",
"reference": "fdf89e57a723a29baf536e288d6e232c059697b1", "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2195,7 +2847,7 @@ ...@@ -2195,7 +2847,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2222,20 +2874,20 @@ ...@@ -2222,20 +2874,20 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-10-02T06:42:24+00:00" "time": "2018-04-03T05:22:50+00:00"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v3.3.10", "version": "v3.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "03e3693a36701f1c581dd24a6d6eea2eba2113f6" "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/03e3693a36701f1c581dd24a6d6eea2eba2113f6", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e6545672d8c9ce70dd472adc2f8b03155a46f73",
"reference": "03e3693a36701f1c581dd24a6d6eea2eba2113f6", "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2251,12 +2903,13 @@ ...@@ -2251,12 +2903,13 @@
}, },
"suggest": { "suggest": {
"ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
"ext-intl": "To show region name in time zone dump",
"ext-symfony_debug": "" "ext-symfony_debug": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2290,12 +2943,177 @@ ...@@ -2290,12 +2943,177 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2017-10-02T06:42:24+00:00" "time": "2018-04-26T12:42:15+00:00"
},
{
"name": "twig/twig",
"version": "v1.35.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
"reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"psr/container": "^1.0",
"symfony/debug": "^2.7",
"symfony/phpunit-bridge": "^3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.35-dev"
}
},
"autoload": {
"psr-0": {
"Twig_": "lib/"
},
"psr-4": {
"Twig\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Armin Ronacher",
"email": "armin.ronacher@active-4.com",
"role": "Project Founder"
},
{
"name": "Twig Team",
"homepage": "http://twig.sensiolabs.org/contributors",
"role": "Contributors"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
"homepage": "http://twig.sensiolabs.org",
"keywords": [
"templating"
],
"time": "2018-03-20T04:25:58+00:00"
},
{
"name": "umpirsky/twig-php-function",
"version": "v0.1",
"source": {
"type": "git",
"url": "https://github.com/umpirsky/twig-php-function.git",
"reference": "53b4b1eb0c5eacbd7d66c504b7d809c79b4bedbc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/umpirsky/twig-php-function/zipball/53b4b1eb0c5eacbd7d66c504b7d809c79b4bedbc",
"reference": "53b4b1eb0c5eacbd7d66c504b7d809c79b4bedbc",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"twig/twig": "~1.12"
},
"require-dev": {
"phpspec/phpspec": "~2.0",
"phpunit/phpunit": "~4.4"
},
"type": "library",
"autoload": {
"psr-0": {
"Umpirsky\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Saša Stamenković",
"email": "umpirsky@gmail.com"
}
],
"description": "Call (almost) any PHP function from your Twig templates.",
"time": "2016-03-12T16:36:32+00:00"
},
{
"name": "wyrihaximus/twig-view",
"version": "4.3.4",
"source": {
"type": "git",
"url": "https://github.com/WyriHaximus/TwigView.git",
"reference": "95977a9e22745fa8a5226a7be5850c6ca2e3ebe3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/95977a9e22745fa8a5226a7be5850c6ca2e3ebe3",
"reference": "95977a9e22745fa8a5226a7be5850c6ca2e3ebe3",
"shasum": ""
},
"require": {
"ajgl/breakpoint-twig-extension": "^0.3.0",
"aptoma/twig-markdown": "^2.0",
"asm89/twig-cache-extension": "^1.0",
"cakephp/cakephp": "^3.5",
"jasny/twig-extensions": "^1.0",
"php": "^5.6 || ^7.0",
"twig/twig": "^1.27",
"umpirsky/twig-php-function": "0.1"
},
"require-dev": {
"cakephp/bake": "^1.5",
"cakephp/debug_kit": "^3.0",
"phake/phake": "^1.0.4",
"phpunit/phpunit": "^5.7.14",
"squizlabs/php_codesniffer": "^1.5.6",
"wyrihaximus/phpunit-class-reflection-helpers": "dev-master"
},
"type": "cakephp-plugin",
"autoload": {
"psr-4": {
"WyriHaximus\\TwigView\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Cees-Jan Kiewiet",
"email": "ceesjank@gmail.com",
"homepage": "http://wyrihaximus.net/"
}
],
"description": "Twig powered View for CakePHP3",
"keywords": [
"cakephp",
"cakephp3",
"twig",
"view"
],
"time": "2018-04-16T20:29:21+00:00"
} }
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"muffin/oauth2": 20,
"psy/psysh": 0 "psy/psysh": 0
}, },
"prefer-stable": true, "prefer-stable": true,
......
...@@ -103,13 +103,13 @@ class ProfilesController extends AppController ...@@ -103,13 +103,13 @@ class ProfilesController extends AppController
$userPersonals['master_province_id'] = $this->request->data['master_province_id']; $userPersonals['master_province_id'] = $this->request->data['master_province_id'];
$userPersonals['modified_by'] = $id; $userPersonals['modified_by'] = $id;
if ($this->UserPersonals->save($userPersonals)) { if ($this->UserPersonals->save($userPersonals)) {
$this->Flash->success(__('Update Complete.')); $this->Flash->success(__('Update Complete.'));
return $this->redirect(['action' => 'index']); return $this->redirect(['action' => 'index']);
}
}else{
$this->Flash->error(__('Email Address already used by others.'));
} }
}else{
$this->Flash->error(__('Email Address already used by others.'));
}
$this->Flash->error(__('Not update. Please, try again.')); $this->Flash->error(__('Not update. Please, try again.'));
} }
$this->set(compact('userPersonals', 'responseUserProfile', 'dateNow', 'username', 'Country', 'Province', 'responseUserPersonal')); $this->set(compact('userPersonals', 'responseUserProfile', 'dateNow', 'username', 'Country', 'Province', 'responseUserPersonal'));
......
...@@ -176,21 +176,74 @@ use Cake\I18n\Time; ...@@ -176,21 +176,74 @@ use Cake\I18n\Time;
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel" aria-hidden="true"> <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class=""> <div class="col-md-6">
<div class=""> <div class = "">
<div class="col-md-6"> <div class="owl-carousel owl-theme" data-plugin-options="{'items': 1, 'margin': 10}">
<div class="owl-carousel owl-theme" data-plugin-options="{'items': 1, 'margin': 10}"> <div class = "row rotate270 form_1">
<div> <?php echo $this->Html->image('/img/core/img/card-bg-front@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => 'position: absolute;')); ?>
<?php echo $this->Html->image('/img/core/img/card-bg-front@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => 'position: absolute;')); ?> <div class="row date-name">
<div class="idcard-profile"><?php echo __('ID Card');?></div> <div class="col-xs-1">
</div> </div>
<div> <div class="col-xs-6">
<?php echo $this->Html->image('/img/core/img/card-bg-back@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => '3position: absolute;')); ?> <div style="font-size: 17px">
</div> <br>
</div> <label>id<label>
</div> </div>
</div> <div>
</div> <?php echo $value['card_code'] ?>
</div>
<div>
<label style="font-size: 17px">ชื่อ</label> <?php echo $value['prefix_name_th'].$value['firstname_th'].' '.$value['lastname_th'] ?>
</div>
</div>
<div class="col-xs-4">
<div data-toggle="modal" data-target="#defaultModal" style="text-align: center; cursor: pointer;">
<img src="/img/core/img/user-profile@3x.png" class="img-responsive">
</div>
</div>
</div>
<div class="row date-position">
<div class="col-xs-1">
</div>
<div class="col-xs-10">
<label style="font-size: 17px">ตำแหน่ง</label> <?php echo $value['position_name'] ?>
</div>
</div>
<div class="row date-time">
<div class="col-xs-1">
</div>
<div class="col-xs-5">
<?php
$now = new Time($value['date_issued']);
$dateIssued = $now->i18nFormat('yyyy-MM-dd');
echo $this->DateFormat->formatDateThai($dateIssued);
?>
</div>
<div class="col-xs-5">
<?php
$now = new Time($value['date_expiry']);
$dateExpiry = $now->i18nFormat('yyyy-MM-dd');
echo $this->DateFormat->formatDateThai($dateExpiry);
?>
</div>
</div>
<div class="row date-label">
<div class="col-xs-1">
</div>
<div class="col-xs-5">
<label style="font-size: 17px">วันออกบัตร</label>
</div>
<div class="col-xs-5">
<label style="font-size: 17px">วันหมดออายุ</label>
</div>
</div>
<div>
<?php echo $this->Html->image('/img/core/img/card-bg-back@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => '3position: absolute;')); ?>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -212,6 +265,33 @@ use Cake\I18n\Time; ...@@ -212,6 +265,33 @@ use Cake\I18n\Time;
cursor: pointer; cursor: pointer;
} }
.rotate270 .row{
-webkit-transform: rotate(270deg);
-moz-transform: rotate(270deg);
-o-transform: rotate(270deg);
writing-mode: rl-tb;
position: absolute;
}
.form_1 .date-name{
width: 150px;
margin: 100% 0% 0% 62%;
}
.form_1 .date-position{
width: 150px;
margin: 100% 0% 0% 62%;
}
.form_1 .date-time{
width: 150px;
margin: 100% 0% 0% 62%;
}
.form_1 .date-label{
width: 150px;
margin: 100% 0% 0% 62%;
}
</style> </style>
<?php $this->append('scriptBottom'); ?> <?php $this->append('scriptBottom'); ?>
<script type="text/javascript"> <script type="text/javascript">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment