Commit e7a07da057f764fc5a8ea87b5c32a955613039b5

Authored by Alexandre
1 parent 98a57307

bugfixes

@@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
9 "cakephp/cakephp": "~3.2", 9 "cakephp/cakephp": "~3.2",
10 "mobiledetect/mobiledetectlib": "2.*", 10 "mobiledetect/mobiledetectlib": "2.*",
11 "cakephp/migrations": "~1.0", 11 "cakephp/migrations": "~1.0",
12 - "cakephp/plugin-installer": "*" 12 + "cakephp/plugin-installer": "*",
  13 + "cakephp/debug_kit": "^3.2"
13 }, 14 },
14 "require-dev": { 15 "require-dev": {
15 "psy/psysh": "@stable", 16 "psy/psysh": "@stable",
16 - "cakephp/debug_kit": "~3.2",  
17 "cakephp/bake": "~1.1", 17 "cakephp/bake": "~1.1",
18 "phpunit/phpunit": "^5.4" 18 "phpunit/phpunit": "^5.4"
19 }, 19 },
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 - "hash": "aef5585f9776801a72ca573c087b7c16",  
8 - "content-hash": "5f27152304efe10cd810a5fc50b38190", 7 + "hash": "b0a7d4bb5f528a8b0c3c980d12331801",
  8 + "content-hash": "e18ab33700660d17dc07c622b65c8d4d",
