diff --git a/CHANGELOG.md b/CHANGELOG.md index 798f69a..afa5619 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.2] - (05/02/2020) + +### Changed +- Updated Dependencies ## [1.0.1] - (17/01/2020) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 42462ca..d932b7d 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -71,10 +71,6 @@ protected function create(array $data) $controlUser = app(\BristolSU\ControlDB\Contracts\Repositories\User::class)->create($dataUser->id()); $databaseUser = app(UserRepository::class)->create([ - 'forename' => $data['first_name'], - 'surname' => $data['last_name'], - 'email' => $data['email'], - 'student_id' => '', 'control_id' => $controlUser->id() ]); $databaseUser->email_verified_at = Carbon::now(); diff --git a/composer.json b/composer.json index 488ab1d..8e74395 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "license": "GPL-3.0-or-later", "require": { "php": "^7.2", - "bristol-su/support": "^1.0", + "bristol-su/support": "^2.0", "bristol-su/upload-file": "dev-master", "bristol-su/typeform": "dev-master", "fideloper/proxy": "^4.0", diff --git a/composer.lock b/composer.lock index c72f8de..128fae0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,26 +4,30 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "70f64334f333218e09e28c341eb66cdb", + "content-hash": "c30790c8650e43ca68588f3f3191ca29", "packages": [ { "name": "bristol-su/control", - "version": "dev-master", + "version": "v1.2", "source": { "type": "git", "url": "https://github.com/bristol-su/control.git", - "reference": "eb8eaceca88b59df8ac0d49846320c734be4920f" + "reference": "ece0a7e5941c5caaba5b72e3edde954fc396ee72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bristol-su/control/zipball/eb8eaceca88b59df8ac0d49846320c734be4920f", - "reference": "eb8eaceca88b59df8ac0d49846320c734be4920f", + "url": "https://api.github.com/repos/bristol-su/control/zipball/ece0a7e5941c5caaba5b72e3edde954fc396ee72", + "reference": "ece0a7e5941c5caaba5b72e3edde954fc396ee72", "shasum": "" }, "require": { - "orchestra/testbench": "^4.0", + "ext-json": "*", "php": "^7.2" }, + "require-dev": { + "orchestra/testbench": "^4.0", + "phpstan/phpstan": "^0.12.8" + }, "type": "library", "extra": { "laravel": { @@ -53,24 +57,25 @@ } ], "description": "An implementation of the control contracts", - "time": "2020-01-16T14:33:10+00:00" + "time": "2020-02-04T22:25:16+00:00" }, { "name": "bristol-su/support", - "version": "v1.0.1", + "version": "v2.1", "source": { "type": "git", "url": "https://github.com/bristol-su/support.git", - "reference": "e4a717db98e7de93e20d91b98b486eb5fc70da12" + "reference": "da80354f8f30e7fdbd7519703db176692d994c3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bristol-su/support/zipball/e4a717db98e7de93e20d91b98b486eb5fc70da12", - "reference": "e4a717db98e7de93e20d91b98b486eb5fc70da12", + "url": "https://api.github.com/repos/bristol-su/support/zipball/da80354f8f30e7fdbd7519703db176692d994c3a", + "reference": "da80354f8f30e7fdbd7519703db176692d994c3a", "shasum": "" }, "require": { - "bristol-su/control": "dev-master", + "bristol-su/control": "^1.0", + "doctrine/dbal": "^2.10", "ext-json": "*", "laracasts/utilities": "^3.0", "laravel/framework": "^6.0", @@ -122,7 +127,7 @@ "portal", "sdk" ], - "time": "2020-01-23T20:37:15+00:00" + "time": "2020-02-05T16:31:28+00:00" }, { "name": "bristol-su/typeform", @@ -130,16 +135,16 @@ "source": { "type": "git", "url": "https://github.com/bristol-su/typeform.git", - "reference": "9141b9f64ec36e68f3a0befd22cd8169d2ecc9fc" + "reference": "7cc390161689c18d6b0017b04363e7844f87db80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bristol-su/typeform/zipball/9141b9f64ec36e68f3a0befd22cd8169d2ecc9fc", - "reference": "9141b9f64ec36e68f3a0befd22cd8169d2ecc9fc", + "url": "https://api.github.com/repos/bristol-su/typeform/zipball/7cc390161689c18d6b0017b04363e7844f87db80", + "reference": "7cc390161689c18d6b0017b04363e7844f87db80", "shasum": "" }, "require": { - "bristol-su/support": "^1.0", + "bristol-su/support": "^2.0", "bristol-su/typeform-service": "dev-master", "ext-json": "*", "php": "^7.2", @@ -171,7 +176,7 @@ "email": "toby.twigger@bristol.ac.uk" } ], - "time": "2020-01-23T21:07:29+00:00" + "time": "2020-02-04T23:25:41+00:00" }, { "name": "bristol-su/typeform-service", @@ -179,16 +184,16 @@ "source": { "type": "git", "url": "https://github.com/bristol-su/typeform-service.git", - "reference": "f75a1d75764c5edddcccbb795b444d2e50e87900" + "reference": "2a741a48ce4440fc324ec6d69d66ff5ec3c379f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bristol-su/typeform-service/zipball/f75a1d75764c5edddcccbb795b444d2e50e87900", - "reference": "f75a1d75764c5edddcccbb795b444d2e50e87900", + "url": "https://api.github.com/repos/bristol-su/typeform-service/zipball/2a741a48ce4440fc324ec6d69d66ff5ec3c379f4", + "reference": "2a741a48ce4440fc324ec6d69d66ff5ec3c379f4", "shasum": "" }, "require": { - "bristol-su/support": "^1.0", + "bristol-su/support": "^2.0", "ext-json": "*", "php": "^7.2" }, @@ -219,7 +224,7 @@ } ], "description": "A third party service for typeform", - "time": "2020-01-23T21:08:00+00:00" + "time": "2020-02-04T23:25:47+00:00" }, { "name": "bristol-su/upload-file", @@ -227,16 +232,16 @@ "source": { "type": "git", "url": "https://github.com/bristol-su/upload-file.git", - "reference": "7d6e7b9d79f305bad410c9902418074c1e504ebf" + "reference": "f24b4c9101b9e411a49619e9f30a0faa19a135bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bristol-su/upload-file/zipball/7d6e7b9d79f305bad410c9902418074c1e504ebf", - "reference": "7d6e7b9d79f305bad410c9902418074c1e504ebf", + "url": "https://api.github.com/repos/bristol-su/upload-file/zipball/f24b4c9101b9e411a49619e9f30a0faa19a135bd", + "reference": "f24b4c9101b9e411a49619e9f30a0faa19a135bd", "shasum": "" }, "require": { - "bristol-su/support": "^1.0", + "bristol-su/support": "^2.0", "php": "^7.2" }, "require-dev": { @@ -265,7 +270,7 @@ "email": "toby.twigger@bristol.ac.uk" } ], - "time": "2020-01-23T21:07:55+00:00" + "time": "2020-02-04T23:25:34+00:00" }, { "name": "defuse/php-encryption", @@ -363,6 +368,256 @@ "description": "implementation of xdg base directory specification for php", "time": "2019-12-04T15:06:13+00:00" }, + { + "name": "doctrine/cache", + "version": "1.10.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/cache.git", + "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62", + "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62", + "shasum": "" + }, + "require": { + "php": "~7.1" + }, + "conflict": { + "doctrine/common": ">2.2,<2.4" + }, + "require-dev": { + "alcaeus/mongo-php-adapter": "^1.1", + "doctrine/coding-standard": "^6.0", + "mongodb/mongodb": "^1.1", + "phpunit/phpunit": "^7.0", + "predis/predis": "~1.0" + }, + "suggest": { + "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.", + "homepage": "https://www.doctrine-project.org/projects/cache.html", + "keywords": [ + "abstraction", + "apcu", + "cache", + "caching", + "couchdb", + "memcached", + "php", + "redis", + "xcache" + ], + "time": "2019-11-29T15:36:20+00:00" + }, + { + "name": "doctrine/dbal", + "version": "v2.10.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal.git", + "reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8", + "reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8", + "shasum": "" + }, + "require": { + "doctrine/cache": "^1.0", + "doctrine/event-manager": "^1.0", + "ext-pdo": "*", + "php": "^7.2" + }, + "require-dev": { + "doctrine/coding-standard": "^6.0", + "jetbrains/phpstorm-stubs": "^2019.1", + "phpstan/phpstan": "^0.11.3", + "phpunit/phpunit": "^8.4.1", + "symfony/console": "^2.0.5|^3.0|^4.0|^5.0" + }, + "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.10.x-dev", + "dev-develop": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "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": [ + "abstraction", + "database", + "db2", + "dbal", + "mariadb", + "mssql", + "mysql", + "oci8", + "oracle", + "pdo", + "pgsql", + "postgresql", + "queryobject", + "sasql", + "sql", + "sqlanywhere", + "sqlite", + "sqlserver", + "sqlsrv" + ], + "time": "2020-01-04T12:56:21+00:00" + }, + { + "name": "doctrine/event-manager", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/event-manager.git", + "reference": "629572819973f13486371cb611386eb17851e85c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c", + "reference": "629572819973f13486371cb611386eb17851e85c", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "conflict": { + "doctrine/common": "<2.9@dev" + }, + "require-dev": { + "doctrine/coding-standard": "^6.0", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.", + "homepage": "https://www.doctrine-project.org/projects/event-manager.html", + "keywords": [ + "event", + "event dispatcher", + "event manager", + "event system", + "events" + ], + "time": "2019-11-10T09:48:07+00:00" + }, { "name": "doctrine/inflector", "version": "1.3.1", @@ -1330,16 +1585,16 @@ }, { "name": "laravel/framework", - "version": "v6.12.0", + "version": "v6.14.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "8e189a8dee7ff76bf50acb7e80aa1a36afaf54d4" + "reference": "9e78f1aeb2c60bd7badcbafc352a9a2c5863c60c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/8e189a8dee7ff76bf50acb7e80aa1a36afaf54d4", - "reference": "8e189a8dee7ff76bf50acb7e80aa1a36afaf54d4", + "url": "https://api.github.com/repos/laravel/framework/zipball/9e78f1aeb2c60bd7badcbafc352a9a2c5863c60c", + "reference": "9e78f1aeb2c60bd7badcbafc352a9a2c5863c60c", "shasum": "" }, "require": { @@ -1427,9 +1682,9 @@ "ext-posix": "Required to use all features of the queue worker.", "ext-redis": "Required to use the Redis cache and queue drivers.", "filp/whoops": "Required for friendly error pages in development (^2.4).", - "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).", + "fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).", "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0).", - "laravel/tinker": "Required to use the tinker console command (^1.0).", + "laravel/tinker": "Required to use the tinker console command (^2.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", @@ -1473,20 +1728,20 @@ "framework", "laravel" ], - "time": "2020-01-21T15:10:03+00:00" + "time": "2020-02-04T14:38:06+00:00" }, { "name": "laravel/passport", - "version": "v8.2.0", + "version": "v8.3.1", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "4c163b7821d29b6166fc2e93ad7649428b51c6db" + "reference": "98456cb16efd2ef7b41797e0a8559c9d8b4112f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/4c163b7821d29b6166fc2e93ad7649428b51c6db", - "reference": "4c163b7821d29b6166fc2e93ad7649428b51c6db", + "url": "https://api.github.com/repos/laravel/passport/zipball/98456cb16efd2ef7b41797e0a8559c9d8b4112f8", + "reference": "98456cb16efd2ef7b41797e0a8559c9d8b4112f8", "shasum": "" }, "require": { @@ -1545,20 +1800,20 @@ "oauth", "passport" ], - "time": "2020-01-07T19:25:00+00:00" + "time": "2020-01-29T13:25:24+00:00" }, { "name": "laravel/tinker", - "version": "v2.1.0", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "d8ce361f2fd979c03e5f66c79d4a95a1c1e68640" + "reference": "37579c93271ec30ef099dd633ec7c2de5e5fb112" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/d8ce361f2fd979c03e5f66c79d4a95a1c1e68640", - "reference": "d8ce361f2fd979c03e5f66c79d4a95a1c1e68640", + "url": "https://api.github.com/repos/laravel/tinker/zipball/37579c93271ec30ef099dd633ec7c2de5e5fb112", + "reference": "37579c93271ec30ef099dd633ec7c2de5e5fb112", "shasum": "" }, "require": { @@ -1570,7 +1825,8 @@ "symfony/var-dumper": "^4.0|^5.0" }, "require-dev": { - "phpunit/phpunit": "^8.0" + "mockery/mockery": "^1.3.1", + "phpunit/phpunit": "^8.0|^9.0" }, "suggest": { "illuminate/database": "The Illuminate Database package (^6.0|^7.0)." @@ -1608,7 +1864,7 @@ "laravel", "psysh" ], - "time": "2020-01-14T16:58:39+00:00" + "time": "2020-02-05T15:00:44+00:00" }, { "name": "lcobucci/jwt", @@ -1853,16 +2109,16 @@ }, { "name": "league/flysystem", - "version": "1.0.63", + "version": "1.0.64", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6" + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8132daec326565036bc8e8d1876f77ec183a7bd6", - "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d13c43dbd4b791f815215959105a008515d1a2e0", + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0", "shasum": "" }, "require": { @@ -1874,7 +2130,7 @@ }, "require-dev": { "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7.10" + "phpunit/phpunit": "^5.7.26" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -1933,7 +2189,7 @@ "sftp", "storage" ], - "time": "2020-01-04T16:30:31+00:00" + "time": "2020-02-05T18:14:17+00:00" }, { "name": "league/oauth2-server", @@ -2391,22 +2647,22 @@ }, { "name": "orchestra/testbench", - "version": "v4.5.0", + "version": "v4.6.0", "source": { "type": "git", "url": "https://github.com/orchestral/testbench.git", - "reference": "eb373f3e8d3b8ebc464f878db41ecc281a8c7547" + "reference": "0b537bf4d34a8da92759b79fcbe371e10b0135f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench/zipball/eb373f3e8d3b8ebc464f878db41ecc281a8c7547", - "reference": "eb373f3e8d3b8ebc464f878db41ecc281a8c7547", + "url": "https://api.github.com/repos/orchestral/testbench/zipball/0b537bf4d34a8da92759b79fcbe371e10b0135f0", + "reference": "0b537bf4d34a8da92759b79fcbe371e10b0135f0", "shasum": "" }, "require": { "laravel/framework": "^6.9", "mockery/mockery": "~1.2.3 || ^1.3.1", - "orchestra/testbench-core": "^4.5", + "orchestra/testbench-core": "^4.6", "php": ">=7.2", "phpunit/phpunit": "^8.3 || ^9.0" }, @@ -2437,24 +2693,24 @@ "orchestral", "testing" ], - "time": "2020-01-07T22:50:40+00:00" + "time": "2020-01-29T23:03:49+00:00" }, { "name": "orchestra/testbench-core", - "version": "v4.5.1", + "version": "v4.6.0", "source": { "type": "git", "url": "https://github.com/orchestral/testbench-core.git", - "reference": "24ae854ca7a9895162557e6d113e64d0cb0667a3" + "reference": "6e6f1c330d37563d2ecca125d6b672e752ab88b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/24ae854ca7a9895162557e6d113e64d0cb0667a3", - "reference": "24ae854ca7a9895162557e6d113e64d0cb0667a3", + "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/6e6f1c330d37563d2ecca125d6b672e752ab88b5", + "reference": "6e6f1c330d37563d2ecca125d6b672e752ab88b5", "shasum": "" }, "require": { - "fzaninotto/faker": "^1.4", + "fzaninotto/faker": "^1.9.1", "php": ">=7.2" }, "require-dev": { @@ -2502,7 +2758,7 @@ "orchestral", "testing" ], - "time": "2020-01-21T03:11:28+00:00" + "time": "2020-01-29T22:59:50+00:00" }, { "name": "paragonie/random_compat", @@ -4473,16 +4729,16 @@ }, { "name": "symfony/console", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f" + "reference": "f512001679f37e6a042b51897ed24a2f05eba656" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f", - "reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f", + "url": "https://api.github.com/repos/symfony/console/zipball/f512001679f37e6a042b51897ed24a2f05eba656", + "reference": "f512001679f37e6a042b51897ed24a2f05eba656", "shasum": "" }, "require": { @@ -4545,11 +4801,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2020-01-10T21:54:01+00:00" + "time": "2020-01-25T12:44:29+00:00" }, { "name": "symfony/css-selector", - "version": "v5.0.3", + "version": "v5.0.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -4602,16 +4858,16 @@ }, { "name": "symfony/debug", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "89c3fd5c299b940333bc6fe9f1b8db1b0912c759" + "reference": "20236471058bbaa9907382500fc14005c84601f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/89c3fd5c299b940333bc6fe9f1b8db1b0912c759", - "reference": "89c3fd5c299b940333bc6fe9f1b8db1b0912c759", + "url": "https://api.github.com/repos/symfony/debug/zipball/20236471058bbaa9907382500fc14005c84601f0", + "reference": "20236471058bbaa9907382500fc14005c84601f0", "shasum": "" }, "require": { @@ -4654,20 +4910,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2020-01-08T17:29:02+00:00" + "time": "2020-01-25T12:44:29+00:00" }, { "name": "symfony/error-handler", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "a59789092e40ad08465dc2cdc55651be503d0d5a" + "reference": "d2721499ffcaf246a743e01cdf6696d3d5dd74c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/a59789092e40ad08465dc2cdc55651be503d0d5a", - "reference": "a59789092e40ad08465dc2cdc55651be503d0d5a", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/d2721499ffcaf246a743e01cdf6696d3d5dd74c1", + "reference": "d2721499ffcaf246a743e01cdf6696d3d5dd74c1", "shasum": "" }, "require": { @@ -4710,11 +4966,11 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "time": "2020-01-08T17:29:02+00:00" + "time": "2020-01-27T09:48:47+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -4842,7 +5098,7 @@ }, { "name": "symfony/finder", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -4891,16 +5147,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "c33998709f3fe9b8e27e0277535b07fbf6fde37a" + "reference": "491a20dfa87e0b3990170593bc2de0bb34d828a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c33998709f3fe9b8e27e0277535b07fbf6fde37a", - "reference": "c33998709f3fe9b8e27e0277535b07fbf6fde37a", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/491a20dfa87e0b3990170593bc2de0bb34d828a5", + "reference": "491a20dfa87e0b3990170593bc2de0bb34d828a5", "shasum": "" }, "require": { @@ -4942,20 +5198,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2020-01-04T13:00:46+00:00" + "time": "2020-01-31T09:11:17+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "16f2aa3c54b08483fba5375938f60b1ff83b6bd2" + "reference": "62116a9c8fb15faabb158ad9cb785c353c2572e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/16f2aa3c54b08483fba5375938f60b1ff83b6bd2", - "reference": "16f2aa3c54b08483fba5375938f60b1ff83b6bd2", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/62116a9c8fb15faabb158ad9cb785c353c2572e5", + "reference": "62116a9c8fb15faabb158ad9cb785c353c2572e5", "shasum": "" }, "require": { @@ -5032,11 +5288,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2020-01-21T13:23:17+00:00" + "time": "2020-01-31T12:45:06+00:00" }, { "name": "symfony/mime", - "version": "v5.0.3", + "version": "v5.0.4", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", @@ -5449,7 +5705,7 @@ }, { "name": "symfony/process", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -5563,7 +5819,7 @@ }, { "name": "symfony/routing", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", @@ -5697,7 +5953,7 @@ }, { "name": "symfony/translation", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", @@ -5830,16 +6086,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.3", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "7cfa470bc3b1887a7b2a47c0a702a84ad614fa92" + "reference": "46b53fd714568af343953c039ff47b67ce8af8d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7cfa470bc3b1887a7b2a47c0a702a84ad614fa92", - "reference": "7cfa470bc3b1887a7b2a47c0a702a84ad614fa92", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46b53fd714568af343953c039ff47b67ce8af8d6", + "reference": "46b53fd714568af343953c039ff47b67ce8af8d6", "shasum": "" }, "require": { @@ -5902,7 +6158,7 @@ "debug", "dump" ], - "time": "2020-01-04T13:00:46+00:00" + "time": "2020-01-25T12:44:29+00:00" }, { "name": "theseer/tokenizer", @@ -6416,16 +6672,16 @@ }, { "name": "itsgoingd/clockwork", - "version": "v4.0.15", + "version": "v4.0.17", "source": { "type": "git", "url": "https://github.com/itsgoingd/clockwork.git", - "reference": "981a9640e9081e5dc1c2698abe35f984ed7f6b92" + "reference": "30d54ecbf0cd424594b2ae5f94a9e3d4a7c3e961" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/981a9640e9081e5dc1c2698abe35f984ed7f6b92", - "reference": "981a9640e9081e5dc1c2698abe35f984ed7f6b92", + "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/30d54ecbf0cd424594b2ae5f94a9e3d4a7c3e961", + "reference": "30d54ecbf0cd424594b2ae5f94a9e3d4a7c3e961", "shasum": "" }, "require": { @@ -6470,7 +6726,7 @@ "profiling", "slim" ], - "time": "2020-01-09T11:14:09+00:00" + "time": "2020-02-04T22:56:50+00:00" }, { "name": "laravel/ui", @@ -6595,16 +6851,16 @@ }, { "name": "scrivo/highlight.php", - "version": "v9.17.1.0", + "version": "v9.18.1.0", "source": { "type": "git", "url": "https://github.com/scrivo/highlight.php.git", - "reference": "5451a9ad6d638559cf2a092880f935c39776134e" + "reference": "a57c858cb753f543965a1e17af386a648012ed8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/5451a9ad6d638559cf2a092880f935c39776134e", - "reference": "5451a9ad6d638559cf2a092880f935c39776134e", + "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/a57c858cb753f543965a1e17af386a648012ed8f", + "reference": "a57c858cb753f543965a1e17af386a648012ed8f", "shasum": "" }, "require": { @@ -6614,8 +6870,8 @@ }, "require-dev": { "phpunit/phpunit": "^4.8|^5.7", - "symfony/finder": "^3.4", - "symfony/var-dumper": "^3.4" + "symfony/finder": "^2.8|^3.4", + "symfony/var-dumper": "^2.8|^3.4" }, "suggest": { "ext-dom": "Needed to make use of the features in the utilities namespace" @@ -6659,7 +6915,7 @@ "highlight.php", "syntax" ], - "time": "2019-12-13T21:54:06+00:00" + "time": "2020-02-03T02:19:36+00:00" } ], "aliases": [], diff --git a/database/migrations/2020_01_24_142229_create_jobs_table.php b/database/migrations/2020_01_24_142229_create_jobs_table.php new file mode 100644 index 0000000..1be9e8a --- /dev/null +++ b/database/migrations/2020_01_24_142229_create_jobs_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->string('queue')->index(); + $table->longText('payload'); + $table->unsignedTinyInteger('attempts'); + $table->unsignedInteger('reserved_at')->nullable(); + $table->unsignedInteger('available_at'); + $table->unsignedInteger('created_at'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('jobs'); + } +} diff --git a/docs/RegisterController_8php_source.html b/docs/RegisterController_8php_source.html index 84e835d..1eb18c0 100644 --- a/docs/RegisterController_8php_source.html +++ b/docs/RegisterController_8php_source.html @@ -66,7 +66,7 @@
RegisterController.php
-Go to the documentation of this file.
1 <?php
2 
3 namespace BristolSU\Playground\Http\Controllers\Auth;
4 
5 use BristolSU\Playground\Http\Controllers\Controller;
6 use BristolSU\Playground\User;
7 use BristolSU\ControlDB\Contracts\Repositories\DataUser;
8 use BristolSU\Support\User\Contracts\UserRepository;
9 use Illuminate\Foundation\Auth\RegistersUsers;
10 use Illuminate\Support\Carbon;
11 use Illuminate\Support\Facades\Hash;
12 use Illuminate\Support\Facades\Validator;
13 
14 class RegisterController extends Controller
15 {
16  /*
17  |--------------------------------------------------------------------------
18  | Register Controller
19  |--------------------------------------------------------------------------
20  |
21  | This controller handles the registration of new users as well as their
22  | validation and creation. By default this controller uses a trait to
23  | provide this functionality without requiring any additional code.
24  |
25  */
26 
27  use RegistersUsers;
28 
34  protected $redirectTo = '/';
35 
41  public function __construct()
42  {
43  $this->middleware('guest');
44  }
45 
52  protected function validator(array $data)
53  {
54  return Validator::make($data, [
55  'first_name' => ['required', 'string', 'max:255'],
56  'last_name' => ['required', 'string', 'max:255'],
57  'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
58  'password' => ['required', 'string', 'min:5', 'confirmed'],
59  ]);
60  }
61 
68  protected function create(array $data)
69  {
70  $dataUser = app(DataUser::class)->create($data['first_name'], $data['last_name'], $data['email']);
71  $controlUser = app(\BristolSU\ControlDB\Contracts\Repositories\User::class)->create($dataUser->id());
72 
73  $databaseUser = app(UserRepository::class)->create([
74  'forename' => $data['first_name'],
75  'surname' => $data['last_name'],
76  'email' => $data['email'],
77  'student_id' => '',
78  'control_id' => $controlUser->id()
79  ]);
80  $databaseUser->email_verified_at = Carbon::now();
81  $databaseUser->password = Hash::make($data['password']);
82  $databaseUser->save();
83  return $databaseUser;
84 
85  }
86 }
+Go to the documentation of this file.
1 <?php
2 
3 namespace BristolSU\Playground\Http\Controllers\Auth;
4 
5 use BristolSU\Playground\Http\Controllers\Controller;
6 use BristolSU\Playground\User;
7 use BristolSU\ControlDB\Contracts\Repositories\DataUser;
8 use BristolSU\Support\User\Contracts\UserRepository;
9 use Illuminate\Foundation\Auth\RegistersUsers;
10 use Illuminate\Support\Carbon;
11 use Illuminate\Support\Facades\Hash;
12 use Illuminate\Support\Facades\Validator;
13 
14 class RegisterController extends Controller
15 {
16  /*
17  |--------------------------------------------------------------------------
18  | Register Controller
19  |--------------------------------------------------------------------------
20  |
21  | This controller handles the registration of new users as well as their
22  | validation and creation. By default this controller uses a trait to
23  | provide this functionality without requiring any additional code.
24  |
25  */
26 
27  use RegistersUsers;
28 
34  protected $redirectTo = '/';
35 
41  public function __construct()
42  {
43  $this->middleware('guest');
44  }
45 
52  protected function validator(array $data)
53  {
54  return Validator::make($data, [
55  'first_name' => ['required', 'string', 'max:255'],
56  'last_name' => ['required', 'string', 'max:255'],
57  'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
58  'password' => ['required', 'string', 'min:5', 'confirmed'],
59  ]);
60  }
61 
68  protected function create(array $data)
69  {
70  $dataUser = app(DataUser::class)->create($data['first_name'], $data['last_name'], $data['email']);
71  $controlUser = app(\BristolSU\ControlDB\Contracts\Repositories\User::class)->create($dataUser->id());
72 
73  $databaseUser = app(UserRepository::class)->create([
74  'control_id' => $controlUser->id()
75  ]);
76  $databaseUser->email_verified_at = Carbon::now();
77  $databaseUser->password = Hash::make($data['password']);
78  $databaseUser->save();
79  return $databaseUser;
80 
81  }
82 }
diff --git a/tests/Http/Controllers/Auth/RegisterControllerTest.php b/tests/Http/Controllers/Auth/RegisterControllerTest.php index c63528e..9d0ef95 100644 --- a/tests/Http/Controllers/Auth/RegisterControllerTest.php +++ b/tests/Http/Controllers/Auth/RegisterControllerTest.php @@ -2,6 +2,8 @@ namespace BristolSU\Playground\Tests\Http\Controllers\Auth; +use BristolSU\ControlDB\Models\DataUser; +use BristolSU\ControlDB\Models\User; use BristolSU\Playground\Tests\TestCase; class RegisterControllerTest extends TestCase @@ -25,7 +27,9 @@ public function a_user_can_register(){ ]); $this->assertDatabaseHas('users', [ - 'email' => 'email@email.com' + 'control_id' => User::where('data_provider_id', + DataUser::where('first_name', 'TestName1')->firstOrFail()->id() + )->firstOrFail()->id() ]); }