diff --git a/.gitignore b/.gitignore
index b8de9635c4107f5a6767b30a4ada3f8da36544d3..c93d7faf10761d3a6aebb65d415aaa8328b896fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ yarn-error.log
.env
/public/css
/public/js
+env
+composer.lock
+public/mix-manifest.json
diff --git a/app/Http/Controllers/HasilBimbinganController.php b/app/Http/Controllers/HasilBimbinganController.php
index 3b4bdae115e381c2bb9e4da57a188b4507608c32..f51e913abd2c79e2eeb5f01764a582036ecdfef3 100644
--- a/app/Http/Controllers/HasilBimbinganController.php
+++ b/app/Http/Controllers/HasilBimbinganController.php
@@ -88,6 +88,12 @@ class HasilBimbinganController extends Controller
public function editHasilBimbingan(Request $request){
$mahasiswa = Auth::user()->isMahasiswa();
+ if(isset($_POST['tanggal_waktu'])){
+ $sched1 = date("Y-m-d\TH:i:s", strtotime($_POST['tanggal_waktu']));
+ }
+ if(isset($_POST['waktu_bimbingan_selanjutnya'])){
+ $sched2 = date("Y-m-d\TH:i:s", strtotime($_POST['waktu_bimbingan_selanjutnya']));
+ }
if($mahasiswa) {
$user = Auth::user();
$data = $request->all();
@@ -104,14 +110,14 @@ class HasilBimbinganController extends Controller
if ($db_hsl_bimbingan->count() >= $ok_count) {
$cur = $db_hsl_bimbingan[$ok_count - 1];
$cur->dosen_id = $data['dosen_id'];
- $cur->tanggal_waktu = $data['tanggal_waktu'];
+ $cur->tanggal_waktu = $sched1;
$cur->topik = $data['topik'];
$cur->hasil_dan_diskusi = $data['hasil_dan_diskusi'];
$cur->rencana_tindak_lanjut = $data['rencana_tindak_lanjut'];
if($item_count > 8){
$cur->dosen_id2 = $data['dosen_id2'];
}
- $cur->waktu_bimbingan_selanjutnya = $data['waktu_bimbingan_selanjutnya'];
+ $cur->waktu_bimbingan_selanjutnya = $sched2;
$cur->save();
}
}
@@ -128,13 +134,19 @@ class HasilBimbinganController extends Controller
public function uploadHasilBimbinganBaru(Request $request) {
$mahasiswa = Auth::user()->isMahasiswa();
+
if($mahasiswa) {
$user = Auth::user();
$data = $request->all();
$ok_count = 0;
$tesis = $mahasiswa->tesis();
$item_count = count($data);
-
+ if(isset($_POST['tanggal_waktu'])){
+ $sched1 = date("Y-m-d\TH:i:s", strtotime($_POST['tanggal_waktu']));
+ }
+ if(isset($_POST['waktu_bimbingan_selanjutnya'])){
+ $sched2 = date("Y-m-d\TH:i:s", strtotime($_POST['waktu_bimbingan_selanjutnya']));
+ }
$validator = $this->validateHasilBimbingan($data);
if ($validator->fails()) {
echo json_encode($validator->errors());
@@ -144,15 +156,16 @@ class HasilBimbinganController extends Controller
if($item_count > 8){
$dosen2 = $data['dosen_id2'];
}
+
$hasil_bimbingan = HasilBimbingan::create([
'dosen_id' => $data['dosen_id'],
'status' => 0,
- 'tanggal_waktu' => $data['tanggal_waktu'],
+ 'tanggal_waktu' => $sched1,
'topik' => $data['topik'],
'hasil_dan_diskusi' => $data['hasil_dan_diskusi'],
'rencana_tindak_lanjut' => $data['rencana_tindak_lanjut'],
'dosen_id2' => $dosen2,
- 'waktu_bimbingan_selanjutnya' => $data['waktu_bimbingan_selanjutnya'],
+ 'waktu_bimbingan_selanjutnya' => $sched2,
'thesis_id' => $tesis->id
]);
}
diff --git a/app/Http/Controllers/SeminarProposalController.php b/app/Http/Controllers/SeminarProposalController.php
index 4e4ee15c02bd83db2b61f312c94db3d1d1d13924..feeb444e694814f5e8068267e4342b8a5fe90cba 100644
--- a/app/Http/Controllers/SeminarProposalController.php
+++ b/app/Http/Controllers/SeminarProposalController.php
@@ -14,12 +14,16 @@ class SeminarProposalController extends Controller
$manajer= Auth::user()->isManajer();
$mhs_id = $request->get('mahasiswa');
$mahasiswa = Mahasiswa::find($mhs_id);
+ if(isset($_POST['date'])){
+ $sched = date("Y-m-d\TH:i:s", strtotime($_POST['date']));
+ }
if($manajer) {
if($mahasiswa) {
SeminarProposal::create(
[
"mahasiswa_id" => $mhs_id,
- "schedule" => $request->get("date"),
+ "schedule" => $sched,
+ // $request->get("date"),
"creator_id" => $manajer->id,
"proposal_id" => $mahasiswa->proposal()->id,
"id_dosen_pembimbing_1" => $request->get('dosen_pembimbing_1'),
diff --git a/app/Http/Controllers/SeminarTesisController.php b/app/Http/Controllers/SeminarTesisController.php
index a2339fc6da746a656800079c452bfe5aae2cfec6..5e424cc084a8be88a6364a7c5e553e568f491a5c 100644
--- a/app/Http/Controllers/SeminarTesisController.php
+++ b/app/Http/Controllers/SeminarTesisController.php
@@ -36,6 +36,10 @@ class SeminarTesisController extends Controller
$usr = User::where('username',$id)->first();
$mhs = $usr->isMahasiswa();
$tesis = $mhs->tesis();
+ if(isset($_POST['haritgl'])){
+ $sched = date("Y-m-d", strtotime($_POST['haritgl']));
+ $sched1 = date("H:i:s", strtotime($_POST['haritgl']));
+ }
if(!$usr || !$mhs || !$tesis) {
return abort(400);
} else {
@@ -45,14 +49,17 @@ class SeminarTesisController extends Controller
$name = $request->get('name');
$nim = $request->get('nim');
$judul = $request->get('judul');
- $hari = $request->get('haritgl');
- $waktu = $request->get('waktu');
+ $hari = $sched;
+ // $request->get('haritgl');
+ $waktu = $sched1;
+ // $request->get('waktu');
$tempat = $request->get('tempat');
$st = SeminarTesis::create([
'tesis_id' => $mhs->tesis()->id,
'issuer_id' => Auth::user()->id,
- 'hari' => $hari,
- 'waktu'=> $waktu,
+ 'hari' => $sched,
+ // $hari,
+ 'waktu'=> $sched1,
'tempat' => $tempat,
'approval_pembimbing1' => $db1,
'approval_pembimbing2' => $db2,
@@ -73,6 +80,10 @@ class SeminarTesisController extends Controller
$usr = User::where('username',$id)->first();
$mhs = $usr->isMahasiswa();
$tesis = $mhs->tesis();
+ if(isset($_POST['haritgl'])){
+ $sched = date("Y-m-d", strtotime($_POST['haritgl']));
+ $sched1 = date("H:i:s", strtotime($_POST['haritgl']));
+ }
if(!$usr || !$mhs || !$tesis) {
return abort(400);
} else {
@@ -87,8 +98,10 @@ class SeminarTesisController extends Controller
if($request->get('approval_db1') && $db1) {
$st->approval_pembimbing1 = true;
}
- $st->waktu = $request->get('waktu');
- $st->hari = $request->get('haritgl');
+ $st->waktu = $sched1;
+ // $request->get('waktu');
+ $st->hari = $sched;
+ // $request->get('haritgl');
$st->tempat = $request->get('tempat');
$judul = $request->get('judul');
$tesis->judul_thesis = $judul;
diff --git a/app/Http/Controllers/SeminarTopikController.php b/app/Http/Controllers/SeminarTopikController.php
index 54860692e101c72eae5915383d147bd9d0774484..92367a38e6ee480d329734d7ee286b8ac400e75a 100644
--- a/app/Http/Controllers/SeminarTopikController.php
+++ b/app/Http/Controllers/SeminarTopikController.php
@@ -12,12 +12,16 @@ class SeminarTopikController extends Controller
$manajer= Auth::user()->isManajer();
$mhs_id = $request->get('mahasiswa');
$mahasiswa = Mahasiswa::find($mhs_id);
+ if(isset($_POST['date'])){
+ $sched = date("Y-m-d\TH:i:s", strtotime($_POST['date']));
+ }
if($manajer) {
if($mahasiswa) {
SeminarTopik::create(
[
"mahasiswa_id" => $mhs_id,
- "schedule" => $request->get("date"),
+ "schedule" => $sched,
+ // $request->get("date"),
"creator_id" => $manajer->id,
"topik_id" => $mahasiswa->getApprovedTopic()->id
]
diff --git a/app/Http/Controllers/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php
index 1f6947076d5931a84ebc99f05d4e0394eb65cb14..3414d3ea7c32d332c46ba6d6fae98182c99a58fa 100644
--- a/app/Http/Controllers/SidangTesisController.php
+++ b/app/Http/Controllers/SidangTesisController.php
@@ -482,10 +482,16 @@ class SidangTesisController extends Controller
$mhs = $usr->isMahasiswa();
$tesis = $mhs->tesis();
$sidang = $tesis->sidangTesis();
+ if(isset($_POST['haritgl'])){
+ $sched = date("Y-m-d", strtotime($_POST['haritgl']));
+ $sched1 = date("H:i:s", strtotime($_POST['haritgl']));
+ }
if($tesis->dosen_pembimbing1 == Auth::user()->id || $tesis->dosen_pembimbing2 == Auth::user()->id) {
print_r($request->all());
- $sidang->tanggal = $request->get('haritgl');
- $sidang->jam = $request->get('waktu');
+ $sidang->tanggal = $sched;
+ // $request->get('haritgl');
+ $sidang->jam = $sched1;
+ // $request->get('waktu');
$sidang->tempat = $request->get('tempat');
$tesis->judul_thesis = $request->get('judul');
$sidang->ajuan_penguji1 = $request->get('usulan_penguji1');
@@ -503,6 +509,9 @@ class SidangTesisController extends Controller
public function mahasiswaEdit(Request $request, $id){
$user = User::where('username',$id)->first();
$mhs = $user->isMahasiswa();
+ if(isset($_POST['tanggal_seminar_tesis'])){
+ $sched = date("Y-m-d\TH:i:s", strtotime($_POST['tanggal_seminar_tesis']));
+ }
if($mhs->id == Auth::user()->id && $mhs->tesis() && $mhs->tesis()->sidangTesis()) {
$sidang = $mhs->tesis()->sidangTesis();
$eval_diri = $request->file('eval_diri');
@@ -547,6 +556,8 @@ class SidangTesisController extends Controller
$sidang->semester_terdaftar = $request->get('semester_daftar');
+
+
$sidang->jadwal_seminar = $request->get('tanggal_seminar_tesis');
$sidang->save();
@@ -626,10 +637,16 @@ class SidangTesisController extends Controller
$mhs = $usr->isMahasiswa();
$tesis = $mhs->tesis();
$sidang = $tesis->sidangTesis();
+ if(isset($_POST['haritgl'])){
+ $sched = date("Y-m-d", strtotime($_POST['haritgl']));
+ $sched1 = date("H:i:s", strtotime($_POST['haritgl']));
+ }
if(Auth::user()->isManajer()) {
print_r($request->all());
- $sidang->tanggal = $request->get('haritgl');
- $sidang->jam = $request->get('waktu');
+ $sidang->tanggal = $sched;
+ // $request->get('haritgl');
+ $sidang->jam = $sched1;
+ // $request->get('waktu');
$sidang->tempat = $request->get('tempat');
$sidang->dosen_penguji_1 = $request->get('dosen_penguji1');
$sidang->dosen_penguji_2 = $request->get('dosen_penguji2');
diff --git a/composer.lock b/composer.lock
index 4933c21faecdd8c5fc3b2e69aa20b778dc1a0e00..6829f9a37d0d8f6eb7a3427dbe0d0474bd0058c8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -39,86 +39,18 @@
"description": "implementation of xdg base directory specification for php",
"time": "2014-10-24T07:27:01+00:00"
},
- {
- "name": "doctrine/annotations",
- "version": "v1.6.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/annotations.git",
- "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
- "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
- "shasum": ""
- },
- "require": {
- "doctrine/lexer": "1.*",
- "php": "^7.1"
- },
- "require-dev": {
- "doctrine/cache": "1.*",
- "phpunit/phpunit": "^6.4"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.6.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Docblock Annotations Parser",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "annotations",
- "docblock",
- "parser"
- ],
- "time": "2017-12-06T07:11:42+00:00"
- },
{
"name": "doctrine/cache",
- "version": "v1.7.1",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
+ "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
- "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57",
+ "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57",
"shasum": ""
},
"require": {
@@ -129,8 +61,9 @@
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
+ "doctrine/coding-standard": "^4.0",
"mongodb/mongodb": "^1.1",
- "phpunit/phpunit": "^5.7",
+ "phpunit/phpunit": "^7.0",
"predis/predis": "~1.0"
},
"suggest": {
@@ -139,7 +72,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "1.8.x-dev"
}
},
"autoload": {
@@ -174,43 +107,57 @@
}
],
"description": "Caching library offering an object-oriented API for many cache backends",
- "homepage": "http://www.doctrine-project.org",
+ "homepage": "https://www.doctrine-project.org",
"keywords": [
"cache",
"caching"
],
- "time": "2017-08-25T07:02:50+00:00"
+ "time": "2018-08-21T18:01:43+00:00"
},
{
- "name": "doctrine/collections",
- "version": "v1.5.0",
+ "name": "doctrine/dbal",
+ "version": "v2.9.2",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/collections.git",
- "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
+ "url": "https://github.com/doctrine/dbal.git",
+ "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
- "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
+ "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
"shasum": ""
},
"require": {
+ "doctrine/cache": "^1.0",
+ "doctrine/event-manager": "^1.0",
+ "ext-pdo": "*",
"php": "^7.1"
},
"require-dev": {
- "doctrine/coding-standard": "~0.1@dev",
- "phpunit/phpunit": "^5.7"
+ "doctrine/coding-standard": "^5.0",
+ "jetbrains/phpstorm-stubs": "^2018.1.2",
+ "phpstan/phpstan": "^0.10.1",
+ "phpunit/phpunit": "^7.4",
+ "symfony/console": "^2.0.5|^3.0|^4.0",
+ "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
},
+ "suggest": {
+ "symfony/console": "For helpful console commands such as SQL execution and import of files."
+ },
+ "bin": [
+ "bin/doctrine-dbal"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "2.9.x-dev",
+ "dev-develop": "3.0.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Collections\\": "lib/"
+ "psr-4": {
+ "Doctrine\\DBAL\\": "lib/Doctrine/DBAL"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -233,50 +180,50 @@
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
}
],
- "description": "Collections Abstraction library",
- "homepage": "http://www.doctrine-project.org",
+ "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.",
+ "homepage": "https://www.doctrine-project.org/projects/dbal.html",
"keywords": [
- "array",
- "collections",
- "iterator"
+ "abstraction",
+ "database",
+ "dbal",
+ "mysql",
+ "persistence",
+ "pgsql",
+ "php",
+ "queryobject"
],
- "time": "2017-07-22T10:37:32+00:00"
+ "time": "2018-12-31T03:27:51+00:00"
},
{
- "name": "doctrine/common",
- "version": "v2.8.1",
+ "name": "doctrine/event-manager",
+ "version": "v1.0.0",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/common.git",
- "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66"
+ "url": "https://github.com/doctrine/event-manager.git",
+ "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
- "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
+ "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3",
+ "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3",
"shasum": ""
},
"require": {
- "doctrine/annotations": "1.*",
- "doctrine/cache": "1.*",
- "doctrine/collections": "1.*",
- "doctrine/inflector": "1.*",
- "doctrine/lexer": "1.*",
- "php": "~7.1"
+ "php": "^7.1"
+ },
+ "conflict": {
+ "doctrine/common": "<2.9@dev"
},
"require-dev": {
- "phpunit/phpunit": "^5.7"
+ "doctrine/coding-standard": "^4.0",
+ "phpunit/phpunit": "^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8.x-dev"
+ "dev-master": "1.0.x-dev"
}
},
"autoload": {
@@ -308,93 +255,20 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Common Library for Doctrine projects",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "annotations",
- "collections",
- "eventmanager",
- "persistence",
- "spl"
- ],
- "time": "2017-08-31T08:43:38+00:00"
- },
- {
- "name": "doctrine/dbal",
- "version": "v2.7.1",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/dbal.git",
- "reference": "11037b4352c008373561dc6fc836834eed80c3b5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/11037b4352c008373561dc6fc836834eed80c3b5",
- "reference": "11037b4352c008373561dc6fc836834eed80c3b5",
- "shasum": ""
- },
- "require": {
- "doctrine/common": "^2.7.1",
- "ext-pdo": "*",
- "php": "^7.1"
- },
- "require-dev": {
- "doctrine/coding-standard": "^4.0",
- "phpunit/phpunit": "^7.0",
- "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
- "symfony/console": "^2.0.5||^3.0",
- "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
- },
- "suggest": {
- "symfony/console": "For helpful console commands such as SQL execution and import of files."
- },
- "bin": [
- "bin/doctrine-dbal"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Doctrine\\DBAL\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
},
{
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
+ "name": "Marco Pivetta",
+ "email": "ocramius@gmail.com"
}
],
- "description": "Database Abstraction Layer",
- "homepage": "http://www.doctrine-project.org",
+ "description": "Doctrine Event Manager component",
+ "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
"keywords": [
- "database",
- "dbal",
- "persistence",
- "queryobject"
+ "event",
+ "eventdispatcher",
+ "eventmanager"
],
- "time": "2018-04-07T18:44:18+00:00"
+ "time": "2018-06-11T11:59:03+00:00"
},
{
"name": "doctrine/inflector",
@@ -519,23 +393,23 @@
},
{
"name": "dragonmantank/cron-expression",
- "version": "v2.0.0",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git",
- "reference": "8a84aee649c3a3ba03a721c1fb080e08dfbcd68b"
+ "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8a84aee649c3a3ba03a721c1fb080e08dfbcd68b",
- "reference": "8a84aee649c3a3ba03a721c1fb080e08dfbcd68b",
+ "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/92a2c3768d50e21a1f26a53cb795ce72806266c5",
+ "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5",
"shasum": ""
},
"require": {
"php": ">=7.0.0"
},
"require-dev": {
- "phpunit/phpunit": "~5.7"
+ "phpunit/phpunit": "~6.4"
},
"type": "library",
"autoload": {
@@ -564,20 +438,20 @@
"cron",
"schedule"
],
- "time": "2017-10-12T15:59:13+00:00"
+ "time": "2018-06-06T03:12:17+00:00"
},
{
"name": "egulias/email-validator",
- "version": "2.1.3",
+ "version": "2.1.7",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04"
+ "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/1bec00a10039b823cc94eef4eddd47dcd3b2ca04",
- "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/709f21f92707308cdf8f9bcfa1af4cb26586521e",
+ "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e",
"shasum": ""
},
"require": {
@@ -586,7 +460,7 @@
},
"require-dev": {
"dominicsayers/isemail": "dev-master",
- "phpunit/phpunit": "^4.8.35",
+ "phpunit/phpunit": "^4.8.35||^5.7||^6.0",
"satooshi/php-coveralls": "^1.0.1"
},
"suggest": {
@@ -621,23 +495,24 @@
"validation",
"validator"
],
- "time": "2017-11-15T23:40:40+00:00"
+ "time": "2018-12-04T22:38:24+00:00"
},
{
"name": "erusev/parsedown",
- "version": "1.6.4",
+ "version": "1.7.1",
"source": {
"type": "git",
"url": "https://github.com/erusev/parsedown.git",
- "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548"
+ "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/erusev/parsedown/zipball/fbe3fe878f4fe69048bb8a52783a09802004f548",
- "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548",
+ "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
+ "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
"shasum": ""
},
"require": {
+ "ext-mbstring": "*",
"php": ">=5.3.0"
},
"require-dev": {
@@ -666,20 +541,20 @@
"markdown",
"parser"
],
- "time": "2017-11-14T20:44:03+00:00"
+ "time": "2018-03-08T01:11:30+00:00"
},
{
"name": "fideloper/proxy",
- "version": "4.0.0",
+ "version": "4.1.0",
"source": {
"type": "git",
"url": "https://github.com/fideloper/TrustedProxy.git",
- "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a"
+ "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/cf8a0ca4b85659b9557e206c90110a6a4dba980a",
- "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a",
+ "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/177c79a2d1f9970f89ee2fb4c12b429af38b6dfb",
+ "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb",
"shasum": ""
},
"require": {
@@ -720,36 +595,36 @@
"proxy",
"trusted proxy"
],
- "time": "2018-02-07T20:20:57+00:00"
+ "time": "2019-01-10T14:06:47+00:00"
},
{
"name": "jakub-onderka/php-console-color",
- "version": "0.1",
+ "version": "v0.2",
"source": {
"type": "git",
"url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
+ "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.4.0"
},
"require-dev": {
"jakub-onderka/php-code-style": "1.0",
- "jakub-onderka/php-parallel-lint": "0.*",
+ "jakub-onderka/php-parallel-lint": "1.0",
"jakub-onderka/php-var-dump-check": "0.*",
- "phpunit/phpunit": "3.7.*",
+ "phpunit/phpunit": "~4.3",
"squizlabs/php_codesniffer": "1.*"
},
"type": "library",
"autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleColor": "src/"
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleColor\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -759,41 +634,41 @@
"authors": [
{
"name": "Jakub Onderka",
- "email": "jakub.onderka@gmail.com",
- "homepage": "http://www.acci.cz"
+ "email": "jakub.onderka@gmail.com"
}
],
- "time": "2014-04-08T15:00:19+00:00"
+ "time": "2018-09-29T17:23:10+00:00"
},
{
"name": "jakub-onderka/php-console-highlighter",
- "version": "v0.3.2",
+ "version": "v0.4",
"source": {
"type": "git",
"url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
+ "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
+ "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
+ "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
"shasum": ""
},
"require": {
- "jakub-onderka/php-console-color": "~0.1",
- "php": ">=5.3.0"
+ "ext-tokenizer": "*",
+ "jakub-onderka/php-console-color": "~0.2",
+ "php": ">=5.4.0"
},
"require-dev": {
"jakub-onderka/php-code-style": "~1.0",
- "jakub-onderka/php-parallel-lint": "~0.5",
+ "jakub-onderka/php-parallel-lint": "~1.0",
"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/"
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleHighlighter\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -807,31 +682,32 @@
"homepage": "http://www.acci.cz/"
}
],
- "time": "2015-04-20T18:58:01+00:00"
+ "description": "Highlight PHP code in terminal",
+ "time": "2018-09-29T18:48:56+00:00"
},
{
"name": "laravel/framework",
- "version": "v5.6.5",
+ "version": "v5.6.39",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "2e68209991e15aca1382ef9a3443d13f2e0d8755"
+ "reference": "37bb306f516669ab4f888c16003f694313ab299e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/2e68209991e15aca1382ef9a3443d13f2e0d8755",
- "reference": "2e68209991e15aca1382ef9a3443d13f2e0d8755",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/37bb306f516669ab4f888c16003f694313ab299e",
+ "reference": "37bb306f516669ab4f888c16003f694313ab299e",
"shasum": ""
},
"require": {
"doctrine/inflector": "~1.1",
"dragonmantank/cron-expression": "~2.0",
- "erusev/parsedown": "~1.6",
+ "erusev/parsedown": "~1.7",
"ext-mbstring": "*",
"ext-openssl": "*",
- "league/flysystem": "~1.0",
+ "league/flysystem": "^1.0.8",
"monolog/monolog": "~1.12",
- "nesbot/carbon": "^1.22.1",
+ "nesbot/carbon": "1.25.*",
"php": "^7.1.3",
"psr/container": "~1.0",
"psr/simple-cache": "^1.0",
@@ -848,6 +724,9 @@
"tijsverkoyen/css-to-inline-styles": "^2.2.1",
"vlucas/phpdotenv": "~2.2"
},
+ "conflict": {
+ "tightenco/collect": "<5.5.33"
+ },
"replace": {
"illuminate/auth": "self.version",
"illuminate/broadcasting": "self.version",
@@ -876,13 +755,13 @@
"illuminate/support": "self.version",
"illuminate/translation": "self.version",
"illuminate/validation": "self.version",
- "illuminate/view": "self.version",
- "tightenco/collect": "<5.5.33"
+ "illuminate/view": "self.version"
},
"require-dev": {
"aws/aws-sdk-php": "~3.0",
"doctrine/dbal": "~2.6",
"filp/whoops": "^2.1.4",
+ "league/flysystem-cached-adapter": "~1.0",
"mockery/mockery": "~1.0",
"moontoast/math": "^1.1",
"orchestra/testbench-core": "3.6.*",
@@ -901,8 +780,9 @@
"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-cached-adapter": "Required to use Flysystem caching (~1.0).",
+ "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).",
"league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
+ "league/flysystem-sftp": "Required to use the Flysystem SFTP 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).",
@@ -942,20 +822,20 @@
"framework",
"laravel"
],
- "time": "2018-02-22T19:21:38+00:00"
+ "time": "2018-10-04T14:50:41+00:00"
},
{
"name": "laravel/tinker",
- "version": "v1.0.3",
+ "version": "v1.0.8",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
- "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6"
+ "reference": "cafbf598a90acde68985660e79b2b03c5609a405"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/tinker/zipball/852c2abe0b0991555a403f1c0583e64de6acb4a6",
- "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6",
+ "url": "https://api.github.com/repos/laravel/tinker/zipball/cafbf598a90acde68985660e79b2b03c5609a405",
+ "reference": "cafbf598a90acde68985660e79b2b03c5609a405",
"shasum": ""
},
"require": {
@@ -963,7 +843,7 @@
"illuminate/contracts": "~5.1",
"illuminate/support": "~5.1",
"php": ">=5.5.9",
- "psy/psysh": "0.7.*|0.8.*",
+ "psy/psysh": "0.7.*|0.8.*|0.9.*",
"symfony/var-dumper": "~3.0|~4.0"
},
"require-dev": {
@@ -1005,32 +885,32 @@
"laravel",
"psysh"
],
- "time": "2017-12-18T16:25:11+00:00"
+ "time": "2018-10-12T19:39:35+00:00"
},
{
"name": "league/flysystem",
- "version": "1.0.42",
+ "version": "1.0.49",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "09eabc54e199950041aef258a85847676496fe8e"
+ "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/09eabc54e199950041aef258a85847676496fe8e",
- "reference": "09eabc54e199950041aef258a85847676496fe8e",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a63cc83d8a931b271be45148fa39ba7156782ffd",
+ "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd",
"shasum": ""
},
"require": {
+ "ext-fileinfo": "*",
"php": ">=5.5.9"
},
"conflict": {
"league/flysystem-sftp": "<1.0.6"
},
"require-dev": {
- "ext-fileinfo": "*",
"phpspec/phpspec": "^3.4",
- "phpunit/phpunit": "^5.7"
+ "phpunit/phpunit": "^5.7.10"
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
@@ -1089,20 +969,20 @@
"sftp",
"storage"
],
- "time": "2018-01-27T16:03:56+00:00"
+ "time": "2018-11-23T23:41:29+00:00"
},
{
"name": "monolog/monolog",
- "version": "1.23.0",
+ "version": "1.24.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+ "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
- "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+ "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"shasum": ""
},
"require": {
@@ -1167,29 +1047,29 @@
"logging",
"psr-3"
],
- "time": "2017-06-19T01:22:40+00:00"
+ "time": "2018-11-05T09:00:11+00:00"
},
{
"name": "nesbot/carbon",
- "version": "1.22.1",
+ "version": "1.25.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc"
+ "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
- "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cbcf13da0b531767e39eb86e9687f5deba9857b4",
+ "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4",
"shasum": ""
},
"require": {
- "php": ">=5.3.0",
- "symfony/translation": "~2.6 || ~3.0"
+ "php": ">=5.3.9",
+ "symfony/translation": "~2.6 || ~3.0 || ~4.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2",
- "phpunit/phpunit": "~4.0 || ~5.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.7"
},
"type": "library",
"extra": {
@@ -1220,28 +1100,28 @@
"datetime",
"time"
],
- "time": "2017-01-16T07:55:07+00:00"
+ "time": "2018-03-19T15:50:49+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v3.1.4",
+ "version": "v4.2.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "e57b3a09784f846411aa7ed664eedb73e3399078"
+ "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e57b3a09784f846411aa7ed664eedb73e3399078",
- "reference": "e57b3a09784f846411aa7ed664eedb73e3399078",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/594bcae1fc0bccd3993d2f0d61a018e26ac2865a",
+ "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
- "php": ">=5.5"
+ "php": ">=7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0|~5.0"
+ "phpunit/phpunit": "^6.5 || ^7.0"
},
"bin": [
"bin/php-parse"
@@ -1249,7 +1129,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -1271,37 +1151,33 @@
"parser",
"php"
],
- "time": "2018-01-25T21:31:33+00:00"
+ "time": "2019-01-12T16:31:37+00:00"
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.11",
+ "version": "v9.99.99",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
- "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"shasum": ""
},
"require": {
- "php": ">=5.2.0"
+ "php": "^7"
},
"require-dev": {
- "phpunit/phpunit": "4.*|5.*"
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
},
"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"
@@ -1316,10 +1192,11 @@
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [
"csprng",
+ "polyfill",
"pseudorandom",
"random"
],
- "time": "2017-09-27T21:40:39+00:00"
+ "time": "2018-07-02T15:55:56+00:00"
},
{
"name": "psr/container",
@@ -1372,16 +1249,16 @@
},
{
"name": "psr/log",
- "version": "1.0.2",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": ""
},
"require": {
@@ -1415,20 +1292,20 @@
"psr",
"psr-3"
],
- "time": "2016-10-10T12:19:37+00:00"
+ "time": "2018-11-20T15:27:04+00:00"
},
{
"name": "psr/simple-cache",
- "version": "1.0.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/simple-cache.git",
- "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24"
+ "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/753fa598e8f3b9966c886fe13f370baa45ef0e24",
- "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24",
+ "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+ "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
"shasum": ""
},
"require": {
@@ -1463,34 +1340,36 @@
"psr-16",
"simple-cache"
],
- "time": "2017-01-02T13:31:39+00:00"
+ "time": "2017-10-23T01:57:42+00:00"
},
{
"name": "psy/psysh",
- "version": "v0.8.17",
+ "version": "v0.9.9",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec"
+ "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5069b70e8c4ea492c2b5939b6eddc78bfe41cfec",
- "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
+ "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
"shasum": ""
},
"require": {
"dnoegel/php-xdg-base-dir": "0.1",
- "jakub-onderka/php-console-highlighter": "0.3.*",
- "nikic/php-parser": "~1.3|~2.0|~3.0",
- "php": ">=5.3.9",
+ "ext-json": "*",
+ "ext-tokenizer": "*",
+ "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*",
+ "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
+ "php": ">=5.4.0",
"symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
"symfony/var-dumper": "~2.7|~3.0|~4.0"
},
"require-dev": {
- "hoa/console": "~3.16|~1.14",
- "phpunit/phpunit": "^4.8.35|^5.4.3",
- "symfony/finder": "~2.1|~3.0|~4.0"
+ "bamarni/composer-bin-plugin": "^1.2",
+ "hoa/console": "~2.15|~3.16",
+ "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0"
},
"suggest": {
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
@@ -1505,15 +1384,15 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "0.8.x-dev"
+ "dev-develop": "0.9.x-dev"
}
},
"autoload": {
"files": [
- "src/Psy/functions.php"
+ "src/functions.php"
],
"psr-4": {
- "Psy\\": "src/Psy/"
+ "Psy\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1535,25 +1414,26 @@
"interactive",
"shell"
],
- "time": "2017-12-28T16:14:16+00:00"
+ "time": "2018-10-13T15:16:03+00:00"
},
{
"name": "ramsey/uuid",
- "version": "3.7.3",
+ "version": "3.8.0",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
- "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76"
+ "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
- "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
+ "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
"shasum": ""
},
"require": {
- "paragonie/random_compat": "^1.0|^2.0",
- "php": "^5.4 || ^7.0"
+ "paragonie/random_compat": "^1.0|^2.0|9.99.99",
+ "php": "^5.4 || ^7.0",
+ "symfony/polyfill-ctype": "^1.8"
},
"replace": {
"rhumsaa/uuid": "self.version"
@@ -1561,16 +1441,17 @@
"require-dev": {
"codeception/aspect-mock": "^1.0 | ~2.0.0",
"doctrine/annotations": "~1.2.0",
- "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
+ "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
"ircmaxell/random-lib": "^1.1",
"jakub-onderka/php-parallel-lint": "^0.9.0",
"mockery/mockery": "^0.9.9",
"moontoast/math": "^1.1",
"php-mock/php-mock-phpunit": "^0.3|^1.1",
- "phpunit/phpunit": "^4.7|^5.0",
+ "phpunit/phpunit": "^4.7|^5.0|^6.5",
"squizlabs/php_codesniffer": "^2.3"
},
"suggest": {
+ "ext-ctype": "Provides support for PHP Ctype functions",
"ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
"ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
"ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
@@ -1615,20 +1496,20 @@
"identifier",
"uuid"
],
- "time": "2018-01-20T00:28:24+00:00"
+ "time": "2018-07-19T23:38:55+00:00"
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v6.0.2",
+ "version": "v6.1.3",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc"
+ "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/412333372fb6c8ffb65496a2bbd7321af75733fc",
- "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8ddcb66ac10c392d3beb54829eef8ac1438595f4",
+ "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4",
"shasum": ""
},
"require": {
@@ -1639,10 +1520,14 @@
"mockery/mockery": "~0.9.1",
"symfony/phpunit-bridge": "~3.3@dev"
},
+ "suggest": {
+ "ext-intl": "Needed to support internationalized email addresses",
+ "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.0-dev"
+ "dev-master": "6.1-dev"
}
},
"autoload": {
@@ -1664,30 +1549,31 @@
}
],
"description": "Swiftmailer, free feature-rich PHP mailer",
- "homepage": "http://swiftmailer.symfony.com",
+ "homepage": "https://swiftmailer.symfony.com",
"keywords": [
"email",
"mail",
"mailer"
],
- "time": "2017-09-30T22:39:41+00:00"
+ "time": "2018-09-11T07:12:52+00:00"
},
{
"name": "symfony/console",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "36d5b41e7d4e1ccf0370f6babe966c08ef0a1488"
+ "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/36d5b41e7d4e1ccf0370f6babe966c08ef0a1488",
- "reference": "36d5b41e7d4e1ccf0370f6babe966c08ef0a1488",
+ "url": "https://api.github.com/repos/symfony/console/zipball/b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
+ "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
"shasum": ""
},
"require": {
"php": "^7.1.3",
+ "symfony/contracts": "^1.0",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
@@ -1703,7 +1589,7 @@
"symfony/process": "~3.4|~4.0"
},
"suggest": {
- "psr/log": "For using the console logger",
+ "psr/log-implementation": "For using the console logger",
"symfony/event-dispatcher": "",
"symfony/lock": "",
"symfony/process": ""
@@ -1711,7 +1597,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -1738,20 +1624,88 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2018-01-29T09:06:29+00:00"
+ "time": "2019-01-04T15:13:53+00:00"
+ },
+ {
+ "name": "symfony/contracts",
+ "version": "v1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/contracts.git",
+ "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+ "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1.3"
+ },
+ "require-dev": {
+ "psr/cache": "^1.0",
+ "psr/container": "^1.0"
+ },
+ "suggest": {
+ "psr/cache": "When using the Cache contracts",
+ "psr/container": "When using the Service contracts",
+ "symfony/cache-contracts-implementation": "",
+ "symfony/service-contracts-implementation": "",
+ "symfony/translation-contracts-implementation": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Contracts\\": ""
+ },
+ "exclude-from-classmap": [
+ "**/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "A set of abstractions extracted out of the Symfony components",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "abstractions",
+ "contracts",
+ "decoupling",
+ "interfaces",
+ "interoperability",
+ "standards"
+ ],
+ "time": "2018-12-05T08:06:11+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "f97600434e3141ef3cbb9ea42cf500fba88022b7"
+ "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/f97600434e3141ef3cbb9ea42cf500fba88022b7",
- "reference": "f97600434e3141ef3cbb9ea42cf500fba88022b7",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/76dac1dbe2830213e95892c7c2ec1edd74113ea4",
+ "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4",
"shasum": ""
},
"require": {
@@ -1760,7 +1714,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -1791,20 +1745,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2018-01-03T07:38:00+00:00"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/debug",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "c77bb31d0f6310a2ac11e657475d396a92e5dc54"
+ "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/c77bb31d0f6310a2ac11e657475d396a92e5dc54",
- "reference": "c77bb31d0f6310a2ac11e657475d396a92e5dc54",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
+ "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
"shasum": ""
},
"require": {
@@ -1820,7 +1774,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -1847,24 +1801,25 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2018-01-18T22:19:33+00:00"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "74d33aac36208c4d6757807d9f598f0133a3a4eb"
+ "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/74d33aac36208c4d6757807d9f598f0133a3a4eb",
- "reference": "74d33aac36208c4d6757807d9f598f0133a3a4eb",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
+ "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^7.1.3",
+ "symfony/contracts": "^1.0"
},
"conflict": {
"symfony/dependency-injection": "<3.4"
@@ -1883,7 +1838,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -1910,20 +1865,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2018-01-03T07:38:00+00:00"
+ "time": "2019-01-05T16:37:49+00:00"
},
{
"name": "symfony/finder",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "8b08180f2b7ccb41062366b9ad91fbc4f1af8601"
+ "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/8b08180f2b7ccb41062366b9ad91fbc4f1af8601",
- "reference": "8b08180f2b7ccb41062366b9ad91fbc4f1af8601",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
+ "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
"shasum": ""
},
"require": {
@@ -1932,7 +1887,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -1959,20 +1914,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2018-01-03T07:38:00+00:00"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "82a3ee2c6662d08ca1adf99e1ef2e31ab48196d4"
+ "reference": "a633d422a09242064ba24e44a6e1494c5126de86"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/82a3ee2c6662d08ca1adf99e1ef2e31ab48196d4",
- "reference": "82a3ee2c6662d08ca1adf99e1ef2e31ab48196d4",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a633d422a09242064ba24e44a6e1494c5126de86",
+ "reference": "a633d422a09242064ba24e44a6e1494c5126de86",
"shasum": ""
},
"require": {
@@ -1980,12 +1935,13 @@
"symfony/polyfill-mbstring": "~1.1"
},
"require-dev": {
+ "predis/predis": "~1.0",
"symfony/expression-language": "~3.4|~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2012,33 +1968,36 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2018-01-29T09:06:29+00:00"
+ "time": "2019-01-05T16:37:49+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "194bd224ec27952eac6d4fea6264b22990834eca"
+ "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/194bd224ec27952eac6d4fea6264b22990834eca",
- "reference": "194bd224ec27952eac6d4fea6264b22990834eca",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/83de6543328917c18d5498eeb6bb6d36f7aab31b",
+ "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/log": "~1.0",
+ "symfony/contracts": "^1.0.2",
"symfony/debug": "~3.4|~4.0",
- "symfony/event-dispatcher": "~3.4|~4.0",
- "symfony/http-foundation": "~3.4.4|~4.0.4"
+ "symfony/event-dispatcher": "~4.1",
+ "symfony/http-foundation": "^4.1.1",
+ "symfony/polyfill-ctype": "~1.8"
},
"conflict": {
"symfony/config": "<3.4",
- "symfony/dependency-injection": "<3.4",
- "symfony/var-dumper": "<3.4",
+ "symfony/dependency-injection": "<4.2",
+ "symfony/translation": "<4.2",
+ "symfony/var-dumper": "<4.1.1",
"twig/twig": "<1.34|<2.4,>=2"
},
"provide": {
@@ -2050,7 +2009,7 @@
"symfony/config": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/css-selector": "~3.4|~4.0",
- "symfony/dependency-injection": "~3.4|~4.0",
+ "symfony/dependency-injection": "^4.2",
"symfony/dom-crawler": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/finder": "~3.4|~4.0",
@@ -2058,8 +2017,8 @@
"symfony/routing": "~3.4|~4.0",
"symfony/stopwatch": "~3.4|~4.0",
"symfony/templating": "~3.4|~4.0",
- "symfony/translation": "~3.4|~4.0",
- "symfony/var-dumper": "~3.4|~4.0"
+ "symfony/translation": "~4.2",
+ "symfony/var-dumper": "^4.1.1"
},
"suggest": {
"symfony/browser-kit": "",
@@ -2071,7 +2030,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2098,20 +2057,78 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2018-01-29T13:27:08+00:00"
+ "time": "2019-01-06T16:19:23+00:00"
+ },
+ {
+ "name": "symfony/polyfill-ctype",
+ "version": "v1.10.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-ctype.git",
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ext-ctype": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.9-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Ctype\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ },
+ {
+ "name": "Gert de Pagter",
+ "email": "backendtea@gmail.com"
+ }
+ ],
+ "description": "Symfony polyfill for ctype functions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "ctype",
+ "polyfill",
+ "portable"
+ ],
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.7.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
- "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
"shasum": ""
},
"require": {
@@ -2123,7 +2140,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -2157,20 +2174,20 @@
"portable",
"shim"
],
- "time": "2018-01-30T19:27:44+00:00"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.7.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422"
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
"shasum": ""
},
"require": {
@@ -2179,7 +2196,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -2212,20 +2229,20 @@
"portable",
"shim"
],
- "time": "2018-01-31T17:43:24+00:00"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/process",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "e1712002d81de6f39f854bc5bbd9e9f4bb6345b4"
+ "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/e1712002d81de6f39f854bc5bbd9e9f4bb6345b4",
- "reference": "e1712002d81de6f39f854bc5bbd9e9f4bb6345b4",
+ "url": "https://api.github.com/repos/symfony/process/zipball/ea043ab5d8ed13b467a9087d81cb876aee7f689a",
+ "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a",
"shasum": ""
},
"require": {
@@ -2234,7 +2251,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2261,35 +2278,34 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2018-01-29T09:06:29+00:00"
+ "time": "2019-01-03T14:48:52+00:00"
},
{
"name": "symfony/routing",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "a69bd948700b672e036147762f46749bcae33796"
+ "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/a69bd948700b672e036147762f46749bcae33796",
- "reference": "a69bd948700b672e036147762f46749bcae33796",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/e69b7a13a0b58af378a49b49dd7084462de16cee",
+ "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"conflict": {
- "symfony/config": "<3.4",
+ "symfony/config": "<4.2",
"symfony/dependency-injection": "<3.4",
"symfony/yaml": "<3.4"
},
"require-dev": {
"doctrine/annotations": "~1.0",
- "doctrine/common": "~2.2",
"psr/log": "~1.0",
- "symfony/config": "~3.4|~4.0",
+ "symfony/config": "~4.2",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/http-foundation": "~3.4|~4.0",
@@ -2306,7 +2322,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2339,48 +2355,53 @@
"uri",
"url"
],
- "time": "2018-01-16T18:04:12+00:00"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/translation",
- "version": "v3.4.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "10b32cf0eae28b9b39fe26c456c42b19854c4b84"
+ "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/10b32cf0eae28b9b39fe26c456c42b19854c4b84",
- "reference": "10b32cf0eae28b9b39fe26c456c42b19854c4b84",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
+ "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
"shasum": ""
},
"require": {
- "php": "^5.5.9|>=7.0.8",
+ "php": "^7.1.3",
+ "symfony/contracts": "^1.0.2",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
- "symfony/config": "<2.8",
+ "symfony/config": "<3.4",
"symfony/dependency-injection": "<3.4",
"symfony/yaml": "<3.4"
},
+ "provide": {
+ "symfony/translation-contracts-implementation": "1.0"
+ },
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.8|~3.0|~4.0",
+ "symfony/config": "~3.4|~4.0",
+ "symfony/console": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0",
- "symfony/intl": "^2.8.18|^3.2.5|~4.0",
+ "symfony/intl": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0"
},
"suggest": {
- "psr/log": "To use logging capability in translator",
+ "psr/log-implementation": "To use logging capability in translator",
"symfony/config": "",
"symfony/yaml": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.4-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2407,20 +2428,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2018-01-18T22:16:57+00:00"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v4.0.4",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "6d63cc74f3e2d4961411ccb77389a00332653104"
+ "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6d63cc74f3e2d4961411ccb77389a00332653104",
- "reference": "6d63cc74f3e2d4961411ccb77389a00332653104",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/85bde661b178173d85c6f11ea9d03b61d1212bb2",
+ "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2",
"shasum": ""
},
"require": {
@@ -2429,20 +2450,27 @@
"symfony/polyfill-php72": "~1.5"
},
"conflict": {
- "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+ "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+ "symfony/console": "<3.4"
},
"require-dev": {
"ext-iconv": "*",
+ "symfony/console": "~3.4|~4.0",
+ "symfony/process": "~3.4|~4.0",
"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-intl": "To show region name in time zone dump"
+ "ext-intl": "To show region name in time zone dump",
+ "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
},
+ "bin": [
+ "Resources/bin/var-dump-server"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2476,7 +2504,7 @@
"debug",
"dump"
],
- "time": "2018-01-29T09:06:29+00:00"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -2527,28 +2555,28 @@
},
{
"name": "vlucas/phpdotenv",
- "version": "v2.4.0",
+ "version": "v2.5.2",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
+ "reference": "cfd5dc225767ca154853752abc93aeec040fcf36"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
- "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/cfd5dc225767ca154853752abc93aeec040fcf36",
+ "reference": "cfd5dc225767ca154853752abc93aeec040fcf36",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
- "phpunit/phpunit": "^4.8 || ^5.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -2558,7 +2586,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause-Attribution"
+ "BSD-3-Clause"
],
"authors": [
{
@@ -2573,7 +2601,7 @@
"env",
"environment"
],
- "time": "2016-09-01T10:05:43+00:00"
+ "time": "2018-10-30T17:29:25+00:00"
}
],
"packages-dev": [
@@ -2633,16 +2661,16 @@
},
{
"name": "filp/whoops",
- "version": "2.1.14",
+ "version": "2.3.1",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6"
+ "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/c6081b8838686aa04f1e83ba7e91f78b7b2a23e6",
- "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
+ "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
"shasum": ""
},
"require": {
@@ -2650,9 +2678,9 @@
"psr/log": "^1.0.1"
},
"require-dev": {
- "mockery/mockery": "0.9.*",
+ "mockery/mockery": "^0.9 || ^1.0",
"phpunit/phpunit": "^4.8.35 || ^5.7",
- "symfony/var-dumper": "^2.6 || ^3.0"
+ "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0"
},
"suggest": {
"symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -2661,7 +2689,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "2.2-dev"
}
},
"autoload": {
@@ -2690,20 +2718,20 @@
"throwable",
"whoops"
],
- "time": "2017-11-23T18:22:44+00:00"
+ "time": "2018-10-23T09:00:00+00:00"
},
{
"name": "fzaninotto/faker",
- "version": "v1.7.1",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
- "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
+ "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
- "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
+ "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
+ "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
"shasum": ""
},
"require": {
@@ -2711,7 +2739,7 @@
},
"require-dev": {
"ext-intl": "*",
- "phpunit/phpunit": "^4.0 || ^5.0",
+ "phpunit/phpunit": "^4.8.35 || ^5.7",
"squizlabs/php_codesniffer": "^1.5"
},
"type": "library",
@@ -2740,7 +2768,7 @@
"faker",
"fixtures"
],
- "time": "2017-08-15T16:48:10+00:00"
+ "time": "2018-07-12T10:23:15+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -2792,16 +2820,16 @@
},
{
"name": "mockery/mockery",
- "version": "1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
- "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38"
+ "reference": "100633629bf76d57430b86b7098cd6beb996a35a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mockery/mockery/zipball/1bac8c362b12f522fdd1f1fa3556284c91affa38",
- "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
+ "reference": "100633629bf76d57430b86b7098cd6beb996a35a",
"shasum": ""
},
"require": {
@@ -2810,7 +2838,7 @@
"php": ">=5.6.0"
},
"require-dev": {
- "phpunit/phpunit": "~5.7|~6.1"
+ "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
},
"type": "library",
"extra": {
@@ -2839,8 +2867,8 @@
"homepage": "http://davedevelopment.co.uk"
}
],
- "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
- "homepage": "http://github.com/mockery/mockery",
+ "description": "Mockery is a simple yet flexible PHP mock object framework",
+ "homepage": "https://github.com/mockery/mockery",
"keywords": [
"BDD",
"TDD",
@@ -2853,29 +2881,32 @@
"test double",
"testing"
],
- "time": "2017-10-06T16:20:43+00:00"
+ "time": "2018-10-02T21:52:37+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.7.0",
+ "version": "1.8.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+ "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
- "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+ "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^7.1"
+ },
+ "replace": {
+ "myclabs/deep-copy": "self.version"
},
"require-dev": {
"doctrine/collections": "^1.0",
"doctrine/common": "^2.6",
- "phpunit/phpunit": "^4.1"
+ "phpunit/phpunit": "^7.1"
},
"type": "library",
"autoload": {
@@ -2898,31 +2929,33 @@
"object",
"object graph"
],
- "time": "2017-10-19T19:58:43+00:00"
+ "time": "2018-06-11T23:09:50+00:00"
},
{
"name": "nunomaduro/collision",
- "version": "v2.0.0",
+ "version": "v2.1.1",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
- "reference": "4e310ef9384f53ee8dda8736afb3cbaf320753a0"
+ "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/collision/zipball/4e310ef9384f53ee8dda8736afb3cbaf320753a0",
- "reference": "4e310ef9384f53ee8dda8736afb3cbaf320753a0",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b5feb0c0d92978ec7169232ce5d70d6da6b29f63",
+ "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63",
"shasum": ""
},
"require": {
"filp/whoops": "^2.1.4",
- "jakub-onderka/php-console-highlighter": "0.3.*",
+ "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*",
"php": "^7.1",
"symfony/console": "~2.8|~3.3|~4.0"
},
"require-dev": {
- "laravel/framework": "5.6.*",
- "phpunit/phpunit": "~7.0"
+ "laravel/framework": "5.7.*",
+ "nunomaduro/larastan": "^0.3.0",
+ "phpstan/phpstan": "^0.10",
+ "phpunit/phpunit": "~7.3"
},
"type": "library",
"extra": {
@@ -2960,26 +2993,26 @@
"php",
"symfony"
],
- "time": "2018-02-18T12:29:27+00:00"
+ "time": "2018-11-21T21:40:54+00:00"
},
{
"name": "phar-io/manifest",
- "version": "1.0.1",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
+ "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
- "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+ "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-phar": "*",
- "phar-io/version": "^1.0.1",
+ "phar-io/version": "^2.0",
"php": "^5.6 || ^7.0"
},
"type": "library",
@@ -3015,20 +3048,20 @@
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
- "time": "2017-03-05T18:14:27+00:00"
+ "time": "2018-07-08T19:23:20+00:00"
},
{
"name": "phar-io/version",
- "version": "1.0.1",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
- "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+ "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
- "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+ "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+ "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
"shasum": ""
},
"require": {
@@ -3062,7 +3095,7 @@
}
],
"description": "Library for handling version information and constraints",
- "time": "2017-03-05T17:38:23+00:00"
+ "time": "2018-07-08T19:19:57+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -3218,33 +3251,33 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.7.5",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
- "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
- "sebastian/comparator": "^1.1|^2.0",
+ "sebastian/comparator": "^1.1|^2.0|^3.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
"phpspec/phpspec": "^2.5|^3.2",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "1.8.x-dev"
}
},
"autoload": {
@@ -3277,31 +3310,31 @@
"spy",
"stub"
],
- "time": "2018-02-19T10:16:54+00:00"
+ "time": "2018-08-05T17:53:17+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "6.0.1",
+ "version": "6.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "f8ca4b604baf23dab89d87773c28cc07405189ba"
+ "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f8ca4b604baf23dab89d87773c28cc07405189ba",
- "reference": "f8ca4b604baf23dab89d87773c28cc07405189ba",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+ "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-xmlwriter": "*",
"php": "^7.1",
- "phpunit/php-file-iterator": "^1.4.2",
+ "phpunit/php-file-iterator": "^2.0",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-token-stream": "^3.0",
"sebastian/code-unit-reverse-lookup": "^1.0.1",
- "sebastian/environment": "^3.0",
+ "sebastian/environment": "^3.1 || ^4.0",
"sebastian/version": "^2.0.1",
"theseer/tokenizer": "^1.1"
},
@@ -3314,7 +3347,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.0-dev"
+ "dev-master": "6.1-dev"
}
},
"autoload": {
@@ -3340,29 +3373,32 @@
"testing",
"xunit"
],
- "time": "2018-02-02T07:01:41+00:00"
+ "time": "2018-10-31T16:06:48+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "1.4.5",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+ "reference": "050bedf145a257b1ff02746c31894800e5122946"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
- "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
+ "reference": "050bedf145a257b1ff02746c31894800e5122946",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^7.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -3377,7 +3413,7 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
+ "email": "sebastian@phpunit.de",
"role": "lead"
}
],
@@ -3387,7 +3423,7 @@
"filesystem",
"iterator"
],
- "time": "2017-11-27T13:52:08+00:00"
+ "time": "2018-09-13T20:33:42+00:00"
},
{
"name": "phpunit/php-text-template",
@@ -3481,16 +3517,16 @@
},
{
"name": "phpunit/php-token-stream",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace"
+ "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace",
- "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18",
+ "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18",
"shasum": ""
},
"require": {
@@ -3526,51 +3562,55 @@
"keywords": [
"tokenizer"
],
- "time": "2018-02-01T13:16:43+00:00"
+ "time": "2018-10-30T05:52:18+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "7.0.2",
+ "version": "7.5.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "e2f8aa21bc54b6ba218bdd4f9e0dac1e9bc3b4e9"
+ "reference": "7c89093bd00f7d5ddf0ab81dee04f801416b4944"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e2f8aa21bc54b6ba218bdd4f9e0dac1e9bc3b4e9",
- "reference": "e2f8aa21bc54b6ba218bdd4f9e0dac1e9bc3b4e9",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7c89093bd00f7d5ddf0ab81dee04f801416b4944",
+ "reference": "7c89093bd00f7d5ddf0ab81dee04f801416b4944",
"shasum": ""
},
"require": {
+ "doctrine/instantiator": "^1.1",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
- "myclabs/deep-copy": "^1.6.1",
- "phar-io/manifest": "^1.0.1",
- "phar-io/version": "^1.0",
+ "myclabs/deep-copy": "^1.7",
+ "phar-io/manifest": "^1.0.2",
+ "phar-io/version": "^2.0",
"php": "^7.1",
"phpspec/prophecy": "^1.7",
- "phpunit/php-code-coverage": "^6.0",
- "phpunit/php-file-iterator": "^1.4.3",
+ "phpunit/php-code-coverage": "^6.0.7",
+ "phpunit/php-file-iterator": "^2.0.1",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.0",
- "phpunit/phpunit-mock-objects": "^6.0",
- "sebastian/comparator": "^2.1",
+ "sebastian/comparator": "^3.0",
"sebastian/diff": "^3.0",
- "sebastian/environment": "^3.1",
+ "sebastian/environment": "^4.0",
"sebastian/exporter": "^3.1",
"sebastian/global-state": "^2.0",
"sebastian/object-enumerator": "^3.0.3",
- "sebastian/resource-operations": "^1.0",
+ "sebastian/resource-operations": "^2.0",
"sebastian/version": "^2.0.1"
},
+ "conflict": {
+ "phpunit/phpunit-mock-objects": "*"
+ },
"require-dev": {
"ext-pdo": "*"
},
"suggest": {
+ "ext-soap": "*",
"ext-xdebug": "*",
"phpunit/php-invoker": "^2.0"
},
@@ -3580,7 +3620,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "7.0-dev"
+ "dev-master": "7.5-dev"
}
},
"autoload": {
@@ -3606,63 +3646,7 @@
"testing",
"xunit"
],
- "time": "2018-02-26T07:03:12+00:00"
- },
- {
- "name": "phpunit/phpunit-mock-objects",
- "version": "6.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "e3249dedc2d99259ccae6affbc2684eac37c2e53"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/e3249dedc2d99259ccae6affbc2684eac37c2e53",
- "reference": "e3249dedc2d99259ccae6affbc2684eac37c2e53",
- "shasum": ""
- },
- "require": {
- "doctrine/instantiator": "^1.0.5",
- "php": "^7.1",
- "phpunit/php-text-template": "^1.2.1",
- "sebastian/exporter": "^3.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^7.0"
- },
- "suggest": {
- "ext-soap": "*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "6.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Mock Object library for PHPUnit",
- "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
- "keywords": [
- "mock",
- "xunit"
- ],
- "time": "2018-02-15T05:27:38+00:00"
+ "time": "2019-01-15T08:19:08+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -3711,30 +3695,30 @@
},
{
"name": "sebastian/comparator",
- "version": "2.1.3",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+ "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
- "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+ "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
"shasum": ""
},
"require": {
- "php": "^7.0",
- "sebastian/diff": "^2.0 || ^3.0",
+ "php": "^7.1",
+ "sebastian/diff": "^3.0",
"sebastian/exporter": "^3.1"
},
"require-dev": {
- "phpunit/phpunit": "^6.4"
+ "phpunit/phpunit": "^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1.x-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -3771,20 +3755,20 @@
"compare",
"equality"
],
- "time": "2018-02-01T13:46:46+00:00"
+ "time": "2018-07-12T15:12:46+00:00"
},
{
"name": "sebastian/diff",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8"
+ "reference": "366541b989927187c4ca70490a35615d3fef2dce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/e09160918c66281713f1c324c1f4c4c3037ba1e8",
- "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
+ "reference": "366541b989927187c4ca70490a35615d3fef2dce",
"shasum": ""
},
"require": {
@@ -3827,32 +3811,32 @@
"unidiff",
"unified diff"
],
- "time": "2018-02-01T13:45:15+00:00"
+ "time": "2018-06-10T07:54:39+00:00"
},
{
"name": "sebastian/environment",
- "version": "3.1.0",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
+ "reference": "4a43e9af57b4afa663077b9bc85255dbc6e8a2bd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
- "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4a43e9af57b4afa663077b9bc85255dbc6e8a2bd",
+ "reference": "4a43e9af57b4afa663077b9bc85255dbc6e8a2bd",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": "^7.1"
},
"require-dev": {
- "phpunit/phpunit": "^6.1"
+ "phpunit/phpunit": "^7.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1.x-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -3877,7 +3861,7 @@
"environment",
"hhvm"
],
- "time": "2017-07-01T08:51:00+00:00"
+ "time": "2019-01-28T15:26:03+00:00"
},
{
"name": "sebastian/exporter",
@@ -4144,25 +4128,25 @@
},
{
"name": "sebastian/resource-operations",
- "version": "1.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+ "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
- "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+ "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
"shasum": ""
},
"require": {
- "php": ">=5.6.0"
+ "php": "^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -4182,7 +4166,7 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "time": "2015-07-28T20:34:47+00:00"
+ "time": "2018-10-04T04:07:39+00:00"
},
{
"name": "sebastian/version",
@@ -4229,16 +4213,16 @@
},
{
"name": "symfony/thanks",
- "version": "v1.0.6",
+ "version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/thanks.git",
- "reference": "9474ce305253c2f0bc20322ff8e9973cf25c9a94"
+ "reference": "9474a631b52737c623b6aeba22f00bbc003251da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/thanks/zipball/9474ce305253c2f0bc20322ff8e9973cf25c9a94",
- "reference": "9474ce305253c2f0bc20322ff8e9973cf25c9a94",
+ "url": "https://api.github.com/repos/symfony/thanks/zipball/9474a631b52737c623b6aeba22f00bbc003251da",
+ "reference": "9474a631b52737c623b6aeba22f00bbc003251da",
"shasum": ""
},
"require": {
@@ -4268,7 +4252,7 @@
}
],
"description": "Give thanks (in the form of a GitHub â) to your fellow PHP package maintainers (not limited to Symfony components)!",
- "time": "2018-02-02T13:47:40+00:00"
+ "time": "2018-08-24T14:08:13+00:00"
},
{
"name": "theseer/tokenizer",
@@ -4312,20 +4296,21 @@
},
{
"name": "webmozart/assert",
- "version": "1.3.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0"
+ "php": "^5.3.3 || ^7.0",
+ "symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"phpunit/phpunit": "^4.6",
@@ -4358,7 +4343,7 @@
"check",
"validate"
],
- "time": "2018-01-29T19:49:41+00:00"
+ "time": "2018-12-25T11:19:39+00:00"
}
],
"aliases": [],
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 585e57f4862c59104ee7dc943aa40f83bdace6b8..2d60117130c3d9e573bbc64a6574de2bc9dee19d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,4 +1,4 @@
{
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css"
-}
\ No newline at end of file
+}
diff --git a/resources/views/dosen/create_seminartesis.blade.php b/resources/views/dosen/create_seminartesis.blade.php
index 5e0e8244b8694b23d83d580b04dfe16b3274f3a5..69f7dd8d2ea9032919ca0e1638687661ece4625a 100644
--- a/resources/views/dosen/create_seminartesis.blade.php
+++ b/resources/views/dosen/create_seminartesis.blade.php
@@ -31,15 +31,38 @@
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
Tanggal
</label>
- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control" >
+ <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control" > -->
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+ <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1"
+ />
+ <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+
</div>
- <div class="form-group row col-md-12">
+ <!-- <div class="form-group row col-md-12">
<label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
Waktu
</label>
<input type="time" id="haritgl" name="waktu" class="col-md-8 form-control" >
- </div>
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+ <input name="waktu" id="haritgl" type="text" class="col-md-8 form-control datetimepicker-input" data-target="#datetimepicker2"/>
+ <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+ <span class="fa fa-clock-o"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div> -->
+
<div class="form-group row col-md-12">
<label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
@@ -61,3 +84,4 @@
</div>
</div>
@endsection
+
diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index ad3adb1de856ef606a408c523222ee3c001a9fa9..50446c4266782a532e926b3ef3a13a78cd2f721f 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -208,16 +208,25 @@
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
Tanggal
</label>
- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input" value="{{$sidangTesis->tanggal}}" >
+ <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input" value="{{$sidangTesis->tanggal}}" > -->
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+ <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input" data-target="#datetimepicker2"
+ value="{{date("m/d/Y", strtotime($sidangTesis->tanggal))}} {{date("g:i A", strtotime($sidangTesis->jam))}}" />
+ <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
</div>
-
- <div class="form-group row col-md-12">
+ <!-- <div class="form-group row col-md-12">
<label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
Waktu
</label>
<input type="time" id="haritgl" name="waktu" class="col-md-8 form-control new-input" value="{{$sidangTesis->jam}}">
- </div>
-
+ </div> -->
<div class="form-group row col-md-12">
<label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
Tempat
@@ -364,16 +373,25 @@
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
Tanggal
</label>
- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->hari}}" >
+ <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->hari}}" > -->
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+ <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input-seminar" data-target="#datetimepicker1"
+ value="{{date("m/d/Y", strtotime($seminarTesis->hari))}} {{date("g:i A", strtotime($seminarTesis->waktu))}}" />
+ <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
</div>
-
- <div class="form-group row col-md-12">
+ <!-- <div class="form-group row col-md-12">
<label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
Waktu
</label>
<input type="time" id="haritgl" name="waktu" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->waktu}}">
- </div>
-
+ </div> -->
<div class="form-group row col-md-12">
<label for="tempat" class="col-md-4 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
Tempat
diff --git a/resources/views/dosen/index.blade.php b/resources/views/dosen/index.blade.php
index 20bea8feb5b902d4d4ce84880a6fb58b04cb6873..ac24338f0757cad23beec057344ba66bbfe28ba8 100644
--- a/resources/views/dosen/index.blade.php
+++ b/resources/views/dosen/index.blade.php
@@ -10,7 +10,19 @@
function Button_Click() {
document.getElementById('buttondetail').value = statejs;
statejs = 1;
-}
+ }
+
+ $(function () {
+ $('#datetimepicker1').datetimepicker({
+ format: 'L'
+ });
+ });
+
+ $(function () {
+ $('#datetimepicker2').datetimepicker({
+ format: 'LT'
+ });
+ });
</script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<div class="container">
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index d73821955b2fa786f1c746f52da6fd17f6a8ddec..c66343328bd4ec0e106376461df691f45aa444c7 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -12,7 +12,16 @@
<title>{{ config('app.name') }} - @yield('title')</title>
<!-- Styles -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment-with-locales.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>
+ <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" rel="stylesheet"/>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js"></script>
+ <script src="https://rawgit.com/tempusdominus/bootstrap-4/master/build/js/tempusdominus-bootstrap-4.js"></script>
+ <link href="https://rawgit.com/tempusdominus/bootstrap-4/master/build/css/tempusdominus-bootstrap-4.css" rel="stylesheet"/>
+ <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"/>
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
+
</head>
<body>
<div id="app">
diff --git a/resources/views/mahasiswa/daftar_sidang_tesis.blade.php b/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
index aef64f23324c15f5a8fed7a5125641c9291202ae..34c916c9e82d32f31b1422adf91e7225d096b9dd 100644
--- a/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
+++ b/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
@@ -28,6 +28,7 @@
<input type="datetime-local" id="tanggal_seminar_tesis" name="tanggal_seminar_tesis" class="form-control col-md-8 "
value="{{date("Y-m-d", strtotime($seminarTesis->hari))}}T{{date("H:i", strtotime($seminarTesis->waktu))}}"
required disabled>
+
</div>
<div class="form-group row col-md-12">
<label for="" class="col-md-4 col-form-label text-md-right text-center">Dokumen Evaluasi Diri</label>
@@ -151,7 +152,5 @@
}
}
});
-
-
</script>
@endsection
diff --git a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
index a7ba8d6eac4accba2a5c5d30a4a881a46f72d19a..256298eec4ca9dd7d2375cd4bae7d957e59c1e20 100644
--- a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
+++ b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
@@ -66,7 +66,18 @@
@endif
<div class="form-group row col-md-12">
<label for="tanggal_waktu" class="col-md-4 col-form-label text-md-right text-center">Waktu Bimbingan<sup>*</sup></label>
- <input type="datetime-local" id="tanggal_waktu" name="tanggal_waktu" class="form-control col-md-8 " value="{{$tgl}}" required>
+ <!-- <input type="datetime-local" id="tanggal_waktu" name="tanggal_waktu" class="form-control col-md-8 " value="{{$tgl}}" required> -->
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+ <input name="tanggal_waktu" id="tanggal_waktu" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1"
+ required />
+ <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
</div>
<div class="form-group row col-md-12">
<label for="hasil_dan_diskusi" class="col-md-4 col-form-label text-md-right text-center ">Hasil dan Diskusi<sup>*</sup></label>
@@ -78,7 +89,17 @@
</div>
<div class="form-group row col-md-12">
<label for="waktu_bimbingan_selanjutnya" class="col-md-4 col-form-label text-md-right text-center">Waktu Bimbingan Selanjutnya</label>
- <input type="datetime-local" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 " value="{{$tgl_selanjutnya}}">
+ <!-- <input type="datetime-local" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 " value="{{$tgl_selanjutnya}}"> -->
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+ <input name="waktu_bimbingan_selanjutnya" id="waktu_bimbingan_selanjutnya" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker2" />
+ <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
</div>
</div>
diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php
index 3db9c117ccf743e14ca02abc671be3363fe71edb..c0d9b996192d93c85f590f53d7f7320bc152507d 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -165,11 +165,25 @@
<input type="hidden" name="mahasiswa" value="{{$mahasiswa->id}}">
<div class="row justify-content-center">
<div>
- <input type="datetime-local" class="form-control" name="date"
- @if($seminarTopik)
- value="{{date("Y-m-d\TH:i:s", strtotime($seminarTopik->schedule))}}"
- @endif
- >
+ <!-- <input type="datetime-local" class="form-control" name="date"
+ /> -->
+ <!-- @if($seminarTopik)
+ value="{{date("Y-m-d\TH:i:s", strtotime($seminarTopik->schedule))}}"
+ @endif -->
+ <div class="container">
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker3" data-target-input="nearest">
+ <input name="date" id="date" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker3"
+ />
+ <span class="input-group-addon" data-target="#datetimepicker3" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
<button class="btn btn-blue ml-4">
Tetapkan
@@ -487,11 +501,24 @@
<div class="form-group row mt-2">
<label for="name" class="col-md-4 col-form-label text-md-right">Jadwal Seminar Proposal</label>
<div class="col-md-6">
- <input type="datetime-local" class="form-control" name="date"
+ <!-- <input type="datetime-local" class="form-control" name="date"
@if($seminarProposal)
value="{{date("Y-m-d\TH:i:s", strtotime($seminarProposal->schedule))}}"
@endif
- >
+ > -->
+ <div class="container">
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker4" data-target-input="nearest">
+ <input name="date" id="date" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker4"
+ />
+ <span class="input-group-addon" data-target="#datetimepicker4" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<div class="form-group row mt-2">
@@ -774,15 +801,26 @@
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
Tanggal
</label>
- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->hari}}" >
+ <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->hari}}" > -->
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+ <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input-seminar" data-target="#datetimepicker1"
+ value="{{date("m/d/Y", strtotime($seminarTesis->hari))}} {{date("g:i A", strtotime($seminarTesis->waktu))}}" />
+ <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
</div>
- <div class="form-group row col-md-12">
+ <!-- <div class="form-group row col-md-12">
<label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
Waktu
</label>
<input type="time" id="haritgl" name="waktu" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->waktu}}">
- </div>
+ </div> -->
<div class="form-group row col-md-12">
<label for="tempat" class="col-md-4 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
@@ -1570,15 +1608,26 @@
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
Tanggal
</label>
- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input" value="{{$sidangTesis->tanggal}}" >
+ <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input" value="{{$sidangTesis->tanggal}}" > -->
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+ <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input" data-target="#datetimepicker2"
+ value="{{date("m/d/Y", strtotime($sidangTesis->tanggal))}} {{date("g:i A", strtotime($sidangTesis->jam))}}" />
+ <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
</div>
- <div class="form-group row col-md-12">
+ <!-- <div class="form-group row col-md-12">
<label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
Waktu
</label>
<input type="time" id="haritgl" name="waktu" class="col-md-8 form-control new-input" value="{{$sidangTesis->jam}}">
- </div>
+ </div> -->
<div class="form-group row col-md-12">
<label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
diff --git a/resources/views/manajer/penjadwalan.blade.php b/resources/views/manajer/penjadwalan.blade.php
index 0ce964849c3d79d728c61a7572b2510783b90139..7c6d1ea437c0038abe5172d95c30a7c6a561f221 100644
--- a/resources/views/manajer/penjadwalan.blade.php
+++ b/resources/views/manajer/penjadwalan.blade.php
@@ -69,6 +69,19 @@
<input type="hidden" id="id{{$item->topic->mahasiswa_id}}" name="id{{$item->topic->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->topic->mahasiswa_id}}">
<input type="hidden" id="tp{{$item->topic->mahasiswa_id}}" name="tp{{$item->topic->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->topic_id}}">
<input type="datetime-local" id="sch{{$item->topic->mahasiswa_id}}" name="sch{{$item->topic->mahasiswa_id}}" class="form-control col-lg-12 " value="" onkeyup="updateSaveButton()">
+ <!-- <div class="container">
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+ <input name="sch{{$item->topic->mahasiswa_id}}" id="sch{{$item->topic->mahasiswa_id}}" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1"
+ onkeyup="updateSaveButton() />
+ <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div> -->
</td>
</tr>
@php($count++)
@@ -97,6 +110,19 @@
<input type="hidden" id="id{{$item->mahasiswa_id}}" name="id{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->mahasiswa_id}}">
<input type="hidden" id="tp{{$item->mahasiswa_id}}" name="tp{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->topik_id}}">
<input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="{{$tgl}}" onkeyup="updateSaveButton()">
+ <!-- <div class="container">
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+ <input name="sch{{$item->mahasiswa_id}}" id="sch{{$item->mahasiswa_id}}" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker2"
+ value={{$tgl}} onkeyup="updateSaveButton() />
+ <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div> -->
</td>
</tr>
@php($no++)
@@ -177,6 +203,19 @@
<input type="hidden" id="id{{$item->mahasiswa_id}}" name="id{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->mahasiswa_id}}">
<input type="hidden" id="tp{{$item->mahasiswa_id}}" name="tp{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id}}">
<input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="" onkeyup="updateSaveButton2()">
+ <!-- <div class="container">
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker3" data-target-input="nearest">
+ <input name="sch{{$item->mahasiswa_id}}" id="sch{{$item->mahasiswa_id}}" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker3"
+ onkeyup="updateSaveButton2() />
+ <span class="input-group-addon" data-target="#datetimepicker3" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div> -->
</td>
</tr>
@php($count++)
@@ -205,6 +244,19 @@
<input type="hidden" id="pb{{$item->mahasiswa_id}}" name="pb{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id_dosen_pembimbing_2}}">
<input type="hidden" id="pg{{$item->mahasiswa_id}}" name="pg{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id_dosen_penguji}}">
<input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="{{$tgl}}" onkeyup="updateSaveButton2()">
+ <!-- <div class="container">
+ <div class="row">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker4" data-target-input="nearest">
+ <input name="sch{{$item->mahasiswa_id}}" id="sch{{$item->mahasiswa_id}}" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker4"
+ onkeyup="updateSaveButton2() />
+ <span class="input-group-addon" data-target="#datetimepicker4" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div> -->
</td>
</tr>
@php($no++)