9 "packages": [ 9 "packages": [
10 { 10 {
11 "name": "aura/installer-default", 11 "name": "aura/installer-default",
@@ -254,6 +254,62 @@ @@ -254,6 +254,62 @@
254 "time": "2016-06-15 06:26:37" 254 "time": "2016-06-15 06:26:37"
255 }, 255 },
256 { 256 {
  257 + "name": "cakephp/debug_kit",
  258 + "version": "3.2.9",
  259 + "source": {
  260 + "type": "git",
  261 + "url": "https://github.com/cakephp/debug_kit.git",
  262 + "reference": "5c351136576b05a386eb2bbb02267529123edf7b"
  263 + },
  264 + "dist": {
  265 + "type": "zip",
  266 + "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/5c351136576b05a386eb2bbb02267529123edf7b",
  267 + "reference": "5c351136576b05a386eb2bbb02267529123edf7b",
  268 + "shasum": ""
  269 + },
  270 + "require": {
  271 + "cakephp/cakephp": ">=3.1.0 <4.0",
  272 + "jdorn/sql-formatter": "~1.2"
  273 + },
  274 + "require-dev": {
  275 + "cakephp/cakephp-codesniffer": "dev-master",
  276 + "phpunit/phpunit": "4.1.*"
  277 + },
  278 + "suggest": {
  279 + "ext-sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."
  280 + },
  281 + "type": "cakephp-plugin",
  282 + "autoload": {
  283 + "psr-4": {
  284 + "DebugKit\\": "src",
  285 + "DebugKit\\Test\\Fixture\\": "tests\\Fixture"
  286 + }
  287 + },
  288 + "notification-url": "https://packagist.org/downloads/",
  289 + "license": [
  290 + "MIT"
  291 + ],
  292 + "authors": [
  293 + {
  294 + "name": "Mark Story",
  295 + "homepage": "http://mark-story.com",
  296 + "role": "Author"
  297 + },
  298 + {
  299 + "name": "CakePHP Community",
  300 + "homepage": "https://github.com/cakephp/debug_kit/graphs/contributors"
  301 + }
  302 + ],
  303 + "description": "CakePHP Debug Kit",
  304 + "homepage": "https://github.com/cakephp/debug_kit",
  305 + "keywords": [
  306 + "cakephp",
  307 + "debug",
  308 + "kit"
  309 + ],
  310 + "time": "2016-05-28 15:47:46"
  311 + },
  312 + {
257 "name": "cakephp/migrations", 313 "name": "cakephp/migrations",
258 "version": "1.6.2", 314 "version": "1.6.2",
259 "source": { 315 "source": {
@@ -344,6 +400,56 @@ @@ -344,6 +400,56 @@
344 "time": "2016-04-28 03:01:34" 400 "time": "2016-04-28 03:01:34"
345 }, 401 },
346 { 402 {
  403 + "name": "jdorn/sql-formatter",
  404 + "version": "v1.2.17",
  405 + "source": {
  406 + "type": "git",
  407 + "url": "https://github.com/jdorn/sql-formatter.git",
  408 + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc"
  409 + },
  410 + "dist": {
  411 + "type": "zip",
  412 + "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc",
  413 + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc",
  414 + "shasum": ""
  415 + },
  416 + "require": {
  417 + "php": ">=5.2.4"
  418 + },
  419 + "require-dev": {
  420 + "phpunit/phpunit": "3.7.*"
  421 + },
  422 + "type": "library",
  423 + "extra": {
  424 + "branch-alias": {
  425 + "dev-master": "1.3.x-dev"
  426 + }
  427 + },
  428 + "autoload": {
  429 + "classmap": [
  430 + "lib"
  431 + ]
  432 + },
  433 + "notification-url": "https://packagist.org/downloads/",
  434 + "license": [
  435 + "MIT"
  436 + ],
  437 + "authors": [
  438 + {
  439 + "name": "Jeremy Dorn",
  440 + "email": "jeremy@jeremydorn.com",
  441 + "homepage": "http://jeremydorn.com/"
  442 + }
  443 + ],
  444 + "description": "a PHP SQL highlighting library",
  445 + "homepage": "https://github.com/jdorn/sql-formatter/",
  446 + "keywords": [
  447 + "highlight",
  448 + "sql"
  449 + ],
  450 + "time": "2014-01-12 16:20:24"
  451 + },
  452 + {
347 "name": "mobiledetect/mobiledetectlib", 453 "name": "mobiledetect/mobiledetectlib",
348 "version": "2.8.22", 454 "version": "2.8.22",
349 "source": { 455 "source": {
@@ -815,62 +921,6 @@ @@ -815,62 +921,6 @@
815 "time": "2016-06-28 01:58:30" 921 "time": "2016-06-28 01:58:30"
816 }, 922 },
817 { 923 {
818 - "name": "cakephp/debug_kit",  
819 - "version": "3.2.9",  
820 - "source": {  
821 - "type": "git",  
822 - "url": "https://github.com/cakephp/debug_kit.git",  
823 - "reference": "5c351136576b05a386eb2bbb02267529123edf7b"  
824 - },  
825 - "dist": {  
826 - "type": "zip",  
827 - "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/5c351136576b05a386eb2bbb02267529123edf7b",  
828 - "reference": "5c351136576b05a386eb2bbb02267529123edf7b",  
829 - "shasum": ""  
830 - },  
831 - "require": {  
832 - "cakephp/cakephp": ">=3.1.0 <4.0",  
833 - "jdorn/sql-formatter": "~1.2"  
834 - },  
835 - "require-dev": {  
836 - "cakephp/cakephp-codesniffer": "dev-master",  
837 - "phpunit/phpunit": "4.1.*"  
838 - },  
839 - "suggest": {  
840 - "ext-sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."  
841 - },  
842 - "type": "cakephp-plugin",  
843 - "autoload": {  
844 - "psr-4": {  
845 - "DebugKit\\": "src",  
846 - "DebugKit\\Test\\Fixture\\": "tests\\Fixture"  
847 - }  
848 - },  
849 - "notification-url": "https://packagist.org/downloads/",  
850 - "license": [  
851 - "MIT"  
852 - ],  
853 - "authors": [  
854 - {  
855 - "name": "Mark Story",  
856 - "homepage": "http://mark-story.com",  
857 - "role": "Author"  
858 - },  
859 - {  
860 - "name": "CakePHP Community",  
861 - "homepage": "https://github.com/cakephp/debug_kit/graphs/contributors"  
862 - }  
863 - ],  
864 - "description": "CakePHP Debug Kit",  
865 - "homepage": "https://github.com/cakephp/debug_kit",  
866 - "keywords": [  
867 - "cakephp",  
868 - "debug",  
869 - "kit"  
870 - ],  
871 - "time": "2016-05-28 15:47:46"  
872 - },  
873 - {  
874 "name": "dnoegel/php-xdg-base-dir", 924 "name": "dnoegel/php-xdg-base-dir",
875 "version": "0.1", 925 "version": "0.1",
876 "source": { 926 "source": {
@@ -1045,56 +1095,6 @@ @@ -1045,56 +1095,6 @@
1045 "time": "2015-04-20 18:58:01" 1095 "time": "2015-04-20 18:58:01"
1046 }, 1096 },
1047 { 1097 {
1048 - "name": "jdorn/sql-formatter",  
1049 - "version": "v1.2.17",  
1050 - "source": {  
1051 - "type": "git",  
1052 - "url": "https://github.com/jdorn/sql-formatter.git",  
1053 - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc"  
1054 - },  
1055 - "dist": {  
1056 - "type": "zip",  
1057 - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc",  
1058 - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc",  
1059 - "shasum": ""  
1060 - },  
1061 - "require": {  
1062 - "php": ">=5.2.4"  
1063 - },  
1064 - "require-dev": {  
1065 - "phpunit/phpunit": "3.7.*"  
1066 - },  
1067 - "type": "library",  
1068 - "extra": {  
1069 - "branch-alias": {  
1070 - "dev-master": "1.3.x-dev"  
1071 - }  
1072 - },  
1073 - "autoload": {  
1074 - "classmap": [  
1075 - "lib"  
1076 - ]  
1077 - },  
1078 - "notification-url": "https://packagist.org/downloads/",  
1079 - "license": [  
1080 - "MIT"  
1081 - ],  
1082 - "authors": [  
1083 - {  
1084 - "name": "Jeremy Dorn",  
1085 - "email": "jeremy@jeremydorn.com",  
1086 - "homepage": "http://jeremydorn.com/"  
1087 - }  
1088 - ],  
1089 - "description": "a PHP SQL highlighting library",  
1090 - "homepage": "https://github.com/jdorn/sql-formatter/",  
1091 - "keywords": [  
1092 - "highlight",  
1093 - "sql"  
1094 - ],  
1095 - "time": "2014-01-12 16:20:24"  
1096 - },  
1097 - {  
1098 "name": "myclabs/deep-copy", 1098 "name": "myclabs/deep-copy",
1099 "version": "1.5.1", 1099 "version": "1.5.1",
1100 "source": { 1100 "source": {
config/bootstrap.php
@@ -220,4 +220,3 @@ Type::build(&#39;date&#39;) @@ -220,4 +220,3 @@ Type::build(&#39;date&#39;)
220 Type::build('datetime') 220 Type::build('datetime')
221 ->useImmutable() 221 ->useImmutable()
222 ->useLocaleParser(); 222 ->useLocaleParser();
223 -  
src/Controller/AppController.php
@@ -137,7 +137,7 @@ class AppController extends Controller @@ -137,7 +137,7 @@ class AppController extends Controller
137 $this->LdapAuth->allow(['display']); 137 $this->LdapAuth->allow(['display']);
138 } 138 }
139 139
140 - $this->LdapAuth->config('authError', "Dรฉsolรฉ, vous n'รชtes pas autorisรฉs ร  accรฉder ร  cette zone."); 140 + $this->LdapAuth->config('authError', "Dรฉsolรฉ, vous n'รชtes pas autorisรฉ ร  accรฉder ร  cette zone.");
141 } 141 }
142 142
143 public function afterFilter(Event $event) 143 public function afterFilter(Event $event)
@@ -380,8 +380,7 @@ class AppController extends Controller @@ -380,8 +380,7 @@ class AppController extends Controller
380 } 380 }
381 381
382 } 382 }
383 -  
384 - 383 +
385 } 384 }
386 385
387 386
vendor/cakephp-plugins.php
@@ -6,4 +6,4 @@ return [ @@ -6,4 +6,4 @@ return [
6 'DebugKit' => $baseDir . '/vendor/cakephp/debug_kit/', 6 'DebugKit' => $baseDir . '/vendor/cakephp/debug_kit/',
7 'Migrations' => $baseDir . '/vendor/cakephp/migrations/' 7 'Migrations' => $baseDir . '/vendor/cakephp/migrations/'
8 ] 8 ]
9 -]; 9 -];
  10 +];
10 \ No newline at end of file 11 \ No newline at end of file
vendor/composer/installed.json
@@ -363,58 +363,6 @@ @@ -363,58 +363,6 @@
363 ] 363 ]
364 }, 364 },
365 { 365 {
366 - "name": "jdorn/sql-formatter",  
367 - "version": "v1.2.17",  
368 - "version_normalized": "1.2.17.0",  
369 - "source": {  
370 - "type": "git",  
371 - "url": "https://github.com/jdorn/sql-formatter.git",  
372 - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc"  
373 - },  
374 - "dist": {  
375 - "type": "zip",  
376 - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc",  
377 - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc",  
378 - "shasum": ""  
379 - },  
380 - "require": {  
381 - "php": ">=5.2.4"  
382 - },  
383 - "require-dev": {  
384 - "phpunit/phpunit": "3.7.*"  
385 - },  
386 - "time": "2014-01-12 16:20:24",  
387 - "type": "library",  
388 - "extra": {  
389 - "branch-alias": {  
390 - "dev-master": "1.3.x-dev"  
391 - }  
392 - },  
393 - "installation-source": "dist",  
394 - "autoload": {  
395 - "classmap": [  
396 - "lib"  
397 - ]  
398 - },  
399 - "notification-url": "https://packagist.org/downloads/",  
400 - "license": [  
401 - "MIT"  
402 - ],  
403 - "authors": [  
404 - {  
405 - "name": "Jeremy Dorn",  
406 - "email": "jeremy@jeremydorn.com",  
407 - "homepage": "http://jeremydorn.com/"  
408 - }  
409 - ],  
410 - "description": "a PHP SQL highlighting library",  
411 - "homepage": "https://github.com/jdorn/sql-formatter/",  
412 - "keywords": [  
413 - "highlight",  
414 - "sql"  
415 - ]  
416 - },  
417 - {  
418 "name": "myclabs/deep-copy", 366 "name": "myclabs/deep-copy",
419 "version": "1.5.1", 367 "version": "1.5.1",
420 "version_normalized": "1.5.1.0", 368 "version_normalized": "1.5.1.0",
@@ -2019,64 +1967,6 @@ @@ -2019,64 +1967,6 @@
2019 ] 1967 ]
2020 }, 1968 },
2021 { 1969 {
2022 - "name": "cakephp/debug_kit",  
2023 - "version": "3.2.9",  
2024 - "version_normalized": "3.2.9.0",  
2025 - "source": {  
2026 - "type": "git",  
2027 - "url": "https://github.com/cakephp/debug_kit.git",  
2028 - "reference": "5c351136576b05a386eb2bbb02267529123edf7b"  
2029 - },  
2030 - "dist": {  
2031 - "type": "zip",  
2032 - "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/5c351136576b05a386eb2bbb02267529123edf7b",  
2033 - "reference": "5c351136576b05a386eb2bbb02267529123edf7b",  
2034 - "shasum": ""  
2035 - },  
2036 - "require": {  
2037 - "cakephp/cakephp": ">=3.1.0 <4.0",  
2038 - "jdorn/sql-formatter": "~1.2"  
2039 - },  
2040 - "require-dev": {  
2041 - "cakephp/cakephp-codesniffer": "dev-master",  
2042 - "phpunit/phpunit": "4.1.*"  
2043 - },  
2044 - "suggest": {  
2045 - "ext-sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."  
2046 - },  
2047 - "time": "2016-05-28 15:47:46",  
2048 - "type": "cakephp-plugin",  
2049 - "installation-source": "dist",  
2050 - "autoload": {  
2051 - "psr-4": {  
2052 - "DebugKit\\": "src",  
2053 - "DebugKit\\Test\\Fixture\\": "tests\\Fixture"  
2054 - }  
2055 - },  
2056 - "notification-url": "https://packagist.org/downloads/",  
2057 - "license": [  
2058 - "MIT"  
2059 - ],  
2060 - "authors": [  
2061 - {  
2062 - "name": "Mark Story",  
2063 - "homepage": "http://mark-story.com",  
2064 - "role": "Author"  
2065 - },  
2066 - {  
2067 - "name": "CakePHP Community",  
2068 - "homepage": "https://github.com/cakephp/debug_kit/graphs/contributors"  
2069 - }  
2070 - ],  
2071 - "description": "CakePHP Debug Kit",  
2072 - "homepage": "https://github.com/cakephp/debug_kit",  
2073 - "keywords": [  
2074 - "cakephp",  
2075 - "debug",  
2076 - "kit"  
2077 - ]  
2078 - },  
2079 - {  
2080 "name": "cakephp/bake", 1970 "name": "cakephp/bake",
2081 "version": "1.2.5", 1971 "version": "1.2.5",
2082 "version_normalized": "1.2.5.0", 1972 "version_normalized": "1.2.5.0",
@@ -2556,5 +2446,115 @@ @@ -2556,5 +2446,115 @@
2556 "debug", 2446 "debug",
2557 "dump" 2447 "dump"
2558 ] 2448 ]
  2449 + },
  2450 + {
  2451 + "name": "jdorn/sql-formatter",
  2452 + "version": "v1.2.17",
  2453 + "version_normalized": "1.2.17.0",
  2454 + "source": {
  2455 + "type": "git",
  2456 + "url": "https://github.com/jdorn/sql-formatter.git",
  2457 + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc"
  2458 + },
  2459 + "dist": {
  2460 + "type": "zip",
  2461 + "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc",
  2462 + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc",
  2463 + "shasum": ""
  2464 + },
  2465 + "require": {
  2466 + "php": ">=5.2.4"
  2467 + },
  2468 + "require-dev": {
  2469 + "phpunit/phpunit": "3.7.*"
  2470 + },
  2471 + "time": "2014-01-12 16:20:24",
  2472 + "type": "library",
  2473 + "extra": {
  2474 + "branch-alias": {
  2475 + "dev-master": "1.3.x-dev"
  2476 + }
  2477 + },
  2478 + "installation-source": "dist",
  2479 + "autoload": {
  2480 + "classmap": [
  2481 + "lib"
  2482 + ]
  2483 + },
  2484 + "notification-url": "https://packagist.org/downloads/",
  2485 + "license": [
  2486 + "MIT"
  2487 + ],
  2488 + "authors": [
  2489 + {
  2490 + "name": "Jeremy Dorn",
  2491 + "email": "jeremy@jeremydorn.com",
  2492 + "homepage": "http://jeremydorn.com/"
  2493 + }
  2494 + ],
  2495 + "description": "a PHP SQL highlighting library",
  2496 + "homepage": "https://github.com/jdorn/sql-formatter/",
  2497 + "keywords": [
  2498 + "highlight",
  2499 + "sql"
  2500 + ]
  2501 + },
  2502 + {
  2503 + "name": "cakephp/debug_kit",
  2504 + "version": "3.2.9",
  2505 + "version_normalized": "3.2.9.0",
  2506 + "source": {
  2507 + "type": "git",
  2508 + "url": "https://github.com/cakephp/debug_kit.git",
  2509 + "reference": "5c351136576b05a386eb2bbb02267529123edf7b"
  2510 + },
  2511 + "dist": {
  2512 + "type": "zip",
  2513 + "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/5c351136576b05a386eb2bbb02267529123edf7b",
  2514 + "reference": "5c351136576b05a386eb2bbb02267529123edf7b",
  2515 + "shasum": ""
  2516 + },
  2517 + "require": {
  2518 + "cakephp/cakephp": ">=3.1.0 <4.0",
  2519 + "jdorn/sql-formatter": "~1.2"
  2520 + },
  2521 + "require-dev": {
  2522 + "cakephp/cakephp-codesniffer": "dev-master",
  2523 + "phpunit/phpunit": "4.1.*"
  2524 + },
  2525 + "suggest": {
  2526 + "ext-sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."
  2527 + },
  2528 + "time": "2016-05-28 15:47:46",
  2529 + "type": "cakephp-plugin",
  2530 + "installation-source": "dist",
  2531 + "autoload": {
  2532 + "psr-4": {
  2533 + "DebugKit\\": "src",
  2534 + "DebugKit\\Test\\Fixture\\": "tests\\Fixture"
  2535 + }
  2536 + },
  2537 + "notification-url": "https://packagist.org/downloads/",
  2538 + "license": [
  2539 + "MIT"
  2540 + ],
  2541 + "authors": [
  2542 + {
  2543 + "name": "Mark Story",
  2544 + "homepage": "http://mark-story.com",
  2545 + "role": "Author"
  2546 + },
  2547 + {
  2548 + "name": "CakePHP Community",
  2549 + "homepage": "https://github.com/cakephp/debug_kit/graphs/contributors"
  2550 + }
  2551 + ],
  2552 + "description": "CakePHP Debug Kit",
  2553 + "homepage": "https://github.com/cakephp/debug_kit",
  2554 + "keywords": [
  2555 + "cakephp",
  2556 + "debug",
  2557 + "kit"
  2558 + ]
2559 } 2559 }
2560 ] 2560 ]