diff --git a/app/Note.php b/app/Note.php index fe574e33..6ee5e2ff 100644 --- a/app/Note.php +++ b/app/Note.php @@ -9,15 +9,12 @@ use Illuminate\Database\Eloquent\Model; use Jonnybarnes\EmojiA11y\EmojiModifier; use League\CommonMark\CommonMarkConverter; use Illuminate\Database\Eloquent\SoftDeletes; -use Spatie\MediaLibrary\HasMedia\HasMediaTrait; -use Spatie\MediaLibrary\HasMedia\Interfaces\HasMedia; use Illuminate\Database\Eloquent\ModelNotFoundException; -class Note extends Model implements HasMedia +class Note extends Model { use Searchable; use SoftDeletes; - use HasMediaTrait; /** * The database table used by the model. diff --git a/composer.json b/composer.json index 8eab83ba..6b281798 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,6 @@ "indieauth/client": "~0.1", "ezyang/htmlpurifier": "~4.6", "league/commonmark": "^0.15.0", - "spatie/laravel-medialibrary": "^4.0", "league/flysystem-aws-s3-v3": "^1.0", "phaza/laravel-postgis": "~3.1", "lcobucci/jwt": "^3.1", diff --git a/composer.lock b/composer.lock index ebdebdff..3b259129 100644 --- a/composer.lock +++ b/composer.lock @@ -4,58 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "f3b7bcd2d79e776a84c1387f2086a5cc", + "content-hash": "601dc56ebae7a60465cb336957ea4e38", "packages": [ - { - "name": "anahkiasen/underscore-php", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/Anahkiasen/underscore-php.git", - "reference": "48f97b295c82d99c1fe10d8b0684c43f051b5580" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Anahkiasen/underscore-php/zipball/48f97b295c82d99c1fe10d8b0684c43f051b5580", - "reference": "48f97b295c82d99c1fe10d8b0684c43f051b5580", - "shasum": "" - }, - "require": { - "doctrine/inflector": "^1.0", - "patchwork/utf8": "^1.2", - "php": ">=5.4.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "2.0.*@dev", - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "autoload": { - "psr-4": { - "Underscore\\": [ - "src", - "tests" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Maxime Fabre", - "email": "ehtnam6@gmail.com" - } - ], - "description": "A redacted port of Underscore.js for PHP", - "keywords": [ - "internals", - "laravel", - "toolkit" - ], - "time": "2015-05-16T19:24:58+00:00" - }, { "name": "aws/aws-sdk-php", "version": "3.18.23", @@ -1178,68 +1128,6 @@ ], "time": "2017-01-11T17:14:49+00:00" }, - { - "name": "intervention/image", - "version": "2.3.11", - "source": { - "type": "git", - "url": "https://github.com/Intervention/image.git", - "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/e8881fd99b9804b29e02d6d1c2c15ee459335cf1", - "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1", - "shasum": "" - }, - "require": { - "ext-fileinfo": "*", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.4.0" - }, - "require-dev": { - "mockery/mockery": "~0.9.2", - "phpunit/phpunit": "3.*" - }, - "suggest": { - "ext-gd": "to use GD library based image processing.", - "ext-imagick": "to use Imagick based image processing.", - "intervention/imagecache": "Caching extension for the Intervention Image library" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "Intervention\\Image\\": "src/Intervention/Image" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Oliver Vogel", - "email": "oliver@olivervogel.net", - "homepage": "http://olivervogel.net/" - } - ], - "description": "Image handling and manipulation library with support for Laravel integration", - "homepage": "http://image.intervention.io/", - "keywords": [ - "gd", - "image", - "imagick", - "laravel", - "thumbnail", - "watermark" - ], - "time": "2017-02-04T10:37:19+00:00" - }, { "name": "jakub-onderka/php-console-color", "version": "0.1", @@ -2019,67 +1907,6 @@ "description": "Flysystem adapter for the AWS S3 SDK v3.x", "time": "2016-06-21T21:34:35+00:00" }, - { - "name": "league/glide", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/glide.git", - "reference": "ae6351088b148ed73ebd1270e312b07fd35dd37d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/glide/zipball/ae6351088b148ed73ebd1270e312b07fd35dd37d", - "reference": "ae6351088b148ed73ebd1270e312b07fd35dd37d", - "shasum": "" - }, - "require": { - "intervention/image": "^2.1", - "league/flysystem": "^1.0", - "php": "^5.4 | ^7.0", - "psr/http-message": "^1.0" - }, - "require-dev": { - "mockery/mockery": "~0.9", - "phpunit/php-token-stream": "^1.4", - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Glide\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonathan Reinink", - "email": "jonathan@reinink.ca", - "homepage": "http://reinink.ca" - } - ], - "description": "Wonderfully easy on-demand image manipulation library with an HTTP based API.", - "homepage": "http://glide.thephpleague.com", - "keywords": [ - "ImageMagick", - "editing", - "gd", - "image", - "imagick", - "league", - "manipulation", - "processing" - ], - "time": "2017-01-19T01:26:54+00:00" - }, { "name": "martinbean/laravel-sluggable-trait", "version": "0.2.0", @@ -2504,65 +2331,6 @@ ], "time": "2017-03-03T14:11:40+00:00" }, - { - "name": "patchwork/utf8", - "version": "v1.3.1", - "source": { - "type": "git", - "url": "https://github.com/tchwork/utf8.git", - "reference": "30ec6451aec7d2536f0af8fe535f70c764f2c47a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tchwork/utf8/zipball/30ec6451aec7d2536f0af8fe535f70c764f2c47a", - "reference": "30ec6451aec7d2536f0af8fe535f70c764f2c47a", - "shasum": "" - }, - "require": { - "lib-pcre": ">=7.3", - "php": ">=5.3.0" - }, - "suggest": { - "ext-iconv": "Use iconv for best performance", - "ext-intl": "Use Intl for best performance", - "ext-mbstring": "Use Mbstring for best performance", - "ext-wfio": "Use WFIO for UTF-8 filesystem access on Windows" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "Patchwork\\": "src/Patchwork/" - }, - "classmap": [ - "src/Normalizer.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "(Apache-2.0 or GPL-2.0)" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - } - ], - "description": "Portable and performant UTF-8, Unicode and Grapheme Clusters for PHP", - "homepage": "https://github.com/tchwork/utf8", - "keywords": [ - "grapheme", - "i18n", - "unicode", - "utf-8", - "utf8" - ], - "time": "2016-05-18T13:57:10+00:00" - }, { "name": "phaza/laravel-postgis", "version": "3.1.1", @@ -3014,223 +2782,6 @@ "description": "A security checker for your composer.lock", "time": "2017-02-18T17:53:25+00:00" }, - { - "name": "spatie/laravel-glide", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/spatie/laravel-glide.git", - "reference": "a75f9069a04a1337e7c5308fd4975821f8177f23" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-glide/zipball/a75f9069a04a1337e7c5308fd4975821f8177f23", - "reference": "a75f9069a04a1337e7c5308fd4975821f8177f23", - "shasum": "" - }, - "require": { - "illuminate/support": "~5.3.0|~5.4.0", - "league/glide": "^1.0", - "php": "^7.0" - }, - "require-dev": { - "orchestra/testbench": "~3.3.0|~3.4.0", - "phpunit/phpunit": "5.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "Spatie\\Glide\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Freek Van der Herten", - "email": "freek@spatie.be" - } - ], - "description": "Easily convert images with Glide", - "homepage": "https://github.com/spatie/laravel-glide", - "time": "2017-01-24T10:51:47+00:00" - }, - { - "name": "spatie/laravel-medialibrary", - "version": "4.13.0", - "source": { - "type": "git", - "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "89432693fa66aa101499f0f89cfcdec51a620471" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/89432693fa66aa101499f0f89cfcdec51a620471", - "reference": "89432693fa66aa101499f0f89cfcdec51a620471", - "shasum": "" - }, - "require": { - "illuminate/bus": "~5.2.0|~5.3.0|~5.4.0", - "illuminate/console": "~5.2.0|~5.3.0|~5.4.0", - "illuminate/container": "~5.2.0|~5.3.28|~5.4.0", - "illuminate/contracts": "~5.2.0|~5.3.28|~5.4.0", - "illuminate/database": "~5.2.0|~5.3.0|~5.4.0", - "illuminate/filesystem": "~5.2.0|~5.3.0|~5.4.0", - "illuminate/support": "~5.2.0|~5.3.0|~5.4.0", - "league/flysystem": "^1.0.13", - "php": "^7.0", - "spatie/laravel-glide": "^3.0.0", - "spatie/pdf-to-image": "^1.2", - "spatie/string": "^2.0.0" - }, - "conflict": { - "php-ffmpeg/php-ffmpeg": "<0.6.1" - }, - "require-dev": { - "doctrine/dbal": "^2.5.2", - "league/flysystem-aws-s3-v3": "^1.0.13", - "mockery/mockery": "^0.9.4", - "orchestra/testbench": "~3.2.0|~3.3.0|~3.4.0", - "phpunit/phpunit": "^5.7.0" - }, - "suggest": { - "league/flysystem-aws-s3-v3": "Required to use AWS S3 file storage", - "php-ffmpeg/php-ffmpeg": "Required for generating video thumbnails" - }, - "type": "library", - "autoload": { - "psr-4": { - "Spatie\\MediaLibrary\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Freek Van der Herten", - "email": "freek@spatie.be", - "homepage": "https://murze.be", - "role": "Developer" - } - ], - "description": "Associate files with Eloquent models", - "homepage": "https://github.com/spatie/laravel-medialibrary", - "keywords": [ - "cms", - "laravel", - "laravel-medialibrary", - "media", - "spatie" - ], - "time": "2017-01-30T13:33:03+00:00" - }, - { - "name": "spatie/pdf-to-image", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/spatie/pdf-to-image.git", - "reference": "9a5cb264a99e87e010c65d4ece03b51f821d55bd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/pdf-to-image/zipball/9a5cb264a99e87e010c65d4ece03b51f821d55bd", - "reference": "9a5cb264a99e87e010c65d4ece03b51f821d55bd", - "shasum": "" - }, - "require": { - "php": ">=5.5.0" - }, - "require-dev": { - "phpunit/phpunit": "4.*", - "scrutinizer/ocular": "~1.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Spatie\\PdfToImage\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Freek Van der Herten", - "email": "freek@spatie.be", - "homepage": "https://spatie.be", - "role": "Developer" - } - ], - "description": "Convert a pdf to an image", - "homepage": "https://github.com/spatie/pdf-to-image", - "keywords": [ - "convert", - "image", - "pdf", - "pdf-to-image", - "spatie" - ], - "time": "2016-12-14T15:37:00+00:00" - }, - { - "name": "spatie/string", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/spatie/string.git", - "reference": "5435f8095a6c2f4ac67cbc9a1fbc116197863144" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/string/zipball/5435f8095a6c2f4ac67cbc9a1fbc116197863144", - "reference": "5435f8095a6c2f4ac67cbc9a1fbc116197863144", - "shasum": "" - }, - "require": { - "anahkiasen/underscore-php": "^2.0", - "php": ">=5.6.0" - }, - "require-dev": { - "phpunit/phpunit": "5.*", - "scrutinizer/ocular": "~1.1" - }, - "type": "library", - "autoload": { - "files": [ - "src/string_functions.php" - ], - "psr-4": { - "Spatie\\String\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Freek Van der Herten", - "email": "freek@spatie.be", - "homepage": "https://murze.be", - "role": "Developer" - } - ], - "description": "String handling evolved", - "homepage": "https://github.com/spatie/string", - "keywords": [ - "handling", - "handy", - "spatie", - "string" - ], - "time": "2016-12-01T13:46:28+00:00" - }, { "name": "swiftmailer/swiftmailer", "version": "v5.4.6", diff --git a/config/app.php b/config/app.php index 57d672d9..1b96380e 100644 --- a/config/app.php +++ b/config/app.php @@ -215,11 +215,6 @@ return [ */ Thujohn\Twitter\TwitterServiceProvider::class, - /* - * Laravel Medialibrary - */ - Spatie\MediaLibrary\MediaLibraryServiceProvider::class, - /* * Phaza’s Postgis library */