diff --git a/app/Chest.php b/app/Chest.php
index 61f602f..28749a7 100644
--- a/app/Chest.php
+++ b/app/Chest.php
@@ -3,7 +3,6 @@
namespace App;
use App\Concerns\Models\Postable;
-use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
class Chest extends Model
@@ -19,21 +18,11 @@ class Chest extends Model
'content' => 'json',
];
- public function getHashIdAttribute(): string
- {
- return hashid_encode($this->id);
- }
-
public function getPermalinkAttribute(): string
{
return route('chest.view', $this->hash_id);
}
- public function scopeHashIdIs(Builder $query, string $hash): Builder
- {
- return $query->where('id', hashid_decode($hash));
- }
-
public function toSearchableArray()
{
return [
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 334a328..dbec14c 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -75,6 +75,7 @@ class Kernel extends HttpKernel
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\Authenticate::class,
+ \Illuminate\Routing\Middleware\ThrottleRequests::class,
\Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\Illuminate\Auth\Middleware\Authorize::class,
diff --git a/app/Link.php b/app/Link.php
index 0e81f70..2a4aeef 100644
--- a/app/Link.php
+++ b/app/Link.php
@@ -7,11 +7,8 @@
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
-use Spatie\Feed\Feedable;
-use Spatie\Feed\FeedItem;
-class Link extends Model implements Feedable
+class Link extends Model
{
use Postable;
@@ -28,7 +25,7 @@ class Link extends Model implements Feedable
public function getHashIdAttribute(): string
{
- return hashid_encode($this->id);
+ return app('hashid')->encode($this->id);
}
public function getPermalinkAttribute(): string
@@ -47,7 +44,7 @@ public function getUrlAttribute(): string
public function scopeHashIdIs(Builder $query, string $hash): Builder
{
- return $query->where('id', hashid_decode($hash));
+ return $query->where('id', app('hashid')->decode($hash));
}
public function updatePreview(): self
@@ -85,21 +82,4 @@ public function canDownloadArchive(): bool
return true;
}
-
- public function toFeedItem()
- {
- return FeedItem::create([
- 'id' => $this->id,
- 'title' => $this->title,
- 'summary' => Str::limit($this->content, 130) ?? 'N.C',
- 'updated' => $this->updated_at,
- 'link' => $this->permalink,
- 'author' => config('app.name'),
- ]);
- }
-
- public static function getFeedItems()
- {
- return Link::latest()->withPrivate(false)->get();
- }
}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index ba1d6f6..08dccd2 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,6 +2,7 @@
namespace App\Providers;
+use App\Services\Hashid;
use App\Services\Shaarli\Shaarli;
use Illuminate\Support\Facades\View;
use Illuminate\Support\ServiceProvider;
@@ -19,6 +20,12 @@ public function register()
});
$this->app->alias(Shaarli::class, 'shaarli');
+
+ $this->app->singleton(Hashid::class, function ($app) {
+ return new Hashid($app['config']->get('shaarli.hashids'));
+ });
+
+ $this->app->alias(Hashid::class, 'hashid');
}
public function boot()
diff --git a/app/Services/Hashid.php b/app/Services/Hashid.php
new file mode 100644
index 0000000..e6431ac
--- /dev/null
+++ b/app/Services/Hashid.php
@@ -0,0 +1,28 @@
+hashids = new Hashids(
+ $config['salt'],
+ $config['min'],
+ 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'
+ );
+ }
+
+ public function encode($data): string
+ {
+ return $this->hashids->encode($data);
+ }
+
+ public function decode($data)
+ {
+ return $this->hashids->decode($data);
+ }
+}
diff --git a/app/Services/Shaarli/Shaarli.php b/app/Services/Shaarli/Shaarli.php
index ac478cd..c8e1b18 100644
--- a/app/Services/Shaarli/Shaarli.php
+++ b/app/Services/Shaarli/Shaarli.php
@@ -15,7 +15,7 @@
class Shaarli
{
/** @var string VERSION */
- public const VERSION = '1.1.1';
+ public const VERSION = '1.2.0';
/** @var Application $app */
protected $app;
/** @var Valuestore $settings */
diff --git a/app/Story.php b/app/Story.php
index f78129d..d7f27b9 100644
--- a/app/Story.php
+++ b/app/Story.php
@@ -6,10 +6,8 @@
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
-use Spatie\Feed\Feedable;
-use Spatie\Feed\FeedItem;
-class Story extends Model implements Feedable
+class Story extends Model
{
use Postable;
@@ -34,21 +32,4 @@ public function scopeSlugIs(Builder $query, string $slug): Builder
{
return $query->where('slug', $slug);
}
-
- public function toFeedItem()
- {
- return FeedItem::create([
- 'id' => $this->id,
- 'title' => $this->title,
- 'summary' => Str::limit($this->content, 130) ?? 'N.C',
- 'updated' => $this->updated_at,
- 'link' => $this->url,
- 'author' => config('app.name'),
- ]);
- }
-
- public static function getFeedItems()
- {
- return Story::latest()->withPrivate(false)->get();
- }
}
diff --git a/changelog.md b/changelog.md
index 61b53cf..ad2a02b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,4 @@
-# Unreleased
+# 1.2.0
## Added
@@ -6,6 +6,15 @@
- Add original URL to card-link
- Ability to "Save and archive" a link
+## Changed
+
+- Laravel 6.0
+- Simplified Hashid
+
+## Deleted
+
+- Feeds
+
# 1.1.1
## Fixed
diff --git a/composer.json b/composer.json
index 014951f..37290ea 100644
--- a/composer.json
+++ b/composer.json
@@ -9,29 +9,27 @@
],
"license": "MIT",
"require": {
- "php": "^7.1.3",
+ "php": "^7.2",
"doctrine/dbal": "^2.9",
- "elfsundae/laravel-hashid": "^1.3",
"fideloper/proxy": "^4.0",
- "laravel/framework": "5.8.*",
+ "laravel/framework": "^6.0",
"laravel/scout": "^7.1",
"laravel/tinker": "^1.0",
"maatwebsite/excel": "^3.1",
"nesk/puphpeteer": "^1.6",
"norkunas/youtube-dl-php": "^1.3",
"predis/predis": "^1.1",
- "spatie/laravel-feed": "^2.3",
"spatie/valuestore": "^1.2",
- "teamtnt/laravel-scout-tntsearch-driver": "^7.1"
+ "hashids/hashids": "^2.0.4|~3.0",
+ "marceauka/laravel-scout-tntsearch-driver": "^7.2"
},
"require-dev": {
- "beyondcode/laravel-dump-server": "^1.0",
- "filp/whoops": "^2.0",
+ "facade/ignition": "^1.4",
"fzaninotto/faker": "^1.4",
"laravel/dusk": "^5.5",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0",
- "phpunit/phpunit": "^7.5"
+ "phpunit/phpunit": "^8.0"
},
"config": {
"optimize-autoloader": true,
diff --git a/composer.lock b/composer.lock
index 722d5b4..cba91dd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "3409478791a949e3db34ddac0f8bc355",
+ "content-hash": "d5160bf7c9afca7b33c069cd8edec517",
"packages": [
{
"name": "clue/socket-raw",
@@ -566,128 +566,6 @@
],
"time": "2019-08-13T17:33:27+00:00"
},
- {
- "name": "elfsundae/laravel-hashid",
- "version": "1.3.1",
- "source": {
- "type": "git",
- "url": "https://github.com/ElfSundae/laravel-hashid.git",
- "reference": "226d90c9dece8787e73a1da378886fe0936876e0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ElfSundae/laravel-hashid/zipball/226d90c9dece8787e73a1da378886fe0936876e0",
- "reference": "226d90c9dece8787e73a1da378886fe0936876e0",
- "shasum": ""
- },
- "require": {
- "elfsundae/urlsafe-base64": "~1.1",
- "hashids/hashids": "^2.0.4|~3.0",
- "illuminate/console": "~5.0,<5.9",
- "illuminate/support": "~5.0,<5.9",
- "jenssegers/optimus": "~1.0",
- "php": "~7.1",
- "phpseclib/phpseclib": "~2.0",
- "tuupola/base62": "~2.0"
- },
- "require-dev": {
- "mockery/mockery": "~1.0",
- "orchestra/testbench": "~3.0",
- "paragonie/random_compat": "~1.0|~2.0",
- "phpunit/phpunit": "~5.7|~6.0|~7.0|~8.0"
- },
- "suggest": {
- "elfsundae/laravel-hashid-uuid": "Shorten UUID encoding"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.4-dev"
- },
- "laravel": {
- "providers": [
- "ElfSundae\\Laravel\\Hashid\\HashidServiceProvider"
- ],
- "aliases": {
- "Hashid": "ElfSundae\\Laravel\\Hashid\\Facades\\Hashid"
- }
- }
- },
- "autoload": {
- "psr-4": {
- "ElfSundae\\Laravel\\Hashid\\": "src/"
- },
- "files": [
- "src/helpers.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Elf Sundae",
- "email": "elf.sundae@gmail.com",
- "homepage": "https://0x123.com"
- }
- ],
- "description": "A simple, elegant way to obfuscate your data by generating reversible, non-sequential, URL-safe identifiers.",
- "homepage": "https://github.com/ElfSundae/laravel-hashid",
- "keywords": [
- "URL safe",
- "base62",
- "base64",
- "hashid",
- "hashids",
- "obfuscate",
- "optimus"
- ],
- "time": "2019-04-01T17:06:00+00:00"
- },
- {
- "name": "elfsundae/urlsafe-base64",
- "version": "1.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/ElfSundae/urlsafe-base64.git",
- "reference": "fffdc235475308068e92c8bb1dec6b4bc7b95e73"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ElfSundae/urlsafe-base64/zipball/fffdc235475308068e92c8bb1dec6b4bc7b95e73",
- "reference": "fffdc235475308068e92c8bb1dec6b4bc7b95e73",
- "shasum": ""
- },
- "require-dev": {
- "paragonie/random_compat": "~2.0",
- "phpunit/phpunit": "~5.4"
- },
- "type": "library",
- "autoload": {
- "files": [
- "src/helpers.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Elf Sundae",
- "email": "elf.sundae@gmail.com",
- "homepage": "https://0x123.com"
- }
- ],
- "description": "URL safe base64 encoding for PHP",
- "homepage": "https://github.com/ElfSundae/urlsafe-base64",
- "keywords": [
- "base64",
- "urlsafe"
- ],
- "time": "2017-12-11T14:50:59+00:00"
- },
{
"name": "erusev/parsedown",
"version": "1.7.3",
@@ -942,101 +820,45 @@
"description": "Highlight PHP code in terminal",
"time": "2018-09-29T18:48:56+00:00"
},
- {
- "name": "jenssegers/optimus",
- "version": "v1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/jenssegers/optimus.git",
- "reference": "83e1a6537124f3f05e9a22c99828157f5826a39f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/jenssegers/optimus/zipball/83e1a6537124f3f05e9a22c99828157f5826a39f",
- "reference": "83e1a6537124f3f05e9a22c99828157f5826a39f",
- "shasum": ""
- },
- "require": {
- "php": ">=7.0.0",
- "phpseclib/phpseclib": "^2.0",
- "symfony/console": "^3.0|^4.0"
- },
- "require-dev": {
- "php-coveralls/php-coveralls": "^2.1",
- "phpunit/phpunit": "^6.0|^7.0"
- },
- "suggest": {
- "ext-gmp": "Required for 32bit systems"
- },
- "bin": [
- "bin/optimus"
- ],
- "type": "library",
- "autoload": {
- "psr-4": {
- "Jenssegers\\Optimus\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jens Segers",
- "homepage": "https://jenssegers.com"
- }
- ],
- "description": "Id obfuscation based on Knuth's integer hash method",
- "homepage": "https://github.com/jenssegers/optimus",
- "keywords": [
- "hashids",
- "id obfuscation",
- "ids",
- "obfuscation",
- "optimus"
- ],
- "time": "2019-01-22T21:34:26+00:00"
- },
{
"name": "laravel/framework",
- "version": "v5.8.34",
+ "version": "v6.0.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "c3a870b96c7afe5174f486af74768ccfddeec77b"
+ "reference": "89c81d4dc37714d82521d05dc003b26b2a86defc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/c3a870b96c7afe5174f486af74768ccfddeec77b",
- "reference": "c3a870b96c7afe5174f486af74768ccfddeec77b",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/89c81d4dc37714d82521d05dc003b26b2a86defc",
+ "reference": "89c81d4dc37714d82521d05dc003b26b2a86defc",
"shasum": ""
},
"require": {
"doctrine/inflector": "^1.1",
"dragonmantank/cron-expression": "^2.0",
- "egulias/email-validator": "^2.0",
+ "egulias/email-validator": "^2.1.10",
"erusev/parsedown": "^1.7",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"league/flysystem": "^1.0.8",
- "monolog/monolog": "^1.12",
- "nesbot/carbon": "^1.26.3 || ^2.0",
+ "monolog/monolog": "^1.12|^2.0",
+ "nesbot/carbon": "^2.0",
"opis/closure": "^3.1",
- "php": "^7.1.3",
+ "php": "^7.2",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^3.7",
"swiftmailer/swiftmailer": "^6.0",
- "symfony/console": "^4.2",
- "symfony/debug": "^4.2",
- "symfony/finder": "^4.2",
- "symfony/http-foundation": "^4.2",
- "symfony/http-kernel": "^4.2",
- "symfony/process": "^4.2",
- "symfony/routing": "^4.2",
- "symfony/var-dumper": "^4.2",
+ "symfony/console": "^4.3.4",
+ "symfony/debug": "^4.3.4",
+ "symfony/finder": "^4.3.4",
+ "symfony/http-foundation": "^4.3.4",
+ "symfony/http-kernel": "^4.3.4",
+ "symfony/process": "^4.3.4",
+ "symfony/routing": "^4.3.4",
+ "symfony/var-dumper": "^4.3.4",
"tijsverkoyen/css-to-inline-styles": "^2.2.1",
"vlucas/phpdotenv": "^3.3"
},
@@ -1076,46 +898,44 @@
"require-dev": {
"aws/aws-sdk-php": "^3.0",
"doctrine/dbal": "^2.6",
- "filp/whoops": "^2.1.4",
+ "filp/whoops": "^2.4",
"guzzlehttp/guzzle": "^6.3",
"league/flysystem-cached-adapter": "^1.0",
- "mockery/mockery": "^1.0",
+ "mockery/mockery": "^1.2.3",
"moontoast/math": "^1.1",
- "orchestra/testbench-core": "3.8.*",
+ "orchestra/testbench-core": "^4.0",
"pda/pheanstalk": "^4.0",
- "phpunit/phpunit": "^7.5|^8.0",
+ "phpunit/phpunit": "^8.3",
"predis/predis": "^1.1.1",
- "symfony/css-selector": "^4.2",
- "symfony/dom-crawler": "^4.2",
+ "symfony/cache": "^4.3",
"true/punycode": "^2.1"
},
"suggest": {
- "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).",
+ "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
+ "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
+ "ext-memcached": "Required to use the memcache cache driver.",
"ext-pcntl": "Required to use all features of the queue worker.",
"ext-posix": "Required to use all features of the queue worker.",
- "filp/whoops": "Required for friendly error pages in development (^2.1.4).",
+ "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).",
- "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).",
+ "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).",
"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-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
- "nexmo/client": "Required to use the Nexmo transport (^1.0).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
- "predis/predis": "Required to use the redis cache and queue drivers (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).",
- "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).",
- "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).",
+ "symfony/cache": "Required to PSR-6 cache bridge (^4.3).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).",
"wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.8-dev"
+ "dev-master": "6.x-dev"
}
},
"autoload": {
@@ -1143,7 +963,7 @@
"framework",
"laravel"
],
- "time": "2019-08-27T14:35:59+00:00"
+ "time": "2019-09-03T13:09:57+00:00"
},
{
"name": "laravel/scout",
@@ -1359,21 +1179,21 @@
},
{
"name": "maatwebsite/excel",
- "version": "3.1.15",
+ "version": "3.1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/Maatwebsite/Laravel-Excel.git",
- "reference": "7d47c7af2ddcf93b4fee4f167e10702e918f69f1"
+ "reference": "a330e8ef54ef7c0e2b98606ace3b766b6e5350ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/7d47c7af2ddcf93b4fee4f167e10702e918f69f1",
- "reference": "7d47c7af2ddcf93b4fee4f167e10702e918f69f1",
+ "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/a330e8ef54ef7c0e2b98606ace3b766b6e5350ed",
+ "reference": "a330e8ef54ef7c0e2b98606ace3b766b6e5350ed",
"shasum": ""
},
"require": {
"ext-json": "*",
- "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*",
+ "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0",
"opis/closure": "^3.1",
"php": "^7.0",
"phpoffice/phpspreadsheet": "^1.6"
@@ -1423,7 +1243,74 @@
"php",
"phpspreadsheet"
],
- "time": "2019-07-16T08:40:48+00:00"
+ "time": "2019-09-03T14:08:00+00:00"
+ },
+ {
+ "name": "marceauka/laravel-scout-tntsearch-driver",
+ "version": "v7.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/MarceauKa/laravel-scout-tntsearch-driver.git",
+ "reference": "796be6a325e62e0f7627049cf72ef84b791c26bf"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/MarceauKa/laravel-scout-tntsearch-driver/zipball/796be6a325e62e0f7627049cf72ef84b791c26bf",
+ "reference": "796be6a325e62e0f7627049cf72ef84b791c26bf",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/bus": "^6.0|^7.0",
+ "illuminate/contracts": "^6.0|^7.0",
+ "illuminate/database": "^6.0|^7.0",
+ "illuminate/pagination": "^6.0|^7.0",
+ "illuminate/queue": "^6.0|^7.0",
+ "illuminate/support": "^6.0|^7.0",
+ "laravel/scout": "^7.1",
+ "php": ">=7.2",
+ "teamtnt/tntsearch": "2.*"
+ },
+ "require-dev": {
+ "mockery/mockery": "^1.0",
+ "phpunit/phpunit": "^8.0"
+ },
+ "suggest": {
+ "teamtnt/tntsearch": "Required to use the TNTSearch engine."
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ },
+ "laravel": {
+ "providers": [
+ "TeamTNT\\Scout\\TNTSearchScoutServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "TeamTNT\\Scout\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "TNT Studio",
+ "email": "info@tntstudio.hr"
+ }
+ ],
+ "description": "Driver for Laravel Scout search package based on https://github.com/teamtnt/tntsearch",
+ "keywords": [
+ "laravel",
+ "scout",
+ "search",
+ "tntsearch"
+ ],
+ "time": "2019-09-03T14:10:14+00:00"
},
{
"name": "markbaker/complex",
@@ -1948,16 +1835,16 @@
},
{
"name": "opis/closure",
- "version": "3.3.1",
+ "version": "3.4.0",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
- "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722"
+ "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opis/closure/zipball/92927e26d7fc3f271efe1f55bdbb073fbb2f0722",
- "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722",
+ "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7",
+ "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7",
"shasum": ""
},
"require": {
@@ -2005,7 +1892,7 @@
"serialization",
"serialize"
],
- "time": "2019-07-09T21:58:11+00:00"
+ "time": "2019-09-02T21:07:33+00:00"
},
{
"name": "paragonie/random_compat",
@@ -2195,98 +2082,6 @@
],
"time": "2015-07-25T16:39:46+00:00"
},
- {
- "name": "phpseclib/phpseclib",
- "version": "2.0.21",
- "source": {
- "type": "git",
- "url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9f1287e68b3f283339a9f98f67515dd619e5bf9d",
- "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "phing/phing": "~2.7",
- "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
- "sami/sami": "~2.0",
- "squizlabs/php_codesniffer": "~2.0"
- },
- "suggest": {
- "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
- "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
- "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
- "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
- },
- "type": "library",
- "autoload": {
- "files": [
- "phpseclib/bootstrap.php"
- ],
- "psr-4": {
- "phpseclib\\": "phpseclib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jim Wigginton",
- "role": "Lead Developer",
- "email": "terrafrost@php.net"
- },
- {
- "name": "Patrick Monnerat",
- "role": "Developer",
- "email": "pm@datasphere.ch"
- },
- {
- "name": "Andreas Fischer",
- "role": "Developer",
- "email": "bantu@phpbb.com"
- },
- {
- "name": "Hans-Jürgen Petrich",
- "role": "Developer",
- "email": "petrich@tronic-media.com"
- },
- {
- "name": "Graham Campbell",
- "role": "Developer",
- "email": "graham@alt-three.com"
- }
- ],
- "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
- "homepage": "http://phpseclib.sourceforge.net",
- "keywords": [
- "BigInteger",
- "aes",
- "asn.1",
- "asn1",
- "blowfish",
- "crypto",
- "cryptography",
- "encryption",
- "rsa",
- "security",
- "sftp",
- "signature",
- "signing",
- "ssh",
- "twofish",
- "x.509",
- "x509"
- ],
- "time": "2019-07-12T12:53:49+00:00"
- },
{
"name": "predis/predis",
"version": "v1.1.1",
@@ -2637,76 +2432,6 @@
],
"time": "2018-07-19T23:38:55+00:00"
},
- {
- "name": "spatie/laravel-feed",
- "version": "2.3.1",
- "source": {
- "type": "git",
- "url": "https://github.com/spatie/laravel-feed.git",
- "reference": "a712b4ead19acec9f6626926ec71706d90a1b1a1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-feed/zipball/a712b4ead19acec9f6626926ec71706d90a1b1a1",
- "reference": "a712b4ead19acec9f6626926ec71706d90a1b1a1",
- "shasum": ""
- },
- "require": {
- "laravel/framework": "~5.8.0",
- "php": "^7.2"
- },
- "require-dev": {
- "orchestra/testbench": "~3.8.0",
- "phpunit/phpunit": "^8.0",
- "spatie/phpunit-snapshot-assertions": "^2.0"
- },
- "type": "library",
- "extra": {
- "laravel": {
- "providers": [
- "Spatie\\Feed\\FeedServiceProvider"
- ]
- }
- },
- "autoload": {
- "psr-4": {
- "Spatie\\Feed\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jolita Grazyte",
- "role": "Developer",
- "email": "jolita@spatie.be",
- "homepage": "https://spatie.be"
- },
- {
- "name": "Freek Van der Herten",
- "role": "Developer",
- "email": "freek@spatie.be",
- "homepage": "https://spatie.be"
- },
- {
- "name": "Sebastian De Deyne",
- "role": "Developer",
- "email": "sebastian@spatie.be",
- "homepage": "https://spatie.be"
- }
- ],
- "description": "Generates rss feed",
- "homepage": "https://github.com/spatie/laravel-feed",
- "keywords": [
- "laravel",
- "laravel-feed",
- "rss",
- "spatie"
- ],
- "time": "2019-08-29T06:30:56+00:00"
- },
{
"name": "spatie/valuestore",
"version": "1.2.3",
@@ -4186,73 +3911,6 @@
],
"time": "2019-08-26T08:26:39+00:00"
},
- {
- "name": "teamtnt/laravel-scout-tntsearch-driver",
- "version": "v7.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/teamtnt/laravel-scout-tntsearch-driver.git",
- "reference": "2a379a947979cc46076be06b67b0781d7606d94a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/teamtnt/laravel-scout-tntsearch-driver/zipball/2a379a947979cc46076be06b67b0781d7606d94a",
- "reference": "2a379a947979cc46076be06b67b0781d7606d94a",
- "shasum": ""
- },
- "require": {
- "illuminate/bus": "~5.4",
- "illuminate/contracts": "~5.4",
- "illuminate/database": "~5.4",
- "illuminate/pagination": "~5.4",
- "illuminate/queue": "~5.4",
- "illuminate/support": "~5.4",
- "laravel/scout": "7.*",
- "php": ">=7.1",
- "teamtnt/tntsearch": "2.*"
- },
- "require-dev": {
- "mockery/mockery": "~0.9",
- "phpunit/phpunit": "~5.0"
- },
- "suggest": {
- "teamtnt/tntsearch": "Required to use the TNTSearch engine."
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- },
- "laravel": {
- "providers": [
- "TeamTNT\\Scout\\TNTSearchScoutServiceProvider"
- ]
- }
- },
- "autoload": {
- "psr-4": {
- "TeamTNT\\Scout\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "TNT Studio",
- "email": "info@tntstudio.hr"
- }
- ],
- "description": "Driver for Laravel Scout search package based on https://github.com/teamtnt/tntsearch",
- "keywords": [
- "laravel",
- "scout",
- "search",
- "tntsearch"
- ],
- "time": "2019-07-03T09:37:10+00:00"
- },
{
"name": "teamtnt/tntsearch",
"version": "v2.1.0",
@@ -4356,58 +4014,6 @@
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"time": "2017-11-27T11:13:29+00:00"
},
- {
- "name": "tuupola/base62",
- "version": "2.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/tuupola/base62.git",
- "reference": "3ad889519d5eda50a9c0793c66dda85f6a3787e9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/tuupola/base62/zipball/3ad889519d5eda50a9c0793c66dda85f6a3787e9",
- "reference": "3ad889519d5eda50a9c0793c66dda85f6a3787e9",
- "shasum": ""
- },
- "require": {
- "php": "^7.1"
- },
- "require-dev": {
- "overtrue/phplint": "^1.0",
- "phpbench/phpbench": "^0.15.0",
- "phpstan/phpstan": "^0.10.6",
- "phpunit/phpunit": "^5.0|^6.0|^7.0",
- "squizlabs/php_codesniffer": "^3.0"
- },
- "suggest": {
- "ext-gmp": "GMP extension provides the fastest encoding and decoding."
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Tuupola\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Mika Tuupola",
- "role": "Developer",
- "email": "tuupola@appelsiini.net",
- "homepage": "https://appelsiini.net/"
- }
- ],
- "description": "Base62 encoder and decoder for arbitrary data",
- "homepage": "https://github.com/tuupola/base62",
- "keywords": [
- "base62"
- ],
- "time": "2018-12-30T09:27:05+00:00"
- },
{
"name": "vierbergenlars/php-semver",
"version": "3.0.2",
@@ -4520,96 +4126,41 @@
],
"packages-dev": [
{
- "name": "apix/log",
- "version": "1.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/apix/log.git",
- "reference": "fd9b520fa962d7dfba410c08ea59894819b2fcd3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/apix/log/zipball/fd9b520fa962d7dfba410c08ea59894819b2fcd3",
- "reference": "fd9b520fa962d7dfba410c08ea59894819b2fcd3",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3",
- "psr/log": "~1.0"
- },
- "provide": {
- "psr/log-implementation": "1.0.0"
- },
- "require-dev": {
- "phpunit/phpunit": "4.8.*"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Apix\\Log\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Franck Cassedanne",
- "email": "franck@ouarz.net"
- }
- ],
- "description": "Minimalist, thin and fast PSR-3 compliant (multi-bucket) logger.",
- "homepage": "https://github.com/frqnck/apix-log",
- "keywords": [
- "apix",
- "log",
- "logger",
- "psr",
- "psr-3"
- ],
- "time": "2016-09-22T10:51:22+00:00"
- },
- {
- "name": "beyondcode/laravel-dump-server",
- "version": "1.3.0",
+ "name": "doctrine/instantiator",
+ "version": "1.2.0",
"source": {
"type": "git",
- "url": "https://github.com/beyondcode/laravel-dump-server.git",
- "reference": "fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a"
+ "url": "https://github.com/doctrine/instantiator.git",
+ "reference": "a2c590166b2133a4633738648b6b064edae0814a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/beyondcode/laravel-dump-server/zipball/fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a",
- "reference": "fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
+ "reference": "a2c590166b2133a4633738648b6b064edae0814a",
"shasum": ""
},
"require": {
- "illuminate/console": "5.6.*|5.7.*|5.8.*|^6.0",
- "illuminate/http": "5.6.*|5.7.*|5.8.*|^6.0",
- "illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0",
- "php": "^7.1",
- "symfony/var-dumper": "^4.1.1"
+ "php": "^7.1"
},
"require-dev": {
- "larapack/dd": "^1.0",
+ "doctrine/coding-standard": "^6.0",
+ "ext-pdo": "*",
+ "ext-phar": "*",
+ "phpbench/phpbench": "^0.13",
+ "phpstan/phpstan-phpunit": "^0.11",
+ "phpstan/phpstan-shim": "^0.11",
"phpunit/phpunit": "^7.0"
},
"type": "library",
"extra": {
- "laravel": {
- "providers": [
- "BeyondCode\\DumpServer\\DumpServerServiceProvider"
- ]
+ "branch-alias": {
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
"psr-4": {
- "BeyondCode\\DumpServer\\": "src"
- },
- "files": [
- "helpers.php"
- ]
+ "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -4617,157 +4168,162 @@
],
"authors": [
{
- "name": "Marcel Pociot",
- "role": "Developer",
- "email": "marcel@beyondco.de",
- "homepage": "https://beyondco.de"
+ "name": "Marco Pivetta",
+ "email": "ocramius@gmail.com",
+ "homepage": "http://ocramius.github.com/"
}
],
- "description": "Symfony Var-Dump Server for Laravel",
- "homepage": "https://github.com/beyondcode/laravel-dump-server",
+ "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+ "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
"keywords": [
- "beyondcode",
- "laravel-dump-server"
+ "constructor",
+ "instantiate"
],
- "time": "2019-08-11T13:17:40+00:00"
+ "time": "2019-03-17T17:37:11+00:00"
},
{
- "name": "chrome-php/chrome",
- "version": "v0.6.0",
+ "name": "facade/flare-client-php",
+ "version": "1.0.1",
"source": {
"type": "git",
- "url": "https://github.com/chrome-php/headless-chromium-php.git",
- "reference": "bb2fb2661f008acf3586183b0cf11ea009187863"
+ "url": "https://github.com/facade/flare-client-php.git",
+ "reference": "6c3509372c20255ac19b3b5583216daea0c2f992"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/chrome-php/headless-chromium-php/zipball/bb2fb2661f008acf3586183b0cf11ea009187863",
- "reference": "bb2fb2661f008acf3586183b0cf11ea009187863",
+ "url": "https://api.github.com/repos/facade/flare-client-php/zipball/6c3509372c20255ac19b3b5583216daea0c2f992",
+ "reference": "6c3509372c20255ac19b3b5583216daea0c2f992",
"shasum": ""
},
"require": {
- "apix/log": "^1.2",
- "evenement/evenement": "^3.0.1",
- "php": ">=7.0",
- "psr/log": "^1.0",
- "symfony/filesystem": "^3|^4",
- "symfony/process": "^3|^4",
- "wrench/wrench": "^2.0"
+ "facade/ignition-contracts": "~1.0",
+ "illuminate/pipeline": "~5.5|~5.6|~5.7|~5.8|^6.0",
+ "php": "^7.1",
+ "symfony/http-foundation": "~3.3|~4.1",
+ "symfony/var-dumper": "^3.4|^4.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.0",
- "squizlabs/php_codesniffer": "^3.1",
- "symfony/var-dumper": "^3.3"
+ "larapack/dd": "^1.1",
+ "phpunit/phpunit": "^7.0",
+ "spatie/phpunit-snapshot-assertions": "^2.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "HeadlessChromium\\": "src/"
- }
+ "Facade\\FlareClient\\": "src"
+ },
+ "files": [
+ "src/helpers.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "Fair"
- ],
- "authors": [
- {
- "name": "Soufiane GHZAL",
- "homepage": "https://github.com/gsouf"
- }
+ "MIT"
],
- "description": "Instrument headless chrome/chromium instances from php",
- "homepage": "https://github.com/gsouf/headless-chromium-php",
+ "description": "Send PHP errors to Flare",
+ "homepage": "https://github.com/facade/flare-client-php",
"keywords": [
- "browser",
- "chrome",
- "chromium",
- "crawl",
- "headless",
- "pdf",
- "screenshot"
- ],
- "time": "2018-11-14T20:30:09+00:00"
+ "exception",
+ "facade",
+ "flare",
+ "reporting"
+ ],
+ "time": "2019-09-02T18:43:12+00:00"
},
{
- "name": "doctrine/instantiator",
- "version": "1.2.0",
+ "name": "facade/ignition",
+ "version": "1.4.2",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/instantiator.git",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+ "url": "https://github.com/facade/ignition.git",
+ "reference": "208f19b5101218d71e08c200861bb78f795a36da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/208f19b5101218d71e08c200861bb78f795a36da",
+ "reference": "208f19b5101218d71e08c200861bb78f795a36da",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "facade/flare-client-php": "^1.0",
+ "facade/ignition-contracts": "^1.0",
+ "filp/whoops": "^2.1.4",
+ "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0",
+ "monolog/monolog": "^1.12",
+ "php": "^7.1",
+ "scrivo/highlight.php": "^9.15",
+ "symfony/console": "^3.4|^4.0",
+ "symfony/var-dumper": "^3.4|^4.0"
},
"require-dev": {
- "doctrine/coding-standard": "^6.0",
- "ext-pdo": "*",
- "ext-phar": "*",
- "phpbench/phpbench": "^0.13",
- "phpstan/phpstan-phpunit": "^0.11",
- "phpstan/phpstan-shim": "^0.11",
- "phpunit/phpunit": "^7.0"
+ "friendsofphp/php-cs-fixer": "^2.14",
+ "mockery/mockery": "^1.2",
+ "orchestra/testbench": "^3.5|^3.6|^3.7|^3.8|^4.0"
+ },
+ "suggest": {
+ "laravel/telescope": "^2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.0-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Facade\\Ignition\\IgnitionServiceProvider"
+ ],
+ "aliases": {
+ "Flare": "Facade\\Ignition\\Facades\\Flare"
+ }
}
},
"autoload": {
"psr-4": {
- "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+ "Facade\\Ignition\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com",
- "homepage": "http://ocramius.github.com/"
- }
- ],
- "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
- "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
+ "description": "A beautiful error page for Laravel apps",
+ "homepage": "https://github.com/facade/ignition",
"keywords": [
- "constructor",
- "instantiate"
+ "error",
+ "flare",
+ "laravel",
+ "page"
],
- "time": "2019-03-17T17:37:11+00:00"
+ "time": "2019-09-03T12:11:56+00:00"
},
{
- "name": "evenement/evenement",
- "version": "v3.0.1",
+ "name": "facade/ignition-contracts",
+ "version": "1.0.0",
"source": {
"type": "git",
- "url": "https://github.com/igorw/evenement.git",
- "reference": "531bfb9d15f8aa57454f5f0285b18bec903b8fb7"
+ "url": "https://github.com/facade/ignition-contracts.git",
+ "reference": "f445db0fb86f48e205787b2592840dd9c80ded28"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/igorw/evenement/zipball/531bfb9d15f8aa57454f5f0285b18bec903b8fb7",
- "reference": "531bfb9d15f8aa57454f5f0285b18bec903b8fb7",
+ "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/f445db0fb86f48e205787b2592840dd9c80ded28",
+ "reference": "f445db0fb86f48e205787b2592840dd9c80ded28",
"shasum": ""
},
"require": {
- "php": ">=7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.0"
+ "php": "^7.1"
},
"type": "library",
"autoload": {
- "psr-0": {
- "Evenement": "src"
+ "psr-4": {
+ "Facade\\IgnitionContracts\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -4776,16 +4332,20 @@
],
"authors": [
{
- "name": "Igor Wiedler",
- "email": "igor@wiedler.ch"
+ "name": "Freek Van der Herten",
+ "email": "freek@spatie.be",
+ "homepage": "https://flareapp.io",
+ "role": "Developer"
}
],
- "description": "Événement is a very simple event dispatching library for PHP",
+ "description": "Solution contracts for Ignition",
+ "homepage": "https://github.com/facade/ignition-contracts",
"keywords": [
- "event-dispatcher",
- "event-emitter"
+ "contracts",
+ "flare",
+ "ignition"
],
- "time": "2017-07-23T21:35:13+00:00"
+ "time": "2019-08-30T14:06:08+00:00"
},
{
"name": "facebook/webdriver",
@@ -5567,40 +5127,40 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "6.1.4",
+ "version": "7.0.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
+ "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
- "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7743bbcfff2a907e9ee4a25be13d0f8ec5e73800",
+ "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-xmlwriter": "*",
- "php": "^7.1",
- "phpunit/php-file-iterator": "^2.0",
+ "php": "^7.2",
+ "phpunit/php-file-iterator": "^2.0.2",
"phpunit/php-text-template": "^1.2.1",
- "phpunit/php-token-stream": "^3.0",
+ "phpunit/php-token-stream": "^3.1.0",
"sebastian/code-unit-reverse-lookup": "^1.0.1",
- "sebastian/environment": "^3.1 || ^4.0",
+ "sebastian/environment": "^4.2.2",
"sebastian/version": "^2.0.1",
- "theseer/tokenizer": "^1.1"
+ "theseer/tokenizer": "^1.1.3"
},
"require-dev": {
- "phpunit/phpunit": "^7.0"
+ "phpunit/phpunit": "^8.2.2"
},
"suggest": {
- "ext-xdebug": "^2.6.0"
+ "ext-xdebug": "^2.7.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.1-dev"
+ "dev-master": "7.0-dev"
}
},
"autoload": {
@@ -5615,8 +5175,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
@@ -5626,7 +5186,7 @@
"testing",
"xunit"
],
- "time": "2018-10-31T16:06:48+00:00"
+ "time": "2019-07-25T05:31:54+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -5819,53 +5379,52 @@
},
{
"name": "phpunit/phpunit",
- "version": "7.5.15",
+ "version": "8.3.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "d79c053d972856b8b941bb233e39dc521a5093f0"
+ "reference": "e31cce0cf4499c0ccdbbb211a3280d36ab341e36"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d79c053d972856b8b941bb233e39dc521a5093f0",
- "reference": "d79c053d972856b8b941bb233e39dc521a5093f0",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e31cce0cf4499c0ccdbbb211a3280d36ab341e36",
+ "reference": "e31cce0cf4499c0ccdbbb211a3280d36ab341e36",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.1",
+ "doctrine/instantiator": "^1.2.0",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
- "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.7",
- "phpunit/php-file-iterator": "^2.0.1",
+ "ext-xmlwriter": "*",
+ "myclabs/deep-copy": "^1.9.1",
+ "phar-io/manifest": "^1.0.3",
+ "phar-io/version": "^2.0.1",
+ "php": "^7.2",
+ "phpspec/prophecy": "^1.8.1",
+ "phpunit/php-code-coverage": "^7.0.7",
+ "phpunit/php-file-iterator": "^2.0.2",
"phpunit/php-text-template": "^1.2.1",
- "phpunit/php-timer": "^2.1",
- "sebastian/comparator": "^3.0",
- "sebastian/diff": "^3.0",
- "sebastian/environment": "^4.0",
- "sebastian/exporter": "^3.1",
- "sebastian/global-state": "^2.0",
+ "phpunit/php-timer": "^2.1.2",
+ "sebastian/comparator": "^3.0.2",
+ "sebastian/diff": "^3.0.2",
+ "sebastian/environment": "^4.2.2",
+ "sebastian/exporter": "^3.1.0",
+ "sebastian/global-state": "^3.0.0",
"sebastian/object-enumerator": "^3.0.3",
- "sebastian/resource-operations": "^2.0",
+ "sebastian/resource-operations": "^2.0.1",
+ "sebastian/type": "^1.1.3",
"sebastian/version": "^2.0.1"
},
- "conflict": {
- "phpunit/phpunit-mock-objects": "*"
- },
"require-dev": {
"ext-pdo": "*"
},
"suggest": {
"ext-soap": "*",
"ext-xdebug": "*",
- "phpunit/php-invoker": "^2.0"
+ "phpunit/php-invoker": "^2.0.0"
},
"bin": [
"phpunit"
@@ -5873,7 +5432,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "7.5-dev"
+ "dev-master": "8.3-dev"
}
},
"autoload": {
@@ -5888,8 +5447,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "The PHP Unit Testing framework.",
@@ -5899,7 +5458,74 @@
"testing",
"xunit"
],
- "time": "2019-08-21T07:05:16+00:00"
+ "time": "2019-08-11T06:56:55+00:00"
+ },
+ {
+ "name": "scrivo/highlight.php",
+ "version": "v9.15.10.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/scrivo/highlight.php.git",
+ "reference": "9ad3adb4456dc91196327498dbbce6aa1ba1239e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/9ad3adb4456dc91196327498dbbce6aa1ba1239e",
+ "reference": "9ad3adb4456dc91196327498dbbce6aa1ba1239e",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "php": ">=5.4"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8|^5.7",
+ "symfony/finder": "^2.8"
+ },
+ "suggest": {
+ "ext-dom": "Needed to make use of the features in the utilities namespace"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Highlight\\": "",
+ "HighlightUtilities\\": ""
+ },
+ "files": [
+ "HighlightUtilities/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Geert Bergman",
+ "role": "Project Author",
+ "homepage": "http://www.scrivo.org/"
+ },
+ {
+ "name": "Vladimir Jimenez",
+ "role": "Contributor",
+ "homepage": "https://allejo.io"
+ },
+ {
+ "name": "Martin Folkers",
+ "role": "Contributor",
+ "homepage": "https://twobrain.io"
+ }
+ ],
+ "description": "Server side syntax highlighter that supports 185 languages. It's a PHP port of highlight.js",
+ "keywords": [
+ "code",
+ "highlight",
+ "highlight.js",
+ "highlight.php",
+ "syntax"
+ ],
+ "time": "2019-08-27T04:27:48+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -6188,23 +5814,26 @@
},
{
"name": "sebastian/global-state",
- "version": "2.0.0",
+ "version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
+ "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
- "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
+ "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": "^7.2",
+ "sebastian/object-reflector": "^1.1.1",
+ "sebastian/recursion-context": "^3.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.0"
+ "ext-dom": "*",
+ "phpunit/phpunit": "^8.0"
},
"suggest": {
"ext-uopz": "*"
@@ -6212,7 +5841,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -6235,7 +5864,7 @@
"keywords": [
"global state"
],
- "time": "2017-04-27T15:39:26+00:00"
+ "time": "2019-02-01T05:30:01+00:00"
},
{
"name": "sebastian/object-enumerator",
@@ -6425,26 +6054,29 @@
"time": "2018-10-04T04:07:39+00:00"
},
{
- "name": "sebastian/version",
- "version": "2.0.1",
+ "name": "sebastian/type",
+ "version": "1.1.3",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/version.git",
- "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+ "url": "https://github.com/sebastianbergmann/type.git",
+ "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
- "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3",
+ "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3",
"shasum": ""
},
"require": {
- "php": ">=5.6"
+ "php": "^7.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^8.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "1.1-dev"
}
},
"autoload": {
@@ -6459,63 +6091,56 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
- "description": "Library that helps with managing the version number of Git-hosted PHP projects",
- "homepage": "https://github.com/sebastianbergmann/version",
- "time": "2016-10-03T07:35:21+00:00"
+ "description": "Collection of value objects that represent the types of the PHP type system",
+ "homepage": "https://github.com/sebastianbergmann/type",
+ "time": "2019-07-02T08:10:15+00:00"
},
{
- "name": "symfony/filesystem",
- "version": "v4.3.4",
+ "name": "sebastian/version",
+ "version": "2.0.1",
"source": {
"type": "git",
- "url": "https://github.com/symfony/filesystem.git",
- "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263"
+ "url": "https://github.com/sebastianbergmann/version.git",
+ "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/9abbb7ef96a51f4d7e69627bc6f63307994e4263",
- "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+ "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "symfony/polyfill-ctype": "~1.8"
+ "php": ">=5.6"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Component\\Filesystem\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
+ "classmap": [
+ "src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Sebastian Bergmann",
+ "role": "lead",
+ "email": "sebastian@phpunit.de"
}
],
- "description": "Symfony Filesystem Component",
- "homepage": "https://symfony.com",
- "time": "2019-08-20T14:07:54+00:00"
+ "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+ "homepage": "https://github.com/sebastianbergmann/version",
+ "time": "2016-10-03T07:35:21+00:00"
},
{
"name": "theseer/tokenizer",
@@ -6606,69 +6231,6 @@
"validate"
],
"time": "2019-08-24T08:43:50+00:00"
- },
- {
- "name": "wrench/wrench",
- "version": "v2.0.8",
- "source": {
- "type": "git",
- "url": "https://github.com/varspool/Wrench.git",
- "reference": "92fb5d1c5d7a6f65884ade658b6271de93edafc2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/varspool/Wrench/zipball/92fb5d1c5d7a6f65884ade658b6271de93edafc2",
- "reference": "92fb5d1c5d7a6f65884ade658b6271de93edafc2",
- "shasum": ""
- },
- "require": {
- "ext-sockets": "*",
- "php": ">=5.3"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.5",
- "squizlabs/php_codesniffer": "*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Wrench": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "WTFPL"
- ],
- "authors": [
- {
- "name": "Dominic Scheirlinck",
- "email": "dominic@varspool.com",
- "homepage": "http://www.somethingemporium.com/"
- },
- {
- "name": "Simon Samtleben",
- "email": "web@lemmingzshadow.net",
- "homepage": "http://lemmingzshadow.net/"
- },
- {
- "name": "Nico Kaiser",
- "email": "nico@kaiser.me",
- "homepage": "http://siriux.net/"
- }
- ],
- "description": "PHP WebSocket client/server library",
- "homepage": "http://github.com/varspool/Wrench",
- "keywords": [
- "WebSockets",
- "hybi",
- "websocket"
- ],
- "time": "2017-02-12T02:08:51+00:00"
}
],
"aliases": [],
@@ -6677,7 +6239,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
- "php": "^7.1.3"
+ "php": "^7.2"
},
"platform-dev": []
}
diff --git a/config/feed.php b/config/feed.php
deleted file mode 100644
index 67781f2..0000000
--- a/config/feed.php
+++ /dev/null
@@ -1,12 +0,0 @@
- [
- 'main' => [
- 'items' => 'App\\Link::getFeedItems',
- 'url' => '/feed',
- 'title' => env('APP_NAME'),
- 'view' => 'feed::feed',
- ],
- ],
-];
diff --git a/config/hashid.php b/config/hashid.php
deleted file mode 100644
index d1396ff..0000000
--- a/config/hashid.php
+++ /dev/null
@@ -1,13 +0,0 @@
- env('HASHID_CONNECTION', 'hashids'),
- 'connections' => [
- 'hashids' => [
- 'driver' => 'hashids',
- 'salt' => env('HASHIDS_SALT', ''),
- 'min_length' => env('HASHIDS_MIN_LENGTH', 0),
- 'alphabet' => env('HASHIDS_ALPHABET', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'),
- ],
- ],
-];
diff --git a/config/mail.php b/config/mail.php
index 82efa31..8bc65c8 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -1,7 +1,7 @@
env('MAIL_DRIVER', 'smtp'),
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
diff --git a/config/queue.php b/config/queue.php
index ddcac8a..317ca4b 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -37,6 +37,7 @@
],
],
'failed' => [
+ 'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
],
diff --git a/config/shaarli.php b/config/shaarli.php
index eefbbfc..b83be3c 100644
--- a/config/shaarli.php
+++ b/config/shaarli.php
@@ -10,4 +10,8 @@
'link_archive_media' => true,
'node_bin' => '/usr/bin/node',
'youtube_dl_bin' => '/usr/bin/youtube-dl',
+ 'hashids' => [
+ 'salt' => env('HASHIDS_SALT', 'default-salt'),
+ 'min' => env('HASHIDS_MIN_LENGTH', 10),
+ ],
];
diff --git a/readme.md b/readme.md
index c4d53b4..4b88ace 100644
--- a/readme.md
+++ b/readme.md
@@ -25,9 +25,12 @@ but built with [Laravel](https://github.com/laravel/laravel) and [Vue.js](https:
## Requirements
-- PHP >= 7.1
-- Apache or nginx
-- MySQL >= 5.7 or SQLite >= 3
+- Linux or macOS env
+- PHP >= 7.2
+- MySQL >= 5.7 (or SQLite >= 3)
+- Node.js >= 6
+- (Optional) Redis
+- (Optional) [youtube-dl](https://github.com/ytdl-org/youtube-dl)
## Features
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 345b1e1..825cd63 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -165,6 +165,5 @@
"Export type or format not recognized": "Type d'export ou format non-reconnu",
- "Source code": "Code source",
- "RSS Feed": "Flux RSS"
+ "Source code": "Code source"
}
diff --git a/resources/views/layouts/partials/footer.blade.php b/resources/views/layouts/partials/footer.blade.php
index e7ae5cd..b567bb9 100644
--- a/resources/views/layouts/partials/footer.blade.php
+++ b/resources/views/layouts/partials/footer.blade.php
@@ -1,7 +1,6 @@
diff --git a/resources/views/layouts/partials/head.blade.php b/resources/views/layouts/partials/head.blade.php
index b872456..4f359fb 100644
--- a/resources/views/layouts/partials/head.blade.php
+++ b/resources/views/layouts/partials/head.blade.php
@@ -6,7 +6,6 @@
@endif
@stack('meta')
-@include('feed::links')
diff --git a/resources/views/link-archive.blade.php b/resources/views/link-archive.blade.php
index dd39131..34cabe8 100644
--- a/resources/views/link-archive.blade.php
+++ b/resources/views/link-archive.blade.php
@@ -36,7 +36,7 @@
@if(in_array('media', $providers))
- | {{ __('Archive media') }} |
+ {{ __('Archive as Media') }} |
|
@@ -45,7 +45,7 @@
@if(in_array('pdf', $providers))
- | {{ __('Archive PDF') }} |
+ {{ __('Archive as PDF') }} |
|
diff --git a/routes/web.php b/routes/web.php
index 83caec5..857f1af 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -8,8 +8,6 @@
'verify' => false,
]);
-Route::feeds();
-
Route::get('/', 'BrowseController@index')->name('home');
Route::get('/tag/{tag}', 'BrowseController@tag')->name('tag');
diff --git a/tests/boostrap.php b/tests/boostrap.php
new file mode 100644
index 0000000..a07a2fa
--- /dev/null
+++ b/tests/boostrap.php
@@ -0,0 +1,22 @@
+make(Kernel::class))->bootstrap();
+foreach ($commands as $command) {
+ $console->call($command);
+}
\ No newline at end of file