diff options
22 files changed, 711 insertions, 179 deletions
diff --git a/api/Posts/Console/AddPostCommand.php b/api/Posts/Console/AddPostCommand.php new file mode 100644 index 0000000..977afb6 --- /dev/null +++ b/api/Posts/Console/AddPostCommand.php @@ -0,0 +1,59 @@ +<?php + +namespace Api\Posts\Console; + +use Api\Posts\Repositories\PostRepository; +use Illuminate\Console\Command; + +class AddPostCommand extends Command +{ + /** + * The name and signature of the console command. + * + * @var string + */ + protected $signature = 'posts:add {name} {email} {password}'; + + /** + * The console command description. + * + * @var string + */ + protected $description = 'Adds a new post'; + + /** + * Post repository to persist post in database + * + * @var PostRepository + */ + protected $postRepository; + + /** + * Create a new command instance. + * + * @param PostRepository $postRepository + * @return void + */ + public function __construct(PostRepository $postRepository) + { + parent::__construct(); + + $this->postRepository = $postRepository; + } + + /** + * Execute the console command. + * + * @return mixed + */ + public function handle() + { + $post = $this->postRepository->create([ + 'name' => $this->argument('name'), + 'email' => $this->argument('email'), + 'password' => $this->argument('password') + ]); + + $this->info(sprintf('A post was created with ID %s', $post->id)); + } +}
\ No newline at end of file diff --git a/api/Posts/Controllers/PostController.php b/api/Posts/Controllers/PostController.php new file mode 100644 index 0000000..105c7c2 --- /dev/null +++ b/api/Posts/Controllers/PostController.php @@ -0,0 +1,57 @@ +<?php + +namespace Api\Posts\Controllers; + +use Illuminate\Http\Request; +use Infrastructure\Http\Controller; +use Api\Posts\Requests\CreatePostRequest; +use Api\Posts\Services\PostService; + +class PostController extends Controller +{ + private $postService; + + public function __construct(PostService $postService) + { + $this->postService = $postService; + } + + public function getAll() + { + $resourceOptions = $this->parseResourceOptions(); + + $data = $this->postService->getAll($resourceOptions); + $parsedData = $this->parseData($data, $resourceOptions, 'posts'); + + return $this->response($parsedData); + } + + public function getById($postId) + { + $resourceOptions = $this->parseResourceOptions(); + + $data = $this->postService->getById($postId, $resourceOptions); + $parsedData = $this->parseData($data, $resourceOptions, 'post'); + + return $this->response($parsedData); + } + + public function create(CreatePostRequest $request) + { + $data = $request->get('post', []); + + return $this->response($this->postService->create($data), 201); + } + + public function update($postId, Request $request) + { + $data = $request->get('post', []); + + return $this->response($this->postService->update($postId, $data)); + } + + public function delete($postId) + { + return $this->response($this->postService->delete($postId)); + } +} diff --git a/api/Posts/Events/PostWasCreated.php b/api/Posts/Events/PostWasCreated.php new file mode 100644 index 0000000..8cdcbf8 --- /dev/null +++ b/api/Posts/Events/PostWasCreated.php @@ -0,0 +1,16 @@ +<?php + +namespace Api\Posts\Events; + +use Infrastructure\Events\Event; +use Api\Posts\Models\Post; + +class PostWasCreated extends Event +{ + public $post; + + public function __construct(Post $post) + { + $this->post = $post; + } +} diff --git a/api/Posts/Events/PostWasDeleted.php b/api/Posts/Events/PostWasDeleted.php new file mode 100644 index 0000000..5def797 --- /dev/null +++ b/api/Posts/Events/PostWasDeleted.php @@ -0,0 +1,16 @@ +<?php + +namespace Api\Posts\Events; + +use Infrastructure\Events\Event; +use Api\Posts\Models\Post; + +class PostWasDeleted extends Event +{ + public $post; + + public function __construct(Post $post) + { + $this->post = $post; + } +} diff --git a/api/Posts/Events/PostWasUpdated.php b/api/Posts/Events/PostWasUpdated.php new file mode 100644 index 0000000..441e884 --- /dev/null +++ b/api/Posts/Events/PostWasUpdated.php @@ -0,0 +1,16 @@ +<?php + +namespace Api\Posts\Events; + +use Infrastructure\Events\Event; +use Api\Posts\Models\Post; + +class PostWasUpdated extends Event +{ + public $post; + + public function __construct(Post $post) + { + $this->post = $post; + } +} diff --git a/api/Posts/Exceptions/PostNotFoundException.php b/api/Posts/Exceptions/PostNotFoundException.php new file mode 100644 index 0000000..2f9c55d --- /dev/null +++ b/api/Posts/Exceptions/PostNotFoundException.php @@ -0,0 +1,13 @@ +<?php + +namespace Api\Posts\Exceptions; + +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; + +class PostNotFoundException extends NotFoundHttpException +{ + public function __construct() + { + parent::__construct('The post was not found.'); + } +} diff --git a/api/Posts/Models/PostImage.php b/api/Posts/Models/PostImage.php new file mode 100644 index 0000000..637d1ec --- /dev/null +++ b/api/Posts/Models/PostImage.php @@ -0,0 +1,21 @@ +<?php + +namespace Api\Posts\Models; + +use Laravel\Passport\HasApiTokens; +use Illuminate\Notifications\Notifiable; +use Illuminate\Database\Eloquent\Model; + +class PostImage extends Model +{ + use HasApiTokens, Notifiable; + + /** + * The attributes that are mass assignable. + * + * @var array + */ + protected $fillable = [ + 'user_id', 'description', 'image_path', + ]; +} diff --git a/api/Posts/Models/PostText.php b/api/Posts/Models/PostText.php new file mode 100644 index 0000000..2e4a4bb --- /dev/null +++ b/api/Posts/Models/PostText.php @@ -0,0 +1,21 @@ +<?php + +namespace Api\Posts\Models; + +use Laravel\Passport\HasApiTokens; +use Illuminate\Notifications\Notifiable; +use Illuminate\Database\Eloquent\Model; + +class PostText extends Model +{ + use HasApiTokens, Notifiable; + + /** + * The attributes that are mass assignable. + * + * @var array + */ + protected $fillable = [ + 'user_id', 'text' + ]; +} diff --git a/api/Posts/PostServiceProvider.php b/api/Posts/PostServiceProvider.php new file mode 100644 index 0000000..181b308 --- /dev/null +++ b/api/Posts/PostServiceProvider.php @@ -0,0 +1,23 @@ +<?php + +namespace Api\Posts; + +use Infrastructure\Events\EventServiceProvider; +use Api\Posts\Events\PostWasCreated; +use Api\Posts\Events\PostWasDeleted; +use Api\Posts\Events\PostWasUpdated; + +class PostServiceProvider extends EventServiceProvider +{ + protected $listen = [ + PostWasCreated::class => [ + // listeners for when a post is created + ], + PostWasDeleted::class => [ + // listeners for when a post is deleted + ], + PostWasUpdated::class => [ + // listeners for when a post is updated + ] + ]; +} diff --git a/api/Posts/Repositories/PostRepository.php b/api/Posts/Repositories/PostRepository.php new file mode 100644 index 0000000..671412f --- /dev/null +++ b/api/Posts/Repositories/PostRepository.php @@ -0,0 +1,35 @@ +<?php + +namespace Api\Posts\Repositories; + +use Api\Posts\Models\Post; +use Infrastructure\Database\Eloquent\Repository; + +class PostRepository extends Repository +{ + public function getModel() + { + return new Post(); + } + + public function create(array $data) + { + $post = $this->getModel(); + + $data['password'] = password_hash($data['password'], PASSWORD_BCRYPT); + + $post->fill($data); + $post->save(); + + return $post; + } + + public function update(Post $post, array $data) + { + $post->fill($data); + + $post->save(); + + return $post; + } +} diff --git a/api/Posts/Requests/CreatePostRequest.php b/api/Posts/Requests/CreatePostRequest.php new file mode 100644 index 0000000..be777ac --- /dev/null +++ b/api/Posts/Requests/CreatePostRequest.php @@ -0,0 +1,30 @@ +<?php + +namespace Api\Posts\Requests; + +use Infrastructure\Http\ApiRequest; + +class CreatePostRequest extends ApiRequest +{ + public function authorize() + { + return true; + } + + public function rules() + { + return [ + 'post' => 'array|required', + 'post.email' => 'required|email', + 'post.name' => 'required|string', + 'post.password' => 'required|string|min:8' + ]; + } + + public function attributes() + { + return [ + 'post.email' => 'the post\'s email' + ]; + } +} diff --git a/api/Posts/Services/PostService.php b/api/Posts/Services/PostService.php new file mode 100644 index 0000000..7fc5dbb --- /dev/null +++ b/api/Posts/Services/PostService.php @@ -0,0 +1,88 @@ +<?php + +namespace Api\Posts\Services; + +use Exception; +use Illuminate\Auth\AuthManager; +use Illuminate\Database\DatabaseManager; +use Illuminate\Events\Dispatcher; +use Api\Posts\Exceptions\PostNotFoundException; +use Api\Posts\Events\PostWasCreated; +use Api\Posts\Events\PostWasDeleted; +use Api\Posts\Events\PostWasUpdated; +use Api\Posts\Repositories\PostRepository; + +class PostService +{ + private $auth; + + private $database; + + private $dispatcher; + + private $postRepository; + + public function __construct( + AuthManager $auth, + DatabaseManager $database, + Dispatcher $dispatcher, + PostRepository $postRepository + ) { + $this->auth = $auth; + $this->database = $database; + $this->dispatcher = $dispatcher; + $this->postRepository = $postRepository; + } + + public function getAll($options = []) + { + return $this->postRepository->get($options); + } + + public function getById($postId, array $options = []) + { + $post = $this->getRequestedPost($postId); + + return $post; + } + + public function create($data) + { + $post = $this->postRepository->create($data); + + $this->dispatcher->fire(new PostWasCreated($post)); + + return $post; + } + + public function update($postId, array $data) + { + $post = $this->getRequestedPost($postId); + + $this->postRepository->update($post, $data); + + $this->dispatcher->fire(new PostWasUpdated($post)); + + return $post; + } + + public function delete($postId) + { + $post = $this->getRequestedPost($postId); + + $this->postRepository->delete($postId); + + $this->dispatcher->fire(new PostWasDeleted($post)); + } + + private function getRequestedPost($postId) + { + $post = $this->postRepository->getById($postId); + + if (is_null($post)) { + throw new PostNotFoundException(); + } + + return $post; + } +} diff --git a/api/Posts/routes.php b/api/Posts/routes.php new file mode 100644 index 0000000..c34c120 --- /dev/null +++ b/api/Posts/routes.php @@ -0,0 +1,7 @@ +<?php + +$router->get('/posts', 'PostController@getAll'); +$router->get('/posts/{id}', 'PostController@getById'); +$router->post('/posts', 'PostController@create'); +$router->put('/posts/{id}', 'PostController@update'); +$router->delete('/posts/{id}', 'PostController@delete'); diff --git a/composer.lock b/composer.lock index b5d44de..9c92533 100644 --- a/composer.lock +++ b/composer.lock @@ -8,21 +8,21 @@ "packages": [ { "name": "defuse/php-encryption", - "version": "v2.2.0", + "version": "v2.2.1", "source": { "type": "git", "url": "https://github.com/defuse/php-encryption.git", - "reference": "0d4d27c368ca6798bc162469e43248c363c73495" + "reference": "0f407c43b953d571421e0020ba92082ed5fb7620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/defuse/php-encryption/zipball/0d4d27c368ca6798bc162469e43248c363c73495", - "reference": "0d4d27c368ca6798bc162469e43248c363c73495", + "url": "https://api.github.com/repos/defuse/php-encryption/zipball/0f407c43b953d571421e0020ba92082ed5fb7620", + "reference": "0f407c43b953d571421e0020ba92082ed5fb7620", "shasum": "" }, "require": { "ext-openssl": "*", - "paragonie/random_compat": "~2.0", + "paragonie/random_compat": ">= 2", "php": ">=5.4.0" }, "require-dev": { @@ -67,24 +67,24 @@ "security", "symmetric key cryptography" ], - "time": "2018-04-23T19:33:40+00:00" + "time": "2018-07-24T23:27:56+00:00" }, { "name": "doctrine/inflector", - "version": "v1.3.0", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "5527a48b7313d15261292c149e55e26eae771b0a" + "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a", - "reference": "5527a48b7313d15261292c149e55e26eae771b0a", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462", + "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.0" }, "require-dev": { "phpunit/phpunit": "^6.2" @@ -92,7 +92,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -134,7 +134,7 @@ "singularize", "string" ], - "time": "2018-01-09T20:05:19+00:00" + "time": "2017-07-22T12:18:28+00:00" }, { "name": "erusev/parsedown", @@ -606,16 +606,16 @@ }, { "name": "lcobucci/jwt", - "version": "3.2.2", + "version": "3.2.4", "source": { "type": "git", "url": "https://github.com/lcobucci/jwt.git", - "reference": "0b5930be73582369e10c4d4bb7a12bac927a203c" + "reference": "c9704b751315d21735dc98d78d4f37bd73596da7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0b5930be73582369e10c4d4bb7a12bac927a203c", - "reference": "0b5930be73582369e10c4d4bb7a12bac927a203c", + "url": "https://api.github.com/repos/lcobucci/jwt/zipball/c9704b751315d21735dc98d78d4f37bd73596da7", + "reference": "c9704b751315d21735dc98d78d4f37bd73596da7", "shasum": "" }, "require": { @@ -660,7 +660,7 @@ "JWS", "jwt" ], - "time": "2017-09-01T08:23:26+00:00" + "time": "2018-08-03T11:23:50+00:00" }, { "name": "league/event", @@ -714,16 +714,16 @@ }, { "name": "league/flysystem", - "version": "1.0.45", + "version": "1.0.46", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6" + "reference": "f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a99f94e63b512d75f851b181afcdf0ee9ebef7e6", - "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2", + "reference": "f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2", "shasum": "" }, "require": { @@ -735,7 +735,7 @@ "require-dev": { "ext-fileinfo": "*", "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^5.7.10" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -794,7 +794,7 @@ "sftp", "storage" ], - "time": "2018-05-07T08:44:23+00:00" + "time": "2018-08-22T07:45:22+00:00" }, { "name": "league/oauth2-server", @@ -988,16 +988,16 @@ }, { "name": "nesbot/carbon", - "version": "1.32.0", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343" + "reference": "55667c1007a99e82030874b1bb14d24d07108413" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/64563e2b9f69e4db1b82a60e81efa327a30ff343", - "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/55667c1007a99e82030874b1bb14d24d07108413", + "reference": "55667c1007a99e82030874b1bb14d24d07108413", "shasum": "" }, "require": { @@ -1039,7 +1039,7 @@ "datetime", "time" ], - "time": "2018-07-05T06:59:26+00:00" + "time": "2018-08-07T08:39:47+00:00" }, { "name": "optimus/api-consumer", @@ -1636,16 +1636,16 @@ }, { "name": "sentry/sentry", - "version": "1.9.1", + "version": "1.9.2", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "7ebc06dcab248bdf12e807bed3b308ef9c8a6ebf" + "reference": "6b4c80ee1f5d9d5ab5bae949f4eb5d758a0bf64b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/7ebc06dcab248bdf12e807bed3b308ef9c8a6ebf", - "reference": "7ebc06dcab248bdf12e807bed3b308ef9c8a6ebf", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/6b4c80ee1f5d9d5ab5bae949f4eb5d758a0bf64b", + "reference": "6b4c80ee1f5d9d5ab5bae949f4eb5d758a0bf64b", "shasum": "" }, "require": { @@ -1696,20 +1696,20 @@ "log", "logging" ], - "time": "2018-06-19T15:02:57+00:00" + "time": "2018-08-18T19:41:03+00:00" }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.9", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91" + "reference": "181b89f18a90f8925ef805f950d47a7190e9b950" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/7ffc1ea296ed14bf8260b6ef11b80208dbadba91", - "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/181b89f18a90f8925ef805f950d47a7190e9b950", + "reference": "181b89f18a90f8925ef805f950d47a7190e9b950", "shasum": "" }, "require": { @@ -1750,20 +1750,20 @@ "mail", "mailer" ], - "time": "2018-01-23T07:37:21+00:00" + "time": "2018-07-31T09:26:32+00:00" }, { "name": "symfony/console", - "version": "v3.4.12", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00" + "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/1b97071a26d028c9bd4588264e101e14f6e7cd00", - "reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00", + "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73", + "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73", "shasum": "" }, "require": { @@ -1819,7 +1819,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-05-23T05:02:55+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/css-selector", @@ -1876,16 +1876,16 @@ }, { "name": "symfony/debug", - "version": "v3.4.12", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "47e6788c5b151cf0cfdf3329116bf33800632d75" + "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/47e6788c5b151cf0cfdf3329116bf33800632d75", - "reference": "47e6788c5b151cf0cfdf3329116bf33800632d75", + "url": "https://api.github.com/repos/symfony/debug/zipball/d5a058ff6ecad26b30c1ba452241306ea34c65cc", + "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc", "shasum": "" }, "require": { @@ -1928,34 +1928,34 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-06-25T11:10:40+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.1.1", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5" + "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5", - "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb", + "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^5.5.9|>=7.0.8" }, "conflict": { - "symfony/dependency-injection": "<3.4" + "symfony/dependency-injection": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/expression-language": "~3.4|~4.0", - "symfony/stopwatch": "~3.4|~4.0" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -1964,7 +1964,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1991,20 +1991,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-04-06T07:35:57+00:00" + "time": "2018-07-26T09:06:28+00:00" }, { "name": "symfony/finder", - "version": "v3.4.12", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394" + "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394", - "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394", + "url": "https://api.github.com/repos/symfony/finder/zipball/8a84fcb207451df0013b2c74cbbf1b62d47b999a", + "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a", "shasum": "" }, "require": { @@ -2040,20 +2040,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-06-19T20:52:10+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.4.12", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "1c28679fcbb0d9b35e4fd49fbb74d2ca4ea17bce" + "reference": "19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1c28679fcbb0d9b35e4fd49fbb74d2ca4ea17bce", - "reference": "1c28679fcbb0d9b35e4fd49fbb74d2ca4ea17bce", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6", + "reference": "19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6", "shasum": "" }, "require": { @@ -2094,20 +2094,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-06-21T11:10:19+00:00" + "time": "2018-08-01T14:04:26+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.4.12", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "cb7edcdc47cab3c61c891e6e55337f8dd470d820" + "reference": "8e84cc498f0ffecfbabdea78b87828fd66189544" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/cb7edcdc47cab3c61c891e6e55337f8dd470d820", - "reference": "cb7edcdc47cab3c61c891e6e55337f8dd470d820", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8e84cc498f0ffecfbabdea78b87828fd66189544", + "reference": "8e84cc498f0ffecfbabdea78b87828fd66189544", "shasum": "" }, "require": { @@ -2120,7 +2120,7 @@ }, "conflict": { "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4", + "symfony/dependency-injection": "<3.4.10|<4.0.10,>=4", "symfony/var-dumper": "<3.3", "twig/twig": "<1.34|<2.4,>=2" }, @@ -2134,7 +2134,7 @@ "symfony/config": "~2.8|~3.0|~4.0", "symfony/console": "~2.8|~3.0|~4.0", "symfony/css-selector": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "^3.4.5|^4.0.5", + "symfony/dependency-injection": "^3.4.10|^4.0.10", "symfony/dom-crawler": "~2.8|~3.0|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", @@ -2183,29 +2183,32 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-06-25T12:29:19+00:00" + "time": "2018-08-01T14:47:47+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.8.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" + "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", - "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "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.8-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -2238,20 +2241,20 @@ "polyfill", "portable" ], - "time": "2018-04-30T19:57:29+00:00" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.8.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "3296adf6a6454a050679cde90f95350ad604b171" + "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", - "reference": "3296adf6a6454a050679cde90f95350ad604b171", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", + "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", "shasum": "" }, "require": { @@ -2263,7 +2266,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -2297,30 +2300,30 @@ "portable", "shim" ], - "time": "2018-04-26T10:06:28+00:00" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/polyfill-php70", - "version": "v1.8.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6" + "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6", - "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934", + "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934", "shasum": "" }, "require": { - "paragonie/random_compat": "~1.0|~2.0", + "paragonie/random_compat": "~1.0|~2.0|~9.99", "php": ">=5.3.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -2356,20 +2359,20 @@ "portable", "shim" ], - "time": "2018-04-26T10:06:28+00:00" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/process", - "version": "v3.4.12", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "acc5a37c706ace827962851b69705b24e71ca17c" + "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/acc5a37c706ace827962851b69705b24e71ca17c", - "reference": "acc5a37c706ace827962851b69705b24e71ca17c", + "url": "https://api.github.com/repos/symfony/process/zipball/0414db29bd770ec5a4152683e655f55efd4fa60f", + "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f", "shasum": "" }, "require": { @@ -2405,7 +2408,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-05-30T04:24:30+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -2469,16 +2472,16 @@ }, { "name": "symfony/routing", - "version": "v3.4.12", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "6b9fef5343828e542db17e2519722ef08992f2c1" + "reference": "e20f4bb79502c3c0db86d572f7683a30d4143911" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/6b9fef5343828e542db17e2519722ef08992f2c1", - "reference": "6b9fef5343828e542db17e2519722ef08992f2c1", + "url": "https://api.github.com/repos/symfony/routing/zipball/e20f4bb79502c3c0db86d572f7683a30d4143911", + "reference": "e20f4bb79502c3c0db86d572f7683a30d4143911", "shasum": "" }, "require": { @@ -2542,38 +2545,37 @@ "uri", "url" ], - "time": "2018-06-19T20:52:10+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/translation", - "version": "v4.1.1", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854" + "reference": "9749930bfc825139aadd2d28461ddbaed6577862" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854", - "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854", + "url": "https://api.github.com/repos/symfony/translation/zipball/9749930bfc825139aadd2d28461ddbaed6577862", + "reference": "9749930bfc825139aadd2d28461ddbaed6577862", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<3.4", + "symfony/config": "<2.8", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/console": "~3.4|~4.0", + "symfony/config": "~2.8|~3.0|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "~3.4|~4.0", + "symfony/intl": "^2.8.18|^3.2.5|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -2584,7 +2586,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2611,20 +2613,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-06-22T08:59:39+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.4.12", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e173954a28a44a32c690815fbe4d0f2eac43accb" + "reference": "f62a394bd3de96f2f5e8f4c7d685035897fb3cb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e173954a28a44a32c690815fbe4d0f2eac43accb", - "reference": "e173954a28a44a32c690815fbe4d0f2eac43accb", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f62a394bd3de96f2f5e8f4c7d685035897fb3cb3", + "reference": "f62a394bd3de96f2f5e8f4c7d685035897fb3cb3", "shasum": "" }, "require": { @@ -2680,7 +2682,7 @@ "debug", "dump" ], - "time": "2018-06-15T07:47:49+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -2731,16 +2733,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a" + "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/6ae3e2e6494bb5e58c2decadafc3de7f1453f70a", - "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e", + "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e", "shasum": "" }, "require": { @@ -2777,20 +2779,20 @@ "env", "environment" ], - "time": "2018-07-01T10:25:50+00:00" + "time": "2018-07-29T20:33:41+00:00" }, { "name": "zendframework/zend-diactoros", - "version": "1.8.2", + "version": "1.8.5", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "273c18bf6aaab20be9667a3aa4e7702e1e4e7ced" + "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/273c18bf6aaab20be9667a3aa4e7702e1e4e7ced", - "reference": "273c18bf6aaab20be9667a3aa4e7702e1e4e7ced", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3e4edb822c942f37ade0d09579cfbab11e2fee87", + "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87", "shasum": "" }, "require": { @@ -2803,7 +2805,7 @@ "require-dev": { "ext-dom": "*", "ext-libxml": "*", - "phpunit/phpunit": "^5.7.16 || ^6.0.8", + "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", "zendframework/zend-coding-standard": "~1.0" }, "type": "library", @@ -2840,38 +2842,38 @@ "psr", "psr-7" ], - "time": "2018-07-19T18:38:31+00:00" + "time": "2018-08-10T14:16:32+00:00" } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.1.0", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=5.3,<8.0-DEV" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "^6.2.3", - "squizlabs/php_codesniffer": "^3.0.2" + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -2896,7 +2898,7 @@ "constructor", "instantiate" ], - "time": "2017-07-22T11:58:36+00:00" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "fzaninotto/faker", @@ -3212,16 +3214,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.7.6", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" + "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", - "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06", + "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06", "shasum": "" }, "require": { @@ -3233,12 +3235,12 @@ }, "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": { @@ -3271,7 +3273,7 @@ "spy", "stub" ], - "time": "2018-04-18T13:57:24+00:00" + "time": "2018-08-05T17:53:17+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4079,16 +4081,16 @@ }, { "name": "symfony/yaml", - "version": "v3.4.12", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0" + "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", - "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", + "url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", + "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", "shasum": "" }, "require": { @@ -4134,7 +4136,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-05-03T23:18:14+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "webmozart/assert", diff --git a/database/migrations/2018_08_23_231531_create_text_posts_table.php b/database/migrations/2018_08_23_231531_create_text_posts_table.php new file mode 100644 index 0000000..128cfc6 --- /dev/null +++ b/database/migrations/2018_08_23_231531_create_text_posts_table.php @@ -0,0 +1,31 @@ +<?php + +use Illuminate\Support\Facades\Schema; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Database\Migrations\Migration; + +class CreatePostsTextTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('text_posts', function (Blueprint $table) { + $table->increments('id'); + $table->string('text', 8192); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('text_posts'); + } +} diff --git a/database/migrations/2018_08_23_232015_create_media_posts_table.php b/database/migrations/2018_08_23_232015_create_media_posts_table.php new file mode 100644 index 0000000..d652a50 --- /dev/null +++ b/database/migrations/2018_08_23_232015_create_media_posts_table.php @@ -0,0 +1,32 @@ +<?php + +use Illuminate\Support\Facades\Schema; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Database\Migrations\Migration; + +class CreatePostsImageTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('media_posts', function (Blueprint $table) { + $table->increments('id'); + $table->string('description'); + $table->string('media_path'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('media_posts'); + } +} diff --git a/database/migrations/2018_08_24_102141_create_posts_table.php b/database/migrations/2018_08_24_102141_create_posts_table.php new file mode 100644 index 0000000..f841c69 --- /dev/null +++ b/database/migrations/2018_08_24_102141_create_posts_table.php @@ -0,0 +1,33 @@ +<?php + +use Illuminate\Support\Facades\Schema; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Database\Migrations\Migration; + +class CreatePostsTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('text_posts', function (Blueprint $table) { + $table->increments('id'); + $table->integer('post_types_id'); + $table->integer('user_id'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('text_posts'); + } +} diff --git a/database/migrations/2018_08_24_102348_create_post_types_table.php b/database/migrations/2018_08_24_102348_create_post_types_table.php new file mode 100644 index 0000000..76f0370 --- /dev/null +++ b/database/migrations/2018_08_24_102348_create_post_types_table.php @@ -0,0 +1,31 @@ +<?php + +use Illuminate\Support\Facades\Schema; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Database\Migrations\Migration; + +class CreatePostTypesTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('post_types', function (Blueprint $table) { + $table->increments('id'); + $table->string('type'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('post_types'); + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 2399bf1..927bf94 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -11,6 +11,6 @@ class DatabaseSeeder extends Seeder */ public function run() { - $this->call(UsersTableSeeder::class); + $this->call(PostTypesTableSeeder::class); } } diff --git a/database/seeds/PostTypesTableSeeder.php b/database/seeds/PostTypesTableSeeder.php new file mode 100644 index 0000000..d21770b --- /dev/null +++ b/database/seeds/PostTypesTableSeeder.php @@ -0,0 +1,23 @@ +<?php + +use Illuminate\Database\Seeder; +use Illuminate\Database\Eloquent\Model; + +class PostTypesTableSeeder extends Seeder +{ + /** + * Run the database seeds. + * + * @return void + */ + public function run() + { + DB::table('post_types')->insert([ + 'type' => 'Media' + ]); + + DB::table('post_types')->insert([ + 'type' => 'Text' + ]); + } +} diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php deleted file mode 100644 index 395fc13..0000000 --- a/database/seeds/UsersTableSeeder.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php - -use Illuminate\Database\Seeder; -use Illuminate\Database\Eloquent\Model; - -class UsersTableSeeder extends Seeder -{ - /** - * Run the database seeds. - * - * @return void - */ - public function run() - { - DB::table('users')->insert([ - 'name' => str_random(10), - 'email' => str_random(10).'@gmail.com', - 'password' => bcrypt('secret'), - ]); - } -} diff --git a/infrastructure/Api/Controllers/DefaultApiController.php b/infrastructure/Api/Controllers/DefaultApiController.php index cb850a5..c9f35d0 100644 --- a/infrastructure/Api/Controllers/DefaultApiController.php +++ b/infrastructure/Api/Controllers/DefaultApiController.php @@ -10,8 +10,7 @@ class DefaultApiController extends BaseController public function index() { return response()->json([ - 'title' => 'BEAM-Messenger', - 'version' => Version::getGitTag() + 'message' => 'Welcome to the official BEAM-Messenger API' ]); } } |