From fb2cd0eee75493933de84a31a7139c48f1abbd6b Mon Sep 17 00:00:00 2001
From: catsworld <519418441@qq.com>
Date: Fri, 10 Mar 2017 10:49:08 +0800
Subject: [PATCH] A huge develop update to commit. Upgrade the Laravel to
version 5.4. Optimize the directory structure. Add a avatar function. Add the
validate for addGood form. Adjust the frontend pages. Other changes.
---
.env.example | 10 +-
app/Http/Controllers/AdminController.php | 1 -
app/Http/Controllers/Auth/AuthController.php | 72 -
.../Controllers/Auth/PasswordController.php | 32 -
app/Http/Controllers/ContentController.php | 11 +-
app/Http/Controllers/GoodController.php | 14 +-
app/Http/Controllers/UserController.php | 24 +
app/Http/Requests/addGoodRequest.php | 53 +
app/Http/routes.php | 8 +
app/Providers/.RouteServiceProvider.php.swp | Bin 0 -> 12288 bytes
app/Providers/EventServiceProvider.php | 9 +-
app/Providers/RouteServiceProvider.php | 30 +-
composer.json | 4 +-
composer.lock | 1738 +++++++++--------
...016_03_23_054640_create_good_cat_table.php | 1 +
...16_03_23_061239_create_good_info_table.php | 3 +-
...01_17_171622_create_announcement_table.php | 1 -
database/seeds/GoodCatSeeder.php | 12 +-
public/css/app.css | 39 +-
public/img/banner.jpg | Bin 242825 -> 2008004 bytes
resources/views/admin/index.blade.php | 3 +-
.../views/admin/sendannouncement.blade.php | 1 -
resources/views/good/addPage.blade.php | 10 +-
resources/views/good/goodInfo.blade.php | 8 +-
resources/views/good/goodList.blade.php | 45 +-
resources/views/layout/header.blade.php | 11 +-
resources/views/layout/search.blade.php | 8 +-
resources/views/user/editinfo.blade.php | 51 +-
.../vendor/pagination/bootstrap-4.blade.php | 36 +
.../views/vendor/pagination/default.blade.php | 28 +
.../pagination/simple-bootstrap-4.blade.php | 17 +
.../pagination/simple-default.blade.php | 17 +
resources/views/welcome.blade.php | 65 +-
33 files changed, 1325 insertions(+), 1037 deletions(-)
delete mode 100644 app/Http/Controllers/Auth/AuthController.php
delete mode 100644 app/Http/Controllers/Auth/PasswordController.php
create mode 100644 app/Http/Requests/addGoodRequest.php
create mode 100644 app/Providers/.RouteServiceProvider.php.swp
create mode 100644 resources/views/vendor/pagination/bootstrap-4.blade.php
create mode 100644 resources/views/vendor/pagination/default.blade.php
create mode 100644 resources/views/vendor/pagination/simple-bootstrap-4.blade.php
create mode 100644 resources/views/vendor/pagination/simple-default.blade.php
diff --git a/.env.example b/.env.example
index 939a69c..86aab15 100644
--- a/.env.example
+++ b/.env.example
@@ -18,8 +18,8 @@ REDIS_PASSWORD=null
REDIS_PORT=6379
MAIL_DRIVER=smtp
-MAIL_HOST=smtp.qq.com
-MAIL_PORT=465
-MAIL_USERNAME=519418441@qq.com
-MAIL_PASSWORD=rrmdasvmcnzhcbea
-MAIL_ENCRYPTION=ssl
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 5dbf53a..9a1d644 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -132,7 +132,6 @@ class AdminController extends Controller
$input = $request->all();
$announcement = new Announcement;
$announcement->title = $input['title'];
- $announcement->summary = $input['summary'];
$announcement->content = $input['content'];
$announcement->save();
return Redirect::to('/sendannouncement');
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
deleted file mode 100644
index a100dd6..0000000
--- a/app/Http/Controllers/Auth/AuthController.php
+++ /dev/null
@@ -1,72 +0,0 @@
-middleware($this->guestMiddleware(), ['except' => 'logout']);
- }
-
- /**
- * Get a validator for an incoming registration request.
- *
- * @param array $data
- * @return \Illuminate\Contracts\Validation\Validator
- */
- protected function validator(array $data)
- {
- return Validator::make($data, [
- 'name' => 'required|max:255',
- 'email' => 'required|email|max:255|unique:users',
- 'password' => 'required|min:6|confirmed',
- ]);
- }
-
- /**
- * Create a new user instance after a valid registration.
- *
- * @param array $data
- * @return User
- */
- protected function create(array $data)
- {
- return User::create([
- 'name' => $data['name'],
- 'email' => $data['email'],
- 'password' => bcrypt($data['password']),
- ]);
- }
-}
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
deleted file mode 100644
index 1ceed97..0000000
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ /dev/null
@@ -1,32 +0,0 @@
-middleware('guest');
- }
-}
diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php
index a9baee2..befe0da 100644
--- a/app/Http/Controllers/ContentController.php
+++ b/app/Http/Controllers/ContentController.php
@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\Validator;
use App\Http\Controllers\Controller;
use App\GoodInfo;
+use App\GoodCat;
use App\Announcement;
class ContentController extends Controller
@@ -15,9 +16,13 @@ class ContentController extends Controller
public function Mainpage()
{
$data = [];
- $data['hotgoods'] = GoodInfo::orderby('sold_month', 'asc')->limit(5)->get();
- $data['newgoods'] = GoodInfo::orderby('id', 'dsc')->limit(6)->get();
- $data['announces'] = Announcement::orderby('id', 'dsc')->get();
+ $data['stargoods'] = GoodInfo::where('checked', '1')->where('stared', '1')->orderby('id', 'asc')->limit(5)->get();
+ $data['newgoods'] = GoodInfo::where('checked', '1')->orderby('id', 'dsc')->limit(8)->get();
+ $data['cats'] = GoodCat::orderby('cat_index', 'asc')->get();
+ foreach($data['cats'] as $cat){
+ $data['catgoods'][$cat->cat_name] = GoodInfo::where('cat_id', $cat->id)->where('checked', '1')->inRandomOrder()->limit(4)->get();
+ }
+ $data['announces'] = Announcement::orderby('id', 'dsc')->limit(3)->get();
return View::make('welcome')->with($data);
}
diff --git a/app/Http/Controllers/GoodController.php b/app/Http/Controllers/GoodController.php
index 56f3776..f7faa50 100644
--- a/app/Http/Controllers/GoodController.php
+++ b/app/Http/Controllers/GoodController.php
@@ -18,6 +18,7 @@ use App\FavList;
use App\Http\Controllers\Controller;
use Storage;
use Image;
+use App\Http\Requests\addGoodRequest;
class GoodController extends Controller
{
@@ -33,14 +34,14 @@ class GoodController extends Controller
$input = $request->all();
$query = "";
if(isset($input['query'])) $query = $input['query'];
- $data['cats'] = GoodCat::orderby('cat_name', 'asc')->get();
+ $data['cats'] = GoodCat::orderby('cat_index', 'asc')->get();
$data['goods'] = GoodInfo::where('good_name', 'like', "%$query%");
$data['cat_id'] = 0;
if(isset($input['cat_id'])){
$data['goods'] = GoodInfo::where('cat_id', $input['cat_id']);
$data['cat_id'] = $input['cat_id'];
}
- $data['goods'] = $data['goods']->orderby('id', 'asc')->paginate(16);
+ $data['goods'] = $data['goods']->orderby('id', 'asc')->where('checked', 1)->paginate(16);
if($request->session()->has('user_id'))
$data['user_id'] = $request->session()->get('user_id');
else
@@ -154,13 +155,13 @@ class GoodController extends Controller
* @return Redirect
* @description Add a new good.
*/
- public function addGood(Request $request)
+ public function addGood(addGoodRequest $request)
{
if($request->method() == "GET"){
$data = [];
if(!$request->session()->has('user_id'))
return Redirect::back();
- $data['cats'] = GoodCat::orderby('cat_name', 'asc')->get();
+ $data['cats'] = GoodCat::orderby('cat_index', 'asc')->get();
return view::make('good.addPage')->with($data);
}else{
if(!$request->session()->has('user_id'))
@@ -203,7 +204,7 @@ class GoodController extends Controller
{
if($request->method() == "GET"){
$data = [];
- $data['cats'] = GoodCat::orderby('cat_name', 'asc')->get();
+ $data['cats'] = GoodCat::orderby('cat_index', 'asc')->get();
$data['goods'] = GoodInfo::where('id', $good_id)->get();
return view::make('good.editPage')->with($data);
}else{
@@ -253,7 +254,6 @@ class GoodController extends Controller
}
/*
-<<<<<<< Updated upstream
* @function quickAccess
* @input $request (use query)
*
@@ -266,7 +266,7 @@ class GoodController extends Controller
$data = [];
$input = $request->all();
$query = $input['query'];
- $data['cats'] = GoodCat::orderby('cat_name', 'asc')->get();
+ $data['cats'] = GoodCat::orderby('cat_index', 'asc')->get();
$data['goods'] = GoodInfo::where('good_name', 'like', "%$query%")->get();
if($request->session()->has('user_id'))
$data['user_id'] = $request->session()->get('user_id');
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 231ef2e..bd16704 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -23,6 +23,7 @@ use Illuminate\Support\Facades\Session;
use App\Http\Controllers\Controller;
use Hash;
use Mail;
+use Image;
use App\Http\Requests\RegisterRequest;
use App\Http\Requests\LoginRequest;
@@ -97,6 +98,10 @@ class UserController extends Controller
$user->tel_num = $input['tel_num'];
$user->address = $input['address'];
$user->update();
+ Storage::put(
+ 'avatar/'.$user_id,
+ Image::make($request->file('avatarPic'))->crop(round($input['crop_width']),round($input['crop_height']),round($input['crop_x']),round($input['crop_y']))->resize(800, 450)->encode('data-url')
+ );
return Redirect::to('/user/'.$user_id);
}
@@ -244,4 +249,23 @@ class UserController extends Controller
return Redirect::to('/user/edit_favlist');
}
+ public function getSimpleAvatar(Request $request, $user_id)
+ {
+ if(!Storage::exists('avatar/'.$user_id))
+ $file = Storage::get('public/avatar.jpg');
+ else
+ $file = Storage::get('avatar/'.$user_id);
+ $image = Image::make($file)->resize(600, 600);
+ return $image->response('jpg');
+ }
+
+ public function getAvatar(Request $request, $user_id, $width, $height)
+ {
+ if(!Storage::exists('avatar/'.$user_id))
+ $file = Storage::get('public/avatar.jpg');
+ else
+ $file = Storage::get('avatar/'.$user_id);
+ $image = Image::make($file)->resize($width, $height);
+ return $image->response('jpg');
+ }
}
diff --git a/app/Http/Requests/addGoodRequest.php b/app/Http/Requests/addGoodRequest.php
new file mode 100644
index 0000000..e2f56a6
--- /dev/null
+++ b/app/Http/Requests/addGoodRequest.php
@@ -0,0 +1,53 @@
+method()=='GET') return [];
+ return [
+ 'good_name'=>'required|between:3,128',
+ 'description'=>'max:2048',
+ 'pricemin'=>'required|max:2147483647',
+ 'pricemax'=>'required|max:2147483647',
+ 'counts'=>'required|max:2147483647',
+ 'good_tag'=>'max:128',
+ 'goodTitlePic'=>'required',
+ ];
+ }
+
+ public function messages(){
+ return [
+ 'good_name.required' => '商品名不能为空!',
+ 'good_name.between' => '商品名必须为3=128个字符!',
+ 'description.max' => '商品描述不能多于2048个字符!',
+ 'pricemin.required' => '最低价格不能为空!',
+ 'pricemin.max' => '最低价格不能超过2147483647!',
+ 'pricemax.required' => '最高价格不能为空!',
+ 'pricemax.max' => '最高价格不能超过2147483647!',
+ 'counts.required' => '库存数不能为空!',
+ 'counts.max' => '库存数不能超过2147483647!',
+ 'good_tag.max'=>'TAG不能多于128个字符!',
+ 'goodTitlePic.required' => '必须为商品上传一张图片!',
+ ];
+ }
+}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 17a4f37..e479599 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -87,6 +87,14 @@ Route::group(['middleware' => ['web']],function () {
"uses" => "GoodController@getTitlePic",
]);
+ Route::get('/avatar/{user_id}', [
+ "uses" => "UserController@getSimpleAvatar",
+ ]);
+
+ Route::get('/avatar/{user_id}/{width}/{height}', [
+ "uses" => "UserController@getAvatar",
+ ]);
+
Route::get('/good/{good_id}', [
"uses" => "GoodController@getInfo",
]);
diff --git a/app/Providers/.RouteServiceProvider.php.swp b/app/Providers/.RouteServiceProvider.php.swp
new file mode 100644
index 0000000000000000000000000000000000000000..bfddbab6e931ae67c18efef5ba7f7c884d4f32e5
GIT binary patch
literal 12288
zcmeI2!EX~s6o)50a4ChV+&DcT!cG)>6Dq1GKp=!hi3A8aq^g9gYP>s6Myz*+nOUc8
zgy2wd>HpB)d#HLt{0&@?IB=x5s+V#OCw{wL+mRKhqMlm4kv`Av%
eUor!)W6
z#w}WG&I^=Jg}ARD|a^=E3MV_4~!|gq9oc?9qUYV
z`^&96jkQ$CThiTEA(GZccbw_#L^&U|Odiyxa(x}EVQbUw*nbGm-E4pjyw5-$x{bvX
zTc2N8D8K6G&Yq!DpKZNwG`F(>Hoykh02^QfY=8~00XFbIG!X2Rc!YI*RIP2cs;4IE
z>Xs`uzy{a=8(;%$fDNz#Hoykh02^QfY~Vj=K;qB+-#!+?9Y^x`|9|-V|LsX3_Q4QJ^?>~0E(O!z+cG!4dB8C*Z><~18jf|umLu}2G~Gl;GrOt!Do3j
zbE#}8u8ZQ-gIqgBIEwqNm0_n|TYq?H5yj|#6X)mwLa>o54h8$-7;x=C=F?@fYbxSy;Oi|cTG{~5`#+A1ai^#H=yIGEoX7OW-P{uN?bSeu=
zOC4iE9m_1ciy_fq?!$8&j2?_VN|N83+zqm%o=H?n9i1gQ+xByWHy|jiu&YzlXiy=Z
z$QtLkgNlPnXnN$Au25~o+V(njti5Wo;7pq0`C9d^9muXP9r@reU6puM(MCoxNp#_9
zj&vaH$*Vxpmln5LH)&gC%E@3{%_DsiXf*#IMVcMPx{K`}_ZFebT|mykl;Pr0j>GNJ
z8I8U8LVy}Cd{4xw^qyLWoKPqAT~Jx#Y2xI%5V=>hk*0Z1XELbvn#r@Id=J{2xwXcH
r_VARuZyy>NYo7>uX)@?A(wdBAqN+G}fktYm*q6~f=(&8gI8y%(IJtyD
literal 0
HcmV?d00001
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 58ce962..a182657 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -2,7 +2,7 @@
namespace App\Providers;
-use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
+use Illuminate\Support\Facades\Event;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
class EventServiceProvider extends ServiceProvider
@@ -19,14 +19,13 @@ class EventServiceProvider extends ServiceProvider
];
/**
- * Register any other events for your application.
+ * Register any events for your application.
*
- * @param \Illuminate\Contracts\Events\Dispatcher $events
* @return void
*/
- public function boot(DispatcherContract $events)
+ public function boot()
{
- parent::boot($events);
+ parent::boot();
//
}
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index d50b1c0..d1f1447 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,13 +2,13 @@
namespace App\Providers;
-use Illuminate\Routing\Router;
+use Illuminate\Support\Facades\Route;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
class RouteServiceProvider extends ServiceProvider
{
/**
- * This namespace is applied to the controller routes in your routes file.
+ * This namespace is applied to your controller routes.
*
* In addition, it is set as the URL generator's root namespace.
*
@@ -19,25 +19,39 @@ class RouteServiceProvider extends ServiceProvider
/**
* Define your route model bindings, pattern filters, etc.
*
- * @param \Illuminate\Routing\Router $router
* @return void
*/
- public function boot(Router $router)
+ public function boot()
{
//
- parent::boot($router);
+ parent::boot();
}
/**
* Define the routes for the application.
*
- * @param \Illuminate\Routing\Router $router
* @return void
*/
- public function map(Router $router)
+ public function map()
{
- $router->group(['namespace' => $this->namespace], function ($router) {
+ $this->mapWebRoutes();
+
+ //
+ }
+
+ /**
+ * Define the "web" routes for the application.
+ *
+ * These routes all receive session state, CSRF protection, etc.
+ *
+ * @return void
+ */
+ protected function mapWebRoutes()
+ {
+ Route::group([
+ 'namespace' => $this->namespace, 'middleware' => 'web',
+ ], function ($router) {
require app_path('Http/routes.php');
});
}
diff --git a/composer.json b/composer.json
index 422a585..f7d49b1 100644
--- a/composer.json
+++ b/composer.json
@@ -6,13 +6,13 @@
"type": "project",
"require": {
"php": ">=5.5.9",
- "laravel/framework": "5.2.*",
+ "laravel/framework": "5.4.*",
"intervention/image": "^2.3"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
- "phpunit/phpunit": "~4.0",
+ "phpunit/phpunit": "~5.7",
"symfony/css-selector": "2.8.*|3.0.*",
"symfony/dom-crawler": "2.8.*|3.0.*"
},
diff --git a/composer.lock b/composer.lock
index 941be48..7418761 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,96 +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"
],
- "hash": "2f929a8c425f74c09731c39e50851a20",
- "content-hash": "dc9e2f875ab09ce35cfab8df4953e4fe",
+ "content-hash": "62da527cbaba0f24a9b8d9d60fb87b06",
"packages": [
- {
- "name": "classpreloader/classpreloader",
- "version": "3.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ClassPreloader/ClassPreloader.git",
- "reference": "9b10b913c2bdf90c3d2e0d726b454fb7f77c552a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/9b10b913c2bdf90c3d2e0d726b454fb7f77c552a",
- "reference": "9b10b913c2bdf90c3d2e0d726b454fb7f77c552a",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "^1.0|^2.0",
- "php": ">=5.5.9"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8|^5.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "ClassPreloader\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com"
- },
- {
- "name": "Graham Campbell",
- "email": "graham@alt-three.com"
- }
- ],
- "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case",
- "keywords": [
- "autoload",
- "class",
- "preload"
- ],
- "time": "2015-11-09 22:51:51"
- },
- {
- "name": "dnoegel/php-xdg-base-dir",
- "version": "0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
- "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/265b8593498b997dc2d31e75b89f053b5cc9621a",
- "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "@stable"
- },
- "type": "project",
- "autoload": {
- "psr-4": {
- "XdgBaseDir\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "implementation of xdg base directory specification for php",
- "time": "2014-10-24 07:27:01"
- },
{
"name": "doctrine/inflector",
"version": "v1.1.0",
@@ -159,20 +71,62 @@
"singularize",
"string"
],
- "time": "2015-11-06 14:35:42"
+ "time": "2015-11-06T14:35:42+00:00"
},
{
- "name": "guzzlehttp/psr7",
- "version": "1.3.1",
+ "name": "erusev/parsedown",
+ "version": "1.6.1",
"source": {
"type": "git",
- "url": "https://github.com/guzzle/psr7.git",
- "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
+ "url": "https://github.com/erusev/parsedown.git",
+ "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
- "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
+ "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb",
+ "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Parsedown": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Emanuil Rusev",
+ "email": "hello@erusev.com",
+ "homepage": "http://erusev.com"
+ }
+ ],
+ "description": "Parser for Markdown.",
+ "homepage": "http://parsedown.org",
+ "keywords": [
+ "markdown",
+ "parser"
+ ],
+ "time": "2016-11-02T15:56:58+00:00"
+ },
+ {
+ "name": "guzzlehttp/psr7",
+ "version": "1.4.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/0d6c7ca039329247e4f0f8f8f6506810e8248855",
+ "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855",
"shasum": ""
},
"require": {
@@ -208,29 +162,36 @@
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Schultze",
+ "homepage": "https://github.com/Tobion"
}
],
- "description": "PSR-7 message implementation",
+ "description": "PSR-7 message implementation that also provides common utility methods",
"keywords": [
"http",
"message",
+ "request",
+ "response",
"stream",
- "uri"
+ "uri",
+ "url"
],
- "time": "2016-06-24 23:00:38"
+ "time": "2017-02-27T10:51:17+00:00"
},
{
"name": "intervention/image",
- "version": "2.3.10",
+ "version": "2.3.11",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
- "reference": "88911910dcbb7bf617f1370602ba1706489c8505"
+ "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Intervention/image/zipball/88911910dcbb7bf617f1370602ba1706489c8505",
- "reference": "88911910dcbb7bf617f1370602ba1706489c8505",
+ "url": "https://api.github.com/repos/Intervention/image/zipball/e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
+ "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
"shasum": ""
},
"require": {
@@ -279,191 +240,44 @@
"thumbnail",
"watermark"
],
- "time": "2017-01-25 18:52:04"
- },
- {
- "name": "jakub-onderka/php-console-color",
- "version": "0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "jakub-onderka/php-code-style": "1.0",
- "jakub-onderka/php-parallel-lint": "0.*",
- "jakub-onderka/php-var-dump-check": "0.*",
- "phpunit/phpunit": "3.7.*",
- "squizlabs/php_codesniffer": "1.*"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleColor": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-2-Clause"
- ],
- "authors": [
- {
- "name": "Jakub Onderka",
- "email": "jakub.onderka@gmail.com",
- "homepage": "http://www.acci.cz"
- }
- ],
- "time": "2014-04-08 15:00:19"
- },
- {
- "name": "jakub-onderka/php-console-highlighter",
- "version": "v0.3.2",
- "source": {
- "type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
- "shasum": ""
- },
- "require": {
- "jakub-onderka/php-console-color": "~0.1",
- "php": ">=5.3.0"
- },
- "require-dev": {
- "jakub-onderka/php-code-style": "~1.0",
- "jakub-onderka/php-parallel-lint": "~0.5",
- "jakub-onderka/php-var-dump-check": "~0.1",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~1.5"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleHighlighter": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jakub Onderka",
- "email": "acci@acci.cz",
- "homepage": "http://www.acci.cz/"
- }
- ],
- "time": "2015-04-20 18:58:01"
- },
- {
- "name": "jeremeamia/SuperClosure",
- "version": "2.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/jeremeamia/super_closure.git",
- "reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/29a88be2a4846d27c1613aed0c9071dfad7b5938",
- "reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "^1.2|^2.0",
- "php": ">=5.4",
- "symfony/polyfill-php56": "^1.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.0|^5.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "SuperClosure\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jeremy Lindblom",
- "email": "jeremeamia@gmail.com",
- "homepage": "https://github.com/jeremeamia",
- "role": "Developer"
- }
- ],
- "description": "Serialize Closure objects, including their context and binding",
- "homepage": "https://github.com/jeremeamia/super_closure",
- "keywords": [
- "closure",
- "function",
- "lambda",
- "parser",
- "serializable",
- "serialize",
- "tokenizer"
- ],
- "time": "2015-12-05 17:17:57"
+ "time": "2017-02-04T10:37:19+00:00"
},
{
"name": "laravel/framework",
- "version": "v5.2.23",
+ "version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "87c090845f135ca94eba903f1c8462e60e3a6e36"
+ "reference": "3eebfaa759156e06144892b00bb95304aa5a71c1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/87c090845f135ca94eba903f1c8462e60e3a6e36",
- "reference": "87c090845f135ca94eba903f1c8462e60e3a6e36",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/3eebfaa759156e06144892b00bb95304aa5a71c1",
+ "reference": "3eebfaa759156e06144892b00bb95304aa5a71c1",
"shasum": ""
},
"require": {
- "classpreloader/classpreloader": "~3.0",
"doctrine/inflector": "~1.0",
+ "erusev/parsedown": "~1.6",
"ext-mbstring": "*",
"ext-openssl": "*",
- "jeremeamia/superclosure": "~2.2",
"league/flysystem": "~1.0",
"monolog/monolog": "~1.11",
"mtdowling/cron-expression": "~1.0",
"nesbot/carbon": "~1.20",
- "paragonie/random_compat": "~1.1",
- "php": ">=5.5.9",
- "psy/psysh": "0.7.*",
- "swiftmailer/swiftmailer": "~5.1",
- "symfony/console": "2.8.*|3.0.*",
- "symfony/debug": "2.8.*|3.0.*",
- "symfony/finder": "2.8.*|3.0.*",
- "symfony/http-foundation": "2.8.*|3.0.*",
- "symfony/http-kernel": "2.8.*|3.0.*",
- "symfony/polyfill-php56": "~1.0",
- "symfony/process": "2.8.*|3.0.*",
- "symfony/routing": "2.8.*|3.0.*",
- "symfony/translation": "2.8.*|3.0.*",
- "symfony/var-dumper": "2.8.*|3.0.*",
+ "paragonie/random_compat": "~1.4|~2.0",
+ "php": ">=5.6.4",
+ "ramsey/uuid": "~3.0",
+ "swiftmailer/swiftmailer": "~5.4",
+ "symfony/console": "~3.2",
+ "symfony/debug": "~3.2",
+ "symfony/finder": "~3.2",
+ "symfony/http-foundation": "~3.2",
+ "symfony/http-kernel": "~3.2",
+ "symfony/process": "~3.2",
+ "symfony/routing": "~3.2",
+ "symfony/var-dumper": "~3.2",
+ "tijsverkoyen/css-to-inline-styles": "~2.2",
"vlucas/phpdotenv": "~2.2"
},
"replace": {
@@ -485,6 +299,7 @@
"illuminate/http": "self.version",
"illuminate/log": "self.version",
"illuminate/mail": "self.version",
+ "illuminate/notifications": "self.version",
"illuminate/pagination": "self.version",
"illuminate/pipeline": "self.version",
"illuminate/queue": "self.version",
@@ -494,40 +309,42 @@
"illuminate/support": "self.version",
"illuminate/translation": "self.version",
"illuminate/validation": "self.version",
- "illuminate/view": "self.version"
+ "illuminate/view": "self.version",
+ "tightenco/collect": "self.version"
},
"require-dev": {
"aws/aws-sdk-php": "~3.0",
- "mockery/mockery": "~0.9.2",
+ "doctrine/dbal": "~2.5",
+ "mockery/mockery": "~0.9.4",
"pda/pheanstalk": "~3.0",
- "phpunit/phpunit": "~4.1",
+ "phpunit/phpunit": "~5.7",
"predis/predis": "~1.0",
- "symfony/css-selector": "2.8.*|3.0.*",
- "symfony/dom-crawler": "2.8.*|3.0.*"
+ "symfony/css-selector": "~3.2",
+ "symfony/dom-crawler": "~3.2"
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
- "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
+ "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).",
"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 (~5.3|~6.0).",
+ "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
+ "laravel/tinker": "Required to use the tinker console command (~1.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
"league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
+ "nexmo/client": "Required to use the Nexmo transport (~1.0).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
"predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).",
- "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).",
- "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*)."
+ "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.2).",
+ "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.2).",
+ "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.2-dev"
+ "dev-master": "5.4-dev"
}
},
"autoload": {
- "classmap": [
- "src/Illuminate/Queue/IlluminateQueueClosure.php"
- ],
"files": [
"src/Illuminate/Foundation/helpers.php",
"src/Illuminate/Support/helpers.php"
@@ -543,33 +360,33 @@
"authors": [
{
"name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "email": "taylor@laravel.com"
}
],
"description": "The Laravel Framework.",
- "homepage": "http://laravel.com",
+ "homepage": "https://laravel.com",
"keywords": [
"framework",
"laravel"
],
- "time": "2016-03-14 14:22:33"
+ "time": "2017-02-22T16:07:04+00:00"
},
{
"name": "league/flysystem",
- "version": "1.0.20",
+ "version": "1.0.35",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a"
+ "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e87a786e3ae12a25cf78a71bb07b4b384bfaa83a",
- "reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dda7f3ab94158a002d9846a97dc18ebfb7acc062",
+ "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062",
"shasum": ""
},
"require": {
- "php": ">=5.4.0"
+ "php": ">=5.5.9"
},
"conflict": {
"league/flysystem-sftp": "<1.0.6"
@@ -578,7 +395,7 @@
"ext-fileinfo": "*",
"mockery/mockery": "~0.9",
"phpspec/phpspec": "^2.2",
- "phpunit/phpunit": "~4.8 || ~5.0"
+ "phpunit/phpunit": "~4.8"
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
@@ -635,20 +452,20 @@
"sftp",
"storage"
],
- "time": "2016-03-14 21:54:11"
+ "time": "2017-02-09T11:33:58+00:00"
},
{
"name": "monolog/monolog",
- "version": "1.18.1",
+ "version": "1.22.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45"
+ "reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
- "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
+ "reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
"shasum": ""
},
"require": {
@@ -659,17 +476,17 @@
"psr/log-implementation": "1.0.0"
},
"require-dev": {
- "aws/aws-sdk-php": "^2.4.9",
+ "aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
"jakub-onderka/php-parallel-lint": "0.9",
+ "php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
"phpunit/phpunit": "~4.5",
"phpunit/phpunit-mock-objects": "2.3.0",
- "raven/raven": "^0.13",
"ruflin/elastica": ">=0.90 <3.0",
- "swiftmailer/swiftmailer": "~5.3",
- "videlalvaro/php-amqplib": "~2.4"
+ "sentry/sentry": "^0.13",
+ "swiftmailer/swiftmailer": "~5.3"
},
"suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
@@ -678,11 +495,11 @@
"ext-mongo": "Allow sending log messages to a MongoDB server",
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
"mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+ "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
"php-console/php-console": "Allow sending log messages to Google Chrome",
- "raven/raven": "Allow sending log messages to a Sentry server",
"rollbar/rollbar": "Allow sending log messages to Rollbar",
"ruflin/elastica": "Allow sending log messages to an Elastic Search server",
- "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
+ "sentry/sentry": "Allow sending log messages to a Sentry server"
},
"type": "library",
"extra": {
@@ -713,20 +530,20 @@
"logging",
"psr-3"
],
- "time": "2016-03-13 16:08:35"
+ "time": "2016-11-26T00:15:39+00:00"
},
{
"name": "mtdowling/cron-expression",
- "version": "v1.1.0",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/mtdowling/cron-expression.git",
- "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5"
+ "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
- "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
+ "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
+ "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
"shasum": ""
},
"require": {
@@ -737,8 +554,8 @@
},
"type": "library",
"autoload": {
- "psr-0": {
- "Cron": "src/"
+ "psr-4": {
+ "Cron\\": "src/Cron/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -757,30 +574,36 @@
"cron",
"schedule"
],
- "time": "2016-01-26 21:23:30"
+ "time": "2017-01-23T04:29:33+00:00"
},
{
"name": "nesbot/carbon",
- "version": "1.21.0",
+ "version": "1.22.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7"
+ "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
- "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
+ "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
- "symfony/translation": "~2.6|~3.0"
+ "symfony/translation": "~2.6 || ~3.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0|~5.0"
+ "friendsofphp/php-cs-fixer": "~2",
+ "phpunit/phpunit": "~4.0 || ~5.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.23-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Carbon\\": "src/Carbon/"
@@ -804,71 +627,20 @@
"datetime",
"time"
],
- "time": "2015-11-04 20:07:17"
- },
- {
- "name": "nikic/php-parser",
- "version": "v2.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "ce5be709d59b32dd8a88c80259028759991a4206"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ce5be709d59b32dd8a88c80259028759991a4206",
- "reference": "ce5be709d59b32dd8a88c80259028759991a4206",
- "shasum": ""
- },
- "require": {
- "ext-tokenizer": "*",
- "php": ">=5.4"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0"
- },
- "bin": [
- "bin/php-parse"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "PhpParser\\": "lib/PhpParser"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Nikita Popov"
- }
- ],
- "description": "A PHP parser written in PHP",
- "keywords": [
- "parser",
- "php"
- ],
- "time": "2016-02-28 19:48:28"
+ "time": "2017-01-16T07:55:07+00:00"
},
{
"name": "paragonie/random_compat",
- "version": "v1.4.1",
+ "version": "v2.0.7",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
+ "reference": "b5ea1ef3d8ff10c307ba8c5945c2f134e503278f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
- "reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/b5ea1ef3d8ff10c307ba8c5945c2f134e503278f",
+ "reference": "b5ea1ef3d8ff10c307ba8c5945c2f134e503278f",
"shasum": ""
},
"require": {
@@ -903,7 +675,7 @@
"pseudorandom",
"random"
],
- "time": "2016-03-18 20:34:03"
+ "time": "2017-02-27T17:11:23+00:00"
},
{
"name": "psr/http-message",
@@ -953,26 +725,34 @@
"request",
"response"
],
- "time": "2016-08-06 14:39:51"
+ "time": "2016-08-06T14:39:51+00:00"
},
{
"name": "psr/log",
- "version": "1.0.0",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"shasum": ""
},
+ "require": {
+ "php": ">=5.3.0"
+ },
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
"autoload": {
- "psr-0": {
- "Psr\\Log\\": ""
+ "psr-4": {
+ "Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -986,62 +766,66 @@
}
],
"description": "Common interface for logging libraries",
+ "homepage": "https://github.com/php-fig/log",
"keywords": [
"log",
"psr",
"psr-3"
],
- "time": "2012-12-21 11:40:51"
+ "time": "2016-10-10T12:19:37+00:00"
},
{
- "name": "psy/psysh",
- "version": "v0.7.2",
+ "name": "ramsey/uuid",
+ "version": "3.5.2",
"source": {
"type": "git",
- "url": "https://github.com/bobthecow/psysh.git",
- "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280"
+ "url": "https://github.com/ramsey/uuid.git",
+ "reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e64e10b20f8d229cac76399e1f3edddb57a0f280",
- "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/5677cfe02397dd6b58c861870dfaa5d9007d3954",
+ "reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954",
"shasum": ""
},
"require": {
- "dnoegel/php-xdg-base-dir": "0.1",
- "jakub-onderka/php-console-highlighter": "0.3.*",
- "nikic/php-parser": "^1.2.1|~2.0",
- "php": ">=5.3.9",
- "symfony/console": "~2.3.10|^2.4.2|~3.0",
- "symfony/var-dumper": "~2.7|~3.0"
+ "paragonie/random_compat": "^1.0|^2.0",
+ "php": ">=5.4"
+ },
+ "replace": {
+ "rhumsaa/uuid": "self.version"
},
"require-dev": {
- "fabpot/php-cs-fixer": "~1.5",
- "phpunit/phpunit": "~3.7|~4.0|~5.0",
- "squizlabs/php_codesniffer": "~2.0",
- "symfony/finder": "~2.1|~3.0"
+ "apigen/apigen": "^4.1",
+ "codeception/aspect-mock": "1.0.0",
+ "doctrine/annotations": "~1.2.0",
+ "goaop/framework": "1.0.0-alpha.2",
+ "ircmaxell/random-lib": "^1.1",
+ "jakub-onderka/php-parallel-lint": "^0.9.0",
+ "mockery/mockery": "^0.9.4",
+ "moontoast/math": "^1.1",
+ "php-mock/php-mock-phpunit": "^0.3|^1.1",
+ "phpunit/phpunit": "^4.7|>=5.0 <5.4",
+ "satooshi/php-coveralls": "^0.6.1",
+ "squizlabs/php_codesniffer": "^2.3"
},
"suggest": {
- "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
- "ext-pdo-sqlite": "The doc command requires SQLite to work.",
- "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
- "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
+ "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
+ "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
+ "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+ "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
+ "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
+ "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
},
- "bin": [
- "bin/psysh"
- ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "0.8.x-dev"
+ "dev-master": "3.x-dev"
}
},
"autoload": {
- "files": [
- "src/Psy/functions.php"
- ],
"psr-4": {
- "Psy\\": "src/Psy/"
+ "Ramsey\\Uuid\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1050,40 +834,48 @@
],
"authors": [
{
- "name": "Justin Hileman",
- "email": "justin@justinhileman.info",
- "homepage": "http://justinhileman.com"
+ "name": "Marijn Huizendveld",
+ "email": "marijn.huizendveld@gmail.com"
+ },
+ {
+ "name": "Thibaud Fabre",
+ "email": "thibaud@aztech.io"
+ },
+ {
+ "name": "Ben Ramsey",
+ "email": "ben@benramsey.com",
+ "homepage": "https://benramsey.com"
}
],
- "description": "An interactive shell for modern PHP.",
- "homepage": "http://psysh.org",
+ "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+ "homepage": "https://github.com/ramsey/uuid",
"keywords": [
- "REPL",
- "console",
- "interactive",
- "shell"
+ "guid",
+ "identifier",
+ "uuid"
],
- "time": "2016-03-09 05:03:14"
+ "time": "2016-11-22T19:21:44+00:00"
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v5.4.1",
+ "version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421"
+ "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421",
- "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
+ "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "mockery/mockery": "~0.9.1,<0.9.4"
+ "mockery/mockery": "~0.9.1",
+ "symfony/phpunit-bridge": "~3.2"
},
"type": "library",
"extra": {
@@ -1116,40 +908,43 @@
"mail",
"mailer"
],
- "time": "2015-06-06 14:19:39"
+ "time": "2017-02-13T07:52:53+00:00"
},
{
"name": "symfony/console",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04"
+ "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/2ed5e2706ce92313d120b8fe50d1063bcfd12e04",
- "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04",
+ "url": "https://api.github.com/repos/symfony/console/zipball/0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
+ "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
"shasum": ""
},
"require": {
"php": ">=5.5.9",
+ "symfony/debug": "~2.8|~3.0",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/event-dispatcher": "~2.8|~3.0",
+ "symfony/filesystem": "~2.8|~3.0",
"symfony/process": "~2.8|~3.0"
},
"suggest": {
"psr/log": "For using the console logger",
"symfony/event-dispatcher": "",
+ "symfony/filesystem": "",
"symfony/process": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1176,20 +971,73 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2016-02-28 16:24:34"
+ "time": "2017-02-16T14:07:22+00:00"
},
{
- "name": "symfony/debug",
- "version": "v3.0.3",
+ "name": "symfony/css-selector",
+ "version": "v3.0.9",
"source": {
"type": "git",
- "url": "https://github.com/symfony/debug.git",
- "reference": "29606049ced1ec715475f88d1bbe587252a3476e"
+ "url": "https://github.com/symfony/css-selector.git",
+ "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/29606049ced1ec715475f88d1bbe587252a3476e",
- "reference": "29606049ced1ec715475f88d1bbe587252a3476e",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/b8999c1f33c224b2b66b38253f5e3a838d0d0115",
+ "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5.9"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\CssSelector\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony CssSelector Component",
+ "homepage": "https://symfony.com",
+ "time": "2016-06-29T05:40:00+00:00"
+ },
+ {
+ "name": "symfony/debug",
+ "version": "v3.2.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/debug.git",
+ "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
+ "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
"shasum": ""
},
"require": {
@@ -1206,7 +1054,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1233,20 +1081,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2016-01-27 05:14:46"
+ "time": "2017-02-16T16:34:18+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa"
+ "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa",
- "reference": "4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6",
+ "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6",
"shasum": ""
},
"require": {
@@ -1266,7 +1114,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1293,20 +1141,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2016-01-27 05:14:46"
+ "time": "2017-01-02T20:32:22+00:00"
},
{
"name": "symfony/finder",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "623bda0abd9aa29e529c8e9c08b3b84171914723"
+ "reference": "8c71141cae8e2957946b403cc71a67213c0380d6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/623bda0abd9aa29e529c8e9c08b3b84171914723",
- "reference": "623bda0abd9aa29e529c8e9c08b3b84171914723",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6",
+ "reference": "8c71141cae8e2957946b403cc71a67213c0380d6",
"shasum": ""
},
"require": {
@@ -1315,7 +1163,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1342,24 +1190,25 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2016-01-27 05:14:46"
+ "time": "2017-01-02T20:32:22+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "52065702c71743c05d415a8facfcad6d4257e8d7"
+ "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/52065702c71743c05d415a8facfcad6d4257e8d7",
- "reference": "52065702c71743c05d415a8facfcad6d4257e8d7",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a90da6dd679605d88c9803a57a6fc1fb7a19a6e0",
+ "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": ">=5.5.9",
+ "symfony/polyfill-mbstring": "~1.1"
},
"require-dev": {
"symfony/expression-language": "~2.8|~3.0"
@@ -1367,7 +1216,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1394,20 +1243,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2016-02-28 16:24:34"
+ "time": "2017-02-16T22:46:52+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "59c0a1972e9aad87b7a56bbe1ccee26b7535a0db"
+ "reference": "4cd0d4bc31819095c6ef13573069f621eb321081"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/59c0a1972e9aad87b7a56bbe1ccee26b7535a0db",
- "reference": "59c0a1972e9aad87b7a56bbe1ccee26b7535a0db",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4cd0d4bc31819095c6ef13573069f621eb321081",
+ "reference": "4cd0d4bc31819095c6ef13573069f621eb321081",
"shasum": ""
},
"require": {
@@ -1415,7 +1264,7 @@
"psr/log": "~1.0",
"symfony/debug": "~2.8|~3.0",
"symfony/event-dispatcher": "~2.8|~3.0",
- "symfony/http-foundation": "~2.8|~3.0"
+ "symfony/http-foundation": "~2.8.13|~3.1.6|~3.2"
},
"conflict": {
"symfony/config": "<2.8"
@@ -1435,7 +1284,7 @@
"symfony/stopwatch": "~2.8|~3.0",
"symfony/templating": "~2.8|~3.0",
"symfony/translation": "~2.8|~3.0",
- "symfony/var-dumper": "~2.8|~3.0"
+ "symfony/var-dumper": "~3.2"
},
"suggest": {
"symfony/browser-kit": "",
@@ -1449,7 +1298,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1476,20 +1325,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2016-02-28 21:33:13"
+ "time": "2017-02-16T23:59:56+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.1.1",
+ "version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "1289d16209491b584839022f29257ad859b8532d"
+ "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
- "reference": "1289d16209491b584839022f29257ad859b8532d",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
+ "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
"shasum": ""
},
"require": {
@@ -1501,7 +1350,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "1.3-dev"
}
},
"autoload": {
@@ -1535,128 +1384,20 @@
"portable",
"shim"
],
- "time": "2016-01-20 09:13:37"
- },
- {
- "name": "symfony/polyfill-php56",
- "version": "v1.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "4d891fff050101a53a4caabb03277284942d1ad9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9",
- "reference": "4d891fff050101a53a4caabb03277284942d1ad9",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "symfony/polyfill-util": "~1.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php56\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-01-20 09:13:37"
- },
- {
- "name": "symfony/polyfill-util",
- "version": "v1.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-util.git",
- "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4",
- "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Util\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony utilities for portability of PHP codes",
- "homepage": "https://symfony.com",
- "keywords": [
- "compat",
- "compatibility",
- "polyfill",
- "shim"
- ],
- "time": "2016-01-20 09:13:37"
+ "time": "2016-11-14T01:06:16+00:00"
},
{
"name": "symfony/process",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "dfecef47506179db2501430e732adbf3793099c8"
+ "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/dfecef47506179db2501430e732adbf3793099c8",
- "reference": "dfecef47506179db2501430e732adbf3793099c8",
+ "url": "https://api.github.com/repos/symfony/process/zipball/0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
+ "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
"shasum": ""
},
"require": {
@@ -1665,7 +1406,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1692,20 +1433,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2016-02-02 13:44:19"
+ "time": "2017-02-16T14:07:22+00:00"
},
{
"name": "symfony/routing",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6"
+ "reference": "af464432c177dbcdbb32295113b7627500331f2d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/fa1e9a8173cf0077dd995205da453eacd758fdf6",
- "reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/af464432c177dbcdbb32295113b7627500331f2d",
+ "reference": "af464432c177dbcdbb32295113b7627500331f2d",
"shasum": ""
},
"require": {
@@ -1734,7 +1475,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1767,20 +1508,20 @@
"uri",
"url"
],
- "time": "2016-02-04 13:53:13"
+ "time": "2017-01-28T02:37:08+00:00"
},
{
"name": "symfony/translation",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91"
+ "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91",
- "reference": "2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/d6825c6bb2f1da13f564678f9f236fe8242c0029",
+ "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029",
"shasum": ""
},
"require": {
@@ -1804,7 +1545,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1831,20 +1572,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2016-02-02 13:44:19"
+ "time": "2017-02-16T22:46:52+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "9a6a883c48acb215d4825ce9de61dccf93d62074"
+ "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a6a883c48acb215d4825ce9de61dccf93d62074",
- "reference": "9a6a883c48acb215d4825ce9de61dccf93d62074",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cb50260b674ee1c2d4ab49f2395a42e0b4681e20",
+ "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20",
"shasum": ""
},
"require": {
@@ -1860,7 +1601,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1894,32 +1635,79 @@
"debug",
"dump"
],
- "time": "2016-02-13 09:23:44"
+ "time": "2017-02-16T22:46:52+00:00"
},
{
- "name": "vlucas/phpdotenv",
- "version": "v2.2.0",
+ "name": "tijsverkoyen/css-to-inline-styles",
+ "version": "2.2.0",
"source": {
"type": "git",
- "url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412"
+ "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
+ "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9caf304153dc2288e4970caec6f1f3b3bc205412",
- "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412",
+ "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b",
+ "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.5 || ^7",
+ "symfony/css-selector": "^2.7|~3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.8|5.1.*"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "TijsVerkoyen\\CssToInlineStyles\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Tijs Verkoyen",
+ "email": "css_to_inline_styles@verkoyen.eu",
+ "role": "Developer"
+ }
+ ],
+ "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
+ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
+ "time": "2016-09-20T12:50:39+00:00"
+ },
+ {
+ "name": "vlucas/phpdotenv",
+ "version": "v2.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/vlucas/phpdotenv.git",
+ "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+ "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
- "phpunit/phpunit": "^4.8|^5.0"
+ "phpunit/phpunit": "^4.8 || ^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.4-dev"
}
},
"autoload": {
@@ -1929,7 +1717,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD"
+ "BSD-3-Clause-Attribution"
],
"authors": [
{
@@ -1939,13 +1727,12 @@
}
],
"description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
- "homepage": "http://github.com/vlucas/phpdotenv",
"keywords": [
"dotenv",
"env",
"environment"
],
- "time": "2015-12-29 15:10:30"
+ "time": "2016-09-01T10:05:43+00:00"
}
],
"packages-dev": [
@@ -2001,37 +1788,33 @@
"constructor",
"instantiate"
],
- "time": "2015-06-14 21:17:01"
+ "time": "2015-06-14T21:17:01+00:00"
},
{
"name": "fzaninotto/faker",
- "version": "v1.5.0",
+ "version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
- "reference": "d0190b156bcca848d401fb80f31f504f37141c8d"
+ "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d",
- "reference": "d0190b156bcca848d401fb80f31f504f37141c8d",
+ "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
+ "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3|^7.0"
},
"require-dev": {
+ "ext-intl": "*",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~1.5"
},
- "suggest": {
- "ext-intl": "*"
- },
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "1.5.x-dev"
- }
+ "branch-alias": []
},
"autoload": {
"psr-4": {
@@ -2053,7 +1836,7 @@
"faker",
"fixtures"
],
- "time": "2015-05-29 06:29:14"
+ "time": "2016-04-29T12:21:54+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -2098,20 +1881,20 @@
"keywords": [
"test"
],
- "time": "2015-05-11 14:41:42"
+ "time": "2015-05-11T14:41:42+00:00"
},
{
"name": "mockery/mockery",
- "version": "0.9.4",
+ "version": "0.9.9",
"source": {
"type": "git",
"url": "https://github.com/padraic/mockery.git",
- "reference": "70bba85e4aabc9449626651f48b9018ede04f86b"
+ "reference": "6fdb61243844dc924071d3404bb23994ea0b6856"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/padraic/mockery/zipball/70bba85e4aabc9449626651f48b9018ede04f86b",
- "reference": "70bba85e4aabc9449626651f48b9018ede04f86b",
+ "url": "https://api.github.com/repos/padraic/mockery/zipball/6fdb61243844dc924071d3404bb23994ea0b6856",
+ "reference": "6fdb61243844dc924071d3404bb23994ea0b6856",
"shasum": ""
},
"require": {
@@ -2163,41 +1946,132 @@
"test double",
"testing"
],
- "time": "2015-04-02 19:54:00"
+ "time": "2017-02-28T12:52:32+00:00"
},
{
- "name": "phpdocumentor/reflection-docblock",
- "version": "2.0.4",
+ "name": "myclabs/deep-copy",
+ "version": "1.6.0",
"source": {
"type": "git",
- "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+ "url": "https://github.com/myclabs/DeepCopy.git",
+ "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
- "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+ "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "doctrine/collections": "1.*",
+ "phpunit/phpunit": "~4.1"
},
- "suggest": {
- "dflydev/markdown": "~1.0",
- "erusev/parsedown": "~1.0"
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "DeepCopy\\": "src/DeepCopy/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Create deep copies (clones) of your objects",
+ "homepage": "https://github.com/myclabs/DeepCopy",
+ "keywords": [
+ "clone",
+ "copy",
+ "duplicate",
+ "object",
+ "object graph"
+ ],
+ "time": "2017-01-26T22:05:40+00:00"
+ },
+ {
+ "name": "phpdocumentor/reflection-common",
+ "version": "1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+ "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+ "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.6"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "1.0.x-dev"
}
},
"autoload": {
- "psr-0": {
- "phpDocumentor": [
+ "psr-4": {
+ "phpDocumentor\\Reflection\\": [
+ "src"
+ ]
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jaap van Otterdijk",
+ "email": "opensource@ijaap.nl"
+ }
+ ],
+ "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+ "homepage": "http://www.phpdoc.org",
+ "keywords": [
+ "FQSEN",
+ "phpDocumentor",
+ "phpdoc",
+ "reflection",
+ "static analysis"
+ ],
+ "time": "2015-12-27T11:43:31+00:00"
+ },
+ {
+ "name": "phpdocumentor/reflection-docblock",
+ "version": "3.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+ "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+ "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5",
+ "phpdocumentor/reflection-common": "^1.0@dev",
+ "phpdocumentor/type-resolver": "^0.2.0",
+ "webmozart/assert": "^1.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "^0.9.4",
+ "phpunit/phpunit": "^4.4"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "phpDocumentor\\Reflection\\": [
"src/"
]
}
@@ -2209,39 +2083,88 @@
"authors": [
{
"name": "Mike van Riel",
- "email": "mike.vanriel@naenius.com"
+ "email": "me@mikevanriel.com"
}
],
- "time": "2015-02-03 12:10:50"
+ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+ "time": "2016-09-30T07:12:33+00:00"
},
{
- "name": "phpspec/prophecy",
- "version": "v1.6.0",
+ "name": "phpdocumentor/type-resolver",
+ "version": "0.2.1",
"source": {
"type": "git",
- "url": "https://github.com/phpspec/prophecy.git",
- "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972"
+ "url": "https://github.com/phpDocumentor/TypeResolver.git",
+ "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972",
- "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+ "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5",
+ "phpdocumentor/reflection-common": "^1.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "^0.9.4",
+ "phpunit/phpunit": "^5.2||^4.8.24"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "phpDocumentor\\Reflection\\": [
+ "src/"
+ ]
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Mike van Riel",
+ "email": "me@mikevanriel.com"
+ }
+ ],
+ "time": "2016-11-25T06:54:22+00:00"
+ },
+ {
+ "name": "phpspec/prophecy",
+ "version": "v1.6.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpspec/prophecy.git",
+ "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
+ "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
- "phpdocumentor/reflection-docblock": "~2.0",
- "sebastian/comparator": "~1.1",
- "sebastian/recursion-context": "~1.0"
+ "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+ "sebastian/comparator": "^1.1",
+ "sebastian/recursion-context": "^1.0|^2.0"
},
"require-dev": {
- "phpspec/phpspec": "~2.0"
+ "phpspec/phpspec": "^2.0",
+ "phpunit/phpunit": "^4.8 || ^5.6.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.5.x-dev"
+ "dev-master": "1.6.x-dev"
}
},
"autoload": {
@@ -2274,43 +2197,44 @@
"spy",
"stub"
],
- "time": "2016-02-15 07:46:21"
+ "time": "2016-11-21T14:58:47+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.2.4",
+ "version": "4.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+ "reference": "ca060f645beeddebedb1885c97bf163e93264c35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
- "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca060f645beeddebedb1885c97bf163e93264c35",
+ "reference": "ca060f645beeddebedb1885c97bf163e93264c35",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
+ "php": "^5.6 || ^7.0",
"phpunit/php-file-iterator": "~1.3",
"phpunit/php-text-template": "~1.2",
- "phpunit/php-token-stream": "~1.3",
- "sebastian/environment": "^1.3.2",
- "sebastian/version": "~1.0"
+ "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+ "sebastian/code-unit-reverse-lookup": "~1.0",
+ "sebastian/environment": "^1.3.2 || ^2.0",
+ "sebastian/version": "~1.0|~2.0"
},
"require-dev": {
"ext-xdebug": ">=2.1.4",
- "phpunit/phpunit": "~4"
+ "phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-dom": "*",
- "ext-xdebug": ">=2.2.1",
+ "ext-xdebug": ">=2.4.0",
"ext-xmlwriter": "*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2.x-dev"
+ "dev-master": "4.0.x-dev"
}
},
"autoload": {
@@ -2336,20 +2260,20 @@
"testing",
"xunit"
],
- "time": "2015-10-06 15:47:00"
+ "time": "2017-02-23T07:38:02+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "1.4.1",
+ "version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+ "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
- "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+ "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
"shasum": ""
},
"require": {
@@ -2383,7 +2307,7 @@
"filesystem",
"iterator"
],
- "time": "2015-06-21 13:08:43"
+ "time": "2016-10-03T07:40:28+00:00"
},
{
"name": "phpunit/php-text-template",
@@ -2424,26 +2348,34 @@
"keywords": [
"template"
],
- "time": "2015-06-21 13:50:34"
+ "time": "2015-06-21T13:50:34+00:00"
},
{
"name": "phpunit/php-timer",
- "version": "1.0.7",
+ "version": "1.0.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
+ "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
- "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+ "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
"autoload": {
"classmap": [
"src/"
@@ -2465,20 +2397,20 @@
"keywords": [
"timer"
],
- "time": "2015-06-21 08:01:12"
+ "time": "2017-02-26T11:10:40+00:00"
},
{
"name": "phpunit/php-token-stream",
- "version": "1.4.8",
+ "version": "1.4.11",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+ "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
+ "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
"shasum": ""
},
"require": {
@@ -2514,44 +2446,54 @@
"keywords": [
"tokenizer"
],
- "time": "2015-09-15 10:49:45"
+ "time": "2017-02-27T10:12:30+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "4.8.24",
+ "version": "5.7.14",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "a1066c562c52900a142a0e2bbf0582994671385e"
+ "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e",
- "reference": "a1066c562c52900a142a0e2bbf0582994671385e",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4906b8faf23e42612182fd212eb6f4c0f2954b57",
+ "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-json": "*",
- "ext-pcre": "*",
- "ext-reflection": "*",
- "ext-spl": "*",
- "php": ">=5.3.3",
- "phpspec/prophecy": "^1.3.1",
- "phpunit/php-code-coverage": "~2.1",
+ "ext-libxml": "*",
+ "ext-mbstring": "*",
+ "ext-xml": "*",
+ "myclabs/deep-copy": "~1.3",
+ "php": "^5.6 || ^7.0",
+ "phpspec/prophecy": "^1.6.2",
+ "phpunit/php-code-coverage": "^4.0.4",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
- "phpunit/php-timer": ">=1.0.6",
- "phpunit/phpunit-mock-objects": "~2.3",
- "sebastian/comparator": "~1.1",
+ "phpunit/php-timer": "^1.0.6",
+ "phpunit/phpunit-mock-objects": "^3.2",
+ "sebastian/comparator": "^1.2.4",
"sebastian/diff": "~1.2",
- "sebastian/environment": "~1.3",
- "sebastian/exporter": "~1.2",
- "sebastian/global-state": "~1.0",
- "sebastian/version": "~1.0",
+ "sebastian/environment": "^1.3.4 || ^2.0",
+ "sebastian/exporter": "~2.0",
+ "sebastian/global-state": "^1.1",
+ "sebastian/object-enumerator": "~2.0",
+ "sebastian/resource-operations": "~1.0",
+ "sebastian/version": "~1.0.3|~2.0",
"symfony/yaml": "~2.1|~3.0"
},
+ "conflict": {
+ "phpdocumentor/reflection-docblock": "3.0.2"
+ },
+ "require-dev": {
+ "ext-pdo": "*"
+ },
"suggest": {
+ "ext-xdebug": "*",
"phpunit/php-invoker": "~1.1"
},
"bin": [
@@ -2560,7 +2502,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.8.x-dev"
+ "dev-master": "5.7.x-dev"
}
},
"autoload": {
@@ -2586,30 +2528,33 @@
"testing",
"xunit"
],
- "time": "2016-03-14 06:16:08"
+ "time": "2017-02-19T07:22:16+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "2.3.8",
+ "version": "3.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+ "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+ "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
- "php": ">=5.3.3",
- "phpunit/php-text-template": "~1.2",
- "sebastian/exporter": "~1.2"
+ "php": "^5.6 || ^7.0",
+ "phpunit/php-text-template": "^1.2",
+ "sebastian/exporter": "^1.2 || ^2.0"
+ },
+ "conflict": {
+ "phpunit/phpunit": "<5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.4"
+ "phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-soap": "*"
@@ -2617,7 +2562,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3.x-dev"
+ "dev-master": "3.2.x-dev"
}
},
"autoload": {
@@ -2642,26 +2587,71 @@
"mock",
"xunit"
],
- "time": "2015-10-02 06:51:40"
+ "time": "2016-12-08T20:27:08+00:00"
},
{
- "name": "sebastian/comparator",
- "version": "1.2.0",
+ "name": "sebastian/code-unit-reverse-lookup",
+ "version": "1.0.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+ "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+ "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+ "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "description": "Looks up which function or method a line of code belongs to",
+ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+ "time": "2016-02-13T06:45:14+00:00"
+ },
+ {
+ "name": "sebastian/comparator",
+ "version": "1.2.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/comparator.git",
+ "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+ "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"sebastian/diff": "~1.2",
- "sebastian/exporter": "~1.2"
+ "sebastian/exporter": "~1.2 || ~2.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
@@ -2706,7 +2696,7 @@
"compare",
"equality"
],
- "time": "2015-07-26 15:48:44"
+ "time": "2017-01-29T09:50:25+00:00"
},
{
"name": "sebastian/diff",
@@ -2758,32 +2748,32 @@
"keywords": [
"diff"
],
- "time": "2015-12-08 07:14:41"
+ "time": "2015-12-08T07:14:41+00:00"
},
{
"name": "sebastian/environment",
- "version": "1.3.5",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf"
+ "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
- "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+ "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.4"
+ "phpunit/phpunit": "^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -2808,33 +2798,34 @@
"environment",
"hhvm"
],
- "time": "2016-02-26 18:40:46"
+ "time": "2016-11-26T07:53:53+00:00"
},
{
"name": "sebastian/exporter",
- "version": "1.2.1",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
+ "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
- "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+ "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
- "sebastian/recursion-context": "~1.0"
+ "sebastian/recursion-context": "~2.0"
},
"require-dev": {
+ "ext-mbstring": "*",
"phpunit/phpunit": "~4.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -2874,7 +2865,7 @@
"export",
"exporter"
],
- "time": "2015-06-21 07:55:53"
+ "time": "2016-11-19T08:54:04+00:00"
},
{
"name": "sebastian/global-state",
@@ -2925,20 +2916,66 @@
"keywords": [
"global state"
],
- "time": "2015-10-12 03:26:01"
+ "time": "2015-10-12T03:26:01+00:00"
},
{
- "name": "sebastian/recursion-context",
- "version": "1.0.2",
+ "name": "sebastian/object-enumerator",
+ "version": "2.0.1",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+ "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+ "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
- "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
+ "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6",
+ "sebastian/recursion-context": "~2.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+ "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+ "time": "2017-02-18T15:18:39+00:00"
+ },
+ {
+ "name": "sebastian/recursion-context",
+ "version": "2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/recursion-context.git",
+ "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+ "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
"shasum": ""
},
"require": {
@@ -2950,7 +2987,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -2978,23 +3015,73 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2015-11-11 19:50:13"
+ "time": "2016-11-19T07:33:16+00:00"
},
{
- "name": "sebastian/version",
- "version": "1.0.6",
+ "name": "sebastian/resource-operations",
+ "version": "1.0.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/version.git",
- "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+ "url": "https://github.com/sebastianbergmann/resource-operations.git",
+ "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
- "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+ "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
"shasum": ""
},
+ "require": {
+ "php": ">=5.6.0"
+ },
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "description": "Provides a list of PHP built-in functions that operate on resources",
+ "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+ "time": "2015-07-28T20:34:47+00:00"
+ },
+ {
+ "name": "sebastian/version",
+ "version": "2.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/version.git",
+ "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+ "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
"autoload": {
"classmap": [
"src/"
@@ -3013,73 +3100,20 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2015-06-21 13:59:46"
- },
- {
- "name": "symfony/css-selector",
- "version": "v3.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/css-selector.git",
- "reference": "6605602690578496091ac20ec7a5cbd160d4dff4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/6605602690578496091ac20ec7a5cbd160d4dff4",
- "reference": "6605602690578496091ac20ec7a5cbd160d4dff4",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\CssSelector\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jean-François Simon",
- "email": "jeanfrancois.simon@sensiolabs.com"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony CssSelector Component",
- "homepage": "https://symfony.com",
- "time": "2016-01-27 05:14:46"
+ "time": "2016-10-03T07:35:21+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v3.0.3",
+ "version": "v3.0.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "981c8edb4538f88ba976ed44bdcaa683fce3d6c6"
+ "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/981c8edb4538f88ba976ed44bdcaa683fce3d6c6",
- "reference": "981c8edb4538f88ba976ed44bdcaa683fce3d6c6",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/dff8fecf1f56990d88058e3a1885c2a5f1b8e970",
+ "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970",
"shasum": ""
},
"require": {
@@ -3122,29 +3156,35 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2016-02-28 16:24:34"
+ "time": "2016-07-30T07:22:48+00:00"
},
{
"name": "symfony/yaml",
- "version": "v3.0.3",
+ "version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c"
+ "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/b5ba64cd67ecd6887f63868fa781ca094bd1377c",
- "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
+ "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
"shasum": ""
},
"require": {
"php": ">=5.5.9"
},
+ "require-dev": {
+ "symfony/console": "~2.8|~3.0"
+ },
+ "suggest": {
+ "symfony/console": "For validating YAML files using the lint command"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -3171,7 +3211,57 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-02-23 15:16:06"
+ "time": "2017-02-16T22:46:52+00:00"
+ },
+ {
+ "name": "webmozart/assert",
+ "version": "1.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/webmozart/assert.git",
+ "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
+ "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.3 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.6",
+ "sebastian/version": "^1.0.1"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Webmozart\\Assert\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bernhard Schussek",
+ "email": "bschussek@gmail.com"
+ }
+ ],
+ "description": "Assertions to validate method input/output with nice error messages.",
+ "keywords": [
+ "assert",
+ "check",
+ "validate"
+ ],
+ "time": "2016-11-23T20:04:58+00:00"
}
],
"aliases": [],
diff --git a/database/migrations/2016_03_23_054640_create_good_cat_table.php b/database/migrations/2016_03_23_054640_create_good_cat_table.php
index 1b14fc7..9e9aa6c 100644
--- a/database/migrations/2016_03_23_054640_create_good_cat_table.php
+++ b/database/migrations/2016_03_23_054640_create_good_cat_table.php
@@ -15,6 +15,7 @@ class CreateGoodCatTable extends Migration
Schema::create('good_cat',function(Blueprint $table){
$table->increments('id');
$table->string('cat_name');
+ $table->integer('cat_index');
$table->timestamps();
});
}
diff --git a/database/migrations/2016_03_23_061239_create_good_info_table.php b/database/migrations/2016_03_23_061239_create_good_info_table.php
index 8d6f254..b9389eb 100644
--- a/database/migrations/2016_03_23_061239_create_good_info_table.php
+++ b/database/migrations/2016_03_23_061239_create_good_info_table.php
@@ -24,8 +24,7 @@ class CreateGoodInfoTable extends Migration
$table->integer('counts');
$table->text('good_tag');
$table->integer('checked');
- $table->integer('sold_total');
- $table->integer('sold_month');
+ $table->integer('stared');
$table->timestamps();
});
}
diff --git a/database/migrations/2017_01_17_171622_create_announcement_table.php b/database/migrations/2017_01_17_171622_create_announcement_table.php
index 49c7243..39a508d 100644
--- a/database/migrations/2017_01_17_171622_create_announcement_table.php
+++ b/database/migrations/2017_01_17_171622_create_announcement_table.php
@@ -15,7 +15,6 @@ class CreateAnnouncementTable extends Migration
Schema::create('announcements', function (Blueprint $table) {
$table->increments('id');
$table->text('title');
- $table->text('summary');
$table->text('content');
$table->timestamps();
});
diff --git a/database/seeds/GoodCatSeeder.php b/database/seeds/GoodCatSeeder.php
index b115efc..5369548 100644
--- a/database/seeds/GoodCatSeeder.php
+++ b/database/seeds/GoodCatSeeder.php
@@ -12,16 +12,20 @@ class GoodCatSeeder extends Seeder
public function run()
{
DB::table('good_cat')->insert([
- 'cat_name' => '书籍'
+ 'cat_name' => '书籍',
+ 'cat_index' => '0'
]);
DB::table('good_cat')->insert([
- 'cat_name' => '日用品'
+ 'cat_name' => '日用品',
+ 'cat_index' => '1'
]);
DB::table('good_cat')->insert([
- 'cat_name' => '其他'
+ 'cat_name' => '其他',
+ 'cat_index' => '3'
]);
DB::table('good_cat')->insert([
- 'cat_name' => '滑稽'
+ 'cat_name' => '滑稽',
+ 'cat_index' => '2'
]);
}
}
diff --git a/public/css/app.css b/public/css/app.css
index 4a264a6..7cae587 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -1,10 +1,14 @@
-html {
+body {
overflow-x: hidden;
}
+hr {
+ margin: 0;
+}
+
.banner {
background-image: url('/img/banner.jpg');
- background-size: 100%;
+ background-position: top center;
background-repeat: no-repeat;
position: absolute;
top: -5px;
@@ -68,14 +72,14 @@ html {
.top-bar-bg {
background-image: url('/img/banner.jpg');
- background-size: 100%;
+ background-position: top center;
background-repeat: no-repeat;
position: absolute;
height: 130%;
top: -5px;
left: -5px;
width: 105%;
- -webkit-filter: blur(5px);
+ -webki-filter: blur(5px);
-ms-filter: blur(5px);
filter: blur(5px);
z-index: 50;
@@ -86,8 +90,35 @@ html {
top: 30px;
}
+#top-bar-avatar {
+ padding: 0!IMPORTANT;
+ transition: box-shadow 0.25s;
+}
+
+#top-bar-avatar:hover {
+ box-shadow: 0 0 10px white;
+}
+
+#top-bar-avatar:active {
+ box-shadow: 0 0 20px white;
+ transition: box-shadow 0.15s;
+}
+
+#top-bar-avatar img {
+ margin-right: 0;
+}
+
.page-content {
position: relative;
z-index: 50;
margin-top: 60px;
}
+
+.one-line-text {
+ white-space: nowrap;
+ overflow: hidden;
+}
+
+.card-divider {
+ margin-bottom: 0;
+}
\ No newline at end of file
diff --git a/public/img/banner.jpg b/public/img/banner.jpg
index 2d3d75a67975bb9da194c13111291a08cd0c088e..319fecfd4385934619d79e0c2918667a5f347c4c 100644
GIT binary patch
literal 2008004
zcmeFZcUV(R(=dLL(5qCD8UX?60RjP}cj>)@5CVi2AT&Y1hNuV#Dkw-5LApo>DN=1n
z?+5}4f*_z2rT$J(@7w!%pSN7^@A|%fJ~!8y%+Ad2&d%=Hvu9_|9*i8k1CE^5)X@YW
zPzaz6{(ysNmL81|tSbQM>jQ!S0FVKs5PARxVi52LKv)6dLmU8{A#8u)9uR?_GEh(k
z0e}!-2QPn!#39ZI;&IVffaqu19Pqyfpx7M)0RAJt{#9IX&KS6nJ1zi+cgOj{)l8+}
zmRKJbTreJx5Jw>8#8GmR2)KlVoP?yD1PaUofMr7d)-4nID}VB~OxQ1+7)KBU0|^B7
zQTx_
za_||TIg9}==Lsnf#(~QK6&V>BIT;l>ITalx1tlF5Efp0l6AJ?a69WSa9o1p@`S&C8
zuMk2_Nl8sZeT0VQ2qO&*4I=^2F#bqF_dm(tpc$Ye1FV5e7=#;u(m`N!kb}2iwJ8qT
zAWEQ?#E`=PDohA4u%i$WlaP{;Q&584;h#(h0EPWx9swXk5EzsQN=!;ZMhv5p1etU&
zqT}=kVijX225!F#5+sZXS!Jp`yi6v~oF%3FFZQaDo=7xZonAxZk<8goF7c_~GIP;r
zc@Q9dw9kA7^QHW9Yk%PES55xgIZ+jN+6LaQKdfvY{IFr+8gwNox2j`kZc|3f(k(bT
zIj_2Ncz%lxfI>lSi4JulB_T#0s&E`ZPXub<$IU=2aUp?`pusbf-c?Cn=V||oiE5@y
zXuQRC;X
zI-vGF6r*oihS;3b7s-2uz$MnWD>NHPefLkM2uVpjmndQp&UJ!8XH_+s99i{UAgRzH
z_qe0qN%N#OcU<2bVJtxaAVXt&(!bJ%b+hLB5dQ{
zL#HIeR7O8Z6nDK{sQ*6I7ZLeQBSNkMBRILS>S=y?rx+vLyTVI8t5WY+tHnb!pqvp*
z<9Vfz?29eis^3>cxO8$?y|Da!2;MMf2-%8uv`@W|+&54T^nWqBHx09o5?7AlB
zww)RU$MfGK
z6sA*~ealM6*Buue^&<*JJ0riHZqnH&=T=7Q8B2?J$dK~6iyZE@Z7K>^hd=wTU>9lv!|wJpyTs->
z`OXeh43@olyC46((l&p_`9^Rm=UiWx-F(B4c%+f-qIdAFT6H!bdBK?sagyfrNipsT
zEsmhQ#Wy5;vfV|lG8-Pv;TQTVyZuIE)eeBf9i`>&x&4bG!HR{j$)1w|;pw+HD=)O-
z9nlBC=}o0QPU-GXE9U;?Ec^NP)C~<1J62ecuyBtQ`_COg5ns9u!za65yM0_JUmpl{
zSkKiWA8Jx6JLlGZobDJjxU5xey}=-UXyV*y3Ey#ySK9@AQMfS7J0jK7$NWYiF5f^@
z{|;iq`pIz9dO(Si7`yZQkocHSHD|%tnyqeO#AUf|>x_FChdJ8=Akxea4fFIi=o#DBU%~(~I{QZN4l8Ri>vlV>utmbLo0Y
zKY8is_RW4{=Ky&2h&z;FHgc$_{`9&YY_~2Y^_aOV>@Mq|$@lroJ!v5uU}*UmmrXYkYkP
z&wn1XKV
zeq2X+-@eb-U@Zmx-I+UD+O69SO+^DF4ZK=c9PWi>46W@k8a$b@D2USHF14#clu&Od
z$rUVbMCu#XPr1$=0MaE+(+(Z>JMzcxS=c#jk6MiZq9VQ<6DzpNDc7mprtL8{j?Gu4
zFEO;#m2aq>woP}IC#Sk`Um{xyYwXpCCi?mxJDaU}#$X0zloyNEFEzEquV!pScC{v*
z<$?tjZp>8~EZ$G({d-OQPbX-P5`{JypY1rd*e~*$=}3kgxK)I|@LswG|(*4+HU9?|_7&w3IqmfbmwS8Co4$?UEc6
zEktz@60pL?S5>1)EgH_XRO{oPhQ`9FcS<(AcMpJ_(rpd5-1WN9AuCsSm;bL}G2lh*N3S6jyM7hcw0c=Ogt3=YiKj||IIHSJSmnC@{E`d7y8
z@H6Ml1`LOnAI~a&URKI%HBURYKYp)JXnz>I(u_8&eqDxXN2syT?SWMPx6O+qRT72!Z9;X)boQ>S9XO}T
zsqY6muxEZE;bbT(MUcu;ba|plA$%;FjzlXac?L};n>L8pitS*_*dsWQ!AJyo}P=T
zB2`HBboJ737WYkK`8s*aMY2T4ntOL
z3^lP7kC&I-12hi+Jo#rn%GCPrddj~1rUh8Lj9lwv+oD49*a!o4siR9HFtxWeqgbEe
z@}SL~0mLKk?*URnlnTznnCMiFpgxhN^~9IUCB+$Uh8@2zN*leskoG)UDwsX(Jzw^q??2u~e^;A(zJ=w87{-mm^YLDwfUaJk|iA)LFgTBg0-4{q?;{$uqXy)>M
z_Vx^w8*i7*BnrEOoM_O?RK8Rv+TT2;W|2{td>|CYI)u0raciHxQZ(Uq&n8Ne(P|DQ
z8|#kw9NRc7*@tmVT|5BfD!!EMk2UZ5DrmZsCsk+QX_|*4Q;M%WXXV!yC5~;u?>wY4d%6(f^
zd!@TSTnxRJ9>2@o6{&%LF6!r}D5rA(k4x)z!ZhbXj7$^>*kr-fzne
zIfh~ormvbG2Upj88f8nxj(uAvvD8myBbLywe?D$+E4(LG?)E)K>*&KdOYM?R?3?Zi
z{I%_|?yTYxL6J`8h4f2!^P29!qZJ95OGeuhZWFZgl~W^ObY3rCg%22itSznF(eIk@
z6yf|#wJo2zyeBkpC6-!hZ^gKOz4)RsS)0~iq)cJ-zT4KVK$=@=skYdHmsUF{8vK~u
zyU28WYW=|a0g%+4d+9=IkcAIdzGjC)mCfSVR)!w(3OF@606fFx?KaD|_6~q-+o~Do
zDQMnPAH@SeFTOWE&ofeIcQ8yzs{tR*&)mF}T2Q+&Hq2Vq$}%teh6cavGZwB}FlEoi
zw%EVVu*)6I4xxW6D6@QhdV0p~!d=w7%NthfQ(BikyleVgKi6rcJ7rr`+vXE~!}C?Z
z=+ea7qKGNOflZ}de(Uv*~aEgelzv
z@9|{)#nH{roiBZJJ5;3A@wt7h!(m$yi^W5a7B>=Zp?wOj48epiP;VWTt@7Hkterdn
z`m(N*$WmdBGl(TSG!44kIDulnRg7tUR{bT0CVF!+<4(f8kKDWY4h=?-%OI7He>JJl>se+AId9GB$4YN#XR~(2h{>#-`-DyZ!0H
zV^~*}aUUMf4$O(DG9zrbbhUncaP9IQ|3Z^agZsw0-X}|VQO|cv=iipVJXv=XlRqB&
zo;tN{Xl!(p60sz!_#hpVsh!l288-QebxW~2BHXsA+9s%eT{x3YwC;;%iYYA@DIZ;5{wAiPmGt`xwrBY(DJ4c#V|L?ibE2iUUAq1e__1
zS7zSOi$=b|Xe^;Gu`gd%OA|$N9xt6-&fkR&wuQ=Cl+{mkRD7Nf+vr)VY?|hbkJYa!
zF4?Tjs)ALJLW3%{!*HHTDI3!DXs&I;)$1QdD!n|}hh@Yfrv3cZFDb{DOP5YfhHJgw
zZdz5$_@+UE-gX!j@$GGmjg&K{D^3W`T{-A)#pPR1bUholle!0KuI#Db&j4QmT&F(|
zPPr9??V~LfeK)UBvo$W*D2Pc-i}#+1XjyP#y>e;2Nj<0@d>x&zq@qSDjHF2iMjgQz
z_VnwYP?R>6AS$a*9epjS#CpTtw&`&Z^h74Iz4I{<_^hm8u2ffD6?<4YenT^@_WZ4d
zv6dAG&o?3Y^cKn#meGNlD+^PJ_6LB*u_Y%yGDPRSr4&nTi`+^N%Nskm#>}@Z*)((U
zo@$k2L$$BL;@ui7-zjB`Mx>f5v)5KgnxLqu5HLujF
zlINRb+pt6pd6uoWh&%vZAf?`%3*0^)q{z~Fy`yRR>?t4SC9i@dO!wq`*cPHh!Y;aQ8riI+lKJ?s!r(omsGf0`38_yG?p>#%huZOW0m@kI=dA0e5y^Rm
zmT%@~?KcW;c=)dsXU{cUn5XG#uHdj@72cbRnC+2}!ldq%9kg8)p0D
zU0RJ+QlB4QIsnub$Ewm2%%?MH_1bFV_EtzT-dNy@hU0BH_hN$^K9^0l)`Xf{R!$kN
z>usO3W8&x|I@n5kY
z+p~vk#<`>=sF5VK9W7c7jk!bK;|pb;G7rJm0e4@j{GN^)5}CKuB`J-`^&=~}QLYSY
zlm=?y{Fk0WWy0xl-)6iFUV*!)*BI=4E1l^~X1UAbxEgM7)OsO~Wu{8Pi|JyYlA@hg
z(8^m+rPRWHvwOYw5uetpb$tDp!{O{|MYv5%lezoZJ`(d!yW#>2W>-xLsiS5GNY4ze
zDkC~8MZ_#bLS)IEP-;zZeQ(9wfIh>wP@pUY3)7)Oxj-4A-GD@4j!w##W%)Lb2i7g
zZx320Hbic7wv5!jUN3wO@pdjfoDYOOVWw&L7dyNPpN!S50ET)t_xT;R)Q3OEr@T?n$UUBN9l414ETh4hdx
ztTzQ(Kij|Ao#KB2pwfXyvKb2#567Tl-DRR(a6mx>OFnC+8VtT<@-Hg
zzfhMsb|^HEOpH}(p?ND@4CmtM9w-7GqBUBiH006#Y;$!gE8ze*wriLDW{PVjy^O=s
zZhY~v*2g&(DWWU&cPz$=>xRd%oLPhK+tQ?8r94}*q1uLRS49qv6qH9t+V1Z-b0?yT
zOm#-;@6IiY(gC-)<-rlQ(&pKj68*#-JHYeVMPOSZQg#`9(O)l^>Aoo9Xt;OI7^yiZ
zsvz%}e=vHm%;EpHPeD>t96+h+=o6hdT+lvp2!8_v9&Gt1PaA3guJA*FpZ|yH_zrnA
ze63CqRz&N#2U;s`Fc3c$F41ia{C9328{vJVL}3Q@Y-hjdd@hU
z7a>EkU*vxXle^>mLsh)6Zoe!=`=j#OzsO)pQWuP?Q=k{2kC6vq`~&`txWzB>KgB7X
z-PCYiIRD>_OZOvxRjt1mU=qLp=R>eHc>vDWFfag*`Mu*%c!3@1KTxThaRFe5`VVwU
zu!-IORs8Ut6d)7?P=OazY4s5QasLr~wLiKr?*Jedyg+X#
z3+T)II#Ke5?
zqE3YGx!QGIiPRU@_f^BV
zW3@y5F{YsgX6R5)w5$uak|O+6h+K%buQw*Z2_E9@<%5?CQQ$tzTn@wuWHD~|p-6zI
z0{7v!R&XnQBe)vQ9|M;Xl@OH>L5oXE!jY1ql1K?@2`OQ?gt$0LOk74xQd|Uql0!(y
zAyDw2fg3E(-^EqVL|yY|X<$r&`)9R+gM&qbB}H-mZej>oSy?f02{8!?5l}(|f7U0!
zDMZ8v&+{t>bqpTukM#|};(XwQ9GyVVVSoZRsOyhPc>Dg9?Z36wFF_adUvj>nbL_Bi
z7ql3-Dc&376MzRTiy#=_FjL=OU(x-Qg)ge1ixC&+xxE~@Btb@
zU^V`$cE%GNU1BB}JTA~5jnN1K)#UkASOC`bZ*%@bIRfV&dSSp1690Wc1kPWgzH(~*
z7^eWxy#~7YeszGqUH`v*PDs$jz4K-{1z5Nf;eJuz1}k((v?BB(ufQKf8SuW96&FK@gW)IN`oH1-
z%{KSJf+m;vna%(#CkUgCb;IBZRHU@91X2dPP~asi42}}Q5;9WY1=3Jb!bnMR@Irt%
zNJmKuOUOzKONt|eB@rm_k`+cufS05MNCWec5eF|&R)!Eqf_(6jl#-N?S4E&yHPqEq
zk>V(IDK(V18bTbQDXxN$ky6o66_-MB!wLOb&IlWV@v>6Kf=z)xw1otcP~E?I*1z!(
zlCq$w4tasGk_3mEGdL6
zm?r@e(#oO;X=PCa8CeuTMppJvMiz016LOP1%uQC7P@?Q%p0Wf@zyU&97;I2suoDPN
z3(E+jgk^<6(;yJS2nk_?q%cBC7;Ior2q7a3_67-17VINn7Xf<@66{D|KLEQ7*c0TD
zNEwv0nkEX&QC3}66(uRDijYy4mPUZp*HlMJ6P_D~L$RDT77q?*XMaA4Ofh~xF)u9q
zaP*aPLjSlS(1d{x`MH!{b~7f}Q*^DsJGt
z`d<&WV*jbuI3L3PiNE#sb@F!tpW_&RyaKnYKh7KeV_@|4af1ioent*Q$^SG3A=6q@U;?7c)ujz
zKLfaYv^n%+KW@K>wh%THKqu@&Wpwr=
z;84OQYDRxhK@evl;BG%~;X|1pxH18E@%90?EJF!8`?`3$5b!n-zZw)s*vbsk1Mw?C
zSWGa84}dtYSD-f*#0mT18ND%1;Pz@F!X8)N01Vn4#Kl3J%HPaH4a84@`-G|7e#4!A
z!vnxQ#h@&phVwmpxXTtUfIbNaUm8$wZA`EiCLln>2wdcH@^=B3puByZe9i*Ek2(`l
z0rdaj-TjdK1N@iF-{k%)l+d<6_+O0=+YG||`fu9bDgUP7vcWz1;I{{`n}5@s?*Tw{
z6acV{{Y~S|1XmF+13*>xZ}nj&^q1e3$FLZ*D8ZnAh5uIIFUkKL`K>%rLV16!d%)Fy
zY|4fcdNmr{WF6=a#}nRx;UfRqiT~FLe^cu>J%mj#t{8s|xYh!<0DBo0d|6S$`M6*Y
z*ZZ(O|5%;*Er#i70Ji)ZAYz~dV0P&s2l7|D>5*H2
z%e??#$u<9@--9^FKZO4P(0DKk#bXaQ`U7evW^i<%f6xyRBElar_{9n>zz7@zH~}6&
z01yGc$dCc#0cAh~I1LyAX5b!i2LKH&D0>6`KrnC)xBy%MVt|{#9UukB0CIqQpaggV
zR0B_eXFvz=3Oo&L5EuvE0Uv-*z$&l_?11M^kwT~;43J|GF31Up5JUokf+#{XAbJoJ
zh&AL4#0}yD351-3T!O?v5+Ny&EJ!}23{neu26+MLg^WU`Aq$W%kZmXoN(E(vazOc@
zVo(%R1*!`*gW5ygpnlL$=w)ae^e!|TS_G|vK7+o34np5SKS4LZgTg3b%&_Ay5f}=l
z1~Y`&z+7Seun5?7SQ0E7RsySob;9~#?_f)???fa-3`B4u5h8gaZ6b3bG?5=s1knwm
z6rx8&RYYw>{Y2A5t3><6)Wqz>Ld0^!I>c7QZp6XFSBR5{bBQa7+ldE>KM-${kdQEw
z@RP`pXp>lzc#wpV+#pFKDJ5wp=_Q#Z*&rn)Jw_@-sz7Q;>O>kqdWG~JX%T4?X&>na
z(r;vxWL#ttWSV3)WIkjU$&$zl$QsG|$mYp*$d8bpAeSRIBzGY{OCC?2LtaPTP5yy=
zhk}lRpF)AcjKYKB0>xd55{h<;35u_jl$6|*vXsV@SjzL1cPSrJKBt_f{7ywrB}k=4
zWk(fA6-Sjv)l4-?^_7~MnvYtU+J-uSI*vM@x|Mp8`Wp=cjVO%{jSEdAO)5ghmhGx6Y_JnPW9m+1qZo(eM
z{(${8`vwOmhZct~$32c#jwMcJPGwFH&fA=goC{nGT#8&+uG?HqT#IlfxC-10eiz;b
zUp>x#T>E(7@vP%-j_+{ubDMKtlE7;M~Zui=ZKFZ=n{J3)I`
zheHRgldrRSTIO{4={8*|T~pl@-5EVWJ%7DAeW?Cv{agAI1}6-B45|$QLmk6ghHs7d
zjr@%2jY*7+j8l#0Ob{mLOgc>&OdU-NOgGI`&En0*%>~Q@&08#JE$l4vEw(JxEfX!@
zS&3PNTfMSowZ>Z4*pS*-*yP%5*lO6`vHf6&w7X(AWY2FOV*kQ{)xpc5!I9R{$+7$l
z@fpiA1!s1h44tx_Hk@^w?>n!e)zHc4PcF(Xw_O%63YbL9ysLt1qU%RD1-Dyn3+_tp
zN$yKnHEarY%|qKG!(+?S&@<2Tz{}FB)SJxvjCZXMy^p6)8;%nfg6s7a^1b5w&QH$o
zj^C=ku755bg15)l1Tcb=sn>x5fl-0eL5e}CLEnNcg3CkbLVQAApA|fN?d*K0X6VB(
zqA+w=%emv{E}WYVR|(IGfJ8V)v_$emUXJ{5UhDj$3ltYTFLYfLznFM&{gUOSy2~7w
z&tIO6(uyj)LUYCc%5b!NbjDSptJte=u1Q|IcWwW=%k`Hr;xS1vyEo7`UdAF~@5Ua)
zxyHSTmyS=rNpjQY=1_uC!lOjG#L&dqTl%-EZo_Y1zrB9P@y?4Rsicf#isZoLcX##f
z*4*R0ck|wEihIgns%mQKefIm;?r){Jr1hmMr)Z
z=F*tQz~jKji)ClZhMwp?X(>mQmsFgnxL?UodA$l!b+&4?+P(T+jde|L?djT_9^u}>sRmZ
z7|P&n3-s&F6oV`1o`|bD?L^cJad}-%mSBSC;9P?|&Bf
zT(P3O@_N;3^~0L~+QF9_UypswTbEjI*)ZCe-1Oeu*}DGi*tbXDQQteaEw|@)f_F)G
z@9v%4tJ~MzpE&RazYzWVBuiy*F7V?d%OB@NLLm_Fc?*TYegvW)f%xYi2{9p%fKM|p
zfG1!69>9d)agju%L`0-y|B?H<d0)f
zC#-nsmOg$B8O@n5mu@{McQF@e?LUc{{i>yHff1CI(>ZMkPSjij0xw6o1qHibiN1X&
z=V3)J^`w#0INy)i+Rn;AxL&J0Pn_F0qkh7szuU)@;FXd5wK}~Jl^A|5iM#nxb
zEPngGO$UHSZ^DR3Nnk`U(AW?xs4^WubexzTL87v1>_kd9e-k`>^BI{$FXJ@NnkthC
zIkTj5pFi)#mc(0XNAZ`kpP)}jna-3W`P9KPIL-MfE?2M|V-+|lC@q7MmDAMH);VoK
z&=%wB=8p9U2n-4a)rq=`$);Ujb^&=4vI-$7#=;xcI6M2RJGhJ^AJ7s@zE?{Et#Tb_YR
z$0{_9c2rut^sv{kOi$3NWK^wJF)#DR1#MP$UZ043N`8bSfrX6!*qwm%#_Pha-8Ciy
zj1P)!vNTnFuWGHEUhdROx%Tujbogk)(@5jCeoZ-@Qs%e5Qq|WuzRzfw!LPq!ZC;$w
zgfG_t@)=H>H1^`IhE#H0Qkjp{X~bQYI22s-rfcrk$UchY)=_kpJT_Th74NY_+nLU|
zKyq)!QzuZq=#*CVrr&E~vx}N9mn*lTqIS=IEQVS0Cb-mOL|j
zBd^+aUQhen$B?C-c*=yEsYg!Bo_VZzBN>)|TG@=7sn7|6Hjd_i1^<7=2
zpTBuNtdGH~x69pu^~Q4z-GA7;n6TMjXJ$huf7ZK(``eXGx*3#5{fQfNl&hX{dJBde
z_C$W{0^)Cc``T(42kNY~eX&B0)NB~RPMulCu>pF)-Iga$ZbIOb?WGt+`69)*qYDTg
zy6CJ^r#`C2Boyi$@oSFFR8MF%fWxYNm}al^lyKhCl1CZ`Q6Do5fG<6JskM>E2QaWo?&V%!?Bl(>em0Pq&N%;6xe6{c!Az`RQ
z_fcA|nS~ZPg^=~tA`vxV<7;u3f_ftvJn!t(x+4n2?|vU_ePL7KcWwP{dTe9mabszb
z7t|vQvmJ948bK!~9;<|RjaYqJ_ir(H>1j0HQm0)qBXa_`WTLJ3iZ<^4D)Pf!dc?+s
zWd*At9cVTyhN5H9`ufhxmUji!*LT97h7|E)0glUe+vu7(~ZZkcS6@-#O&k2%{
z8Pjc%wX#FxU9)p&B_FF3S5X;J6UlD+crfns
zHZAVLw(Pr5?98K9Oc3@i+XGLZy++b%DJpX$tim*o`hsrEjIUF+dVCkgwyfHpB)z{g
zRomvg@dfVCpjCE5bN=uzV>;TmNaT2-=d{jGqlU}$=pWFwyFQzCxtE#HA1X5jGsTY^
z&PJSClq$+%c_tpJWzSn(PxB=CKCuJ@egKem^b97Uq(-gTa-V8lZhdH{cyyAjoOIk(h8e!A$R2J0jRnYv?#0uk6RihO
zI8nDo^_ibIF6U|le|=$(r)`ai!6kDXyHgXR&+>_>V{WTj$TCllIfJ60WqL)ssi4pqu%VHClQND1;5_6oM$a42!C$M
zvE3mOqa&2CiV#}*Q-+ijmG^z8&u?v{&@c4R+&kr`xbRMhx2)TMnFLO5&e^;$qoPFj
z-LE}MzxkB1(&c`UV$qk;tBKO+VGgY+E42h1UEA$~oSauuWt|p59l{UK4_fSZv-z#x
zd;)zdD?Xrf=ed_8IT>fz>*(!{pQJZ<)<39U
z?38Ji4M26|fdyo@`dh~4Ym8%)EmH8WZmsZl8b%@0I&E|xwe$nu-%Ge^G9JhqLL0BZ
z8s%wm%Q#lo-V8QJvC?U+)TdHA@h@6IDtOF2V5
z7Q}n^%EF-%c3S}>A@>{+9*@(PbI)~f*QLZgNhd2P;C6}2WWM(Nu`l&C(;3KIQp@;h
zi=3NG*L6lRr91V^$Lg^g#T6ogrY^)e#{_t_DcH$bu6JNWSUWT?UCT}GK)yYtioL8i
zBaU0)9K*Lf^({IhOX|)`v&qqz?xj=8z;vq{t#|Sc<7f;?_0xdLYn$g#3%<7(E>yW9
zzNE($xJV;E@h)AxFTETGK82I7wO>&)D!lyqYiAjyWNr(4{8{fA$WlnjGWBs~iR>(>
z&Jop`s~4}z(Qb=lB7HpI`y^g^7?piihYso`>b*4A
zZq~_a|NgZpkJCtyh~a(l1)&1LlP`_xbjqKn%=DqkCPe&v?D_7Q81$;_<*2#V@H8I)
zT2k1TFOI%q!kgGkhc{>127;&CO?PSdbBA2EVoYLrT%!@1fBnbpk
z-)`0ZoXEhtabI8BTY8r6bnZhb9hqbf?s9Fdr?l6;`S+rzD@HBun?FfgqY|Z{5b#XQ
z7vyynSQEU7hC5Cw)cEWbSbGamQt;k1f!zMSn%R|p=0pD{jQ&Y-ZDLXS#AN<$xHC^l
zcJH9-x~cJyL2o9fi#zjl4lCu3)Y>%OiI+qDhWG`EP+H{&)iKvje(s~XYj*eYdfcr+
zV_vNr=eOBlZ38uEgUZ|A%mSpIOy7DXqLzgeFnM*X@q$$_^V;;KM_2(B)oaG2R@_iS
zvQzE~9?P%d<&wuw+n$d0&&)UJXSqW=4PRn>`J9E#-H`H;7BV(*i+On}wa|hiX5GKv
z=6b>@scSlv{m;83eZCqMUpxS!v1?7tMbbwS6Hnh*BswDpU&{z&md?|Sq0}a$%Th5h
zkG^iYD<0&X@{0dU<<-knuZ^sx%0t#fL^?8|I@Ln9C2#6Vkq$*qc5BB!I6i(`KR%0#
zR&ZcAeIxCz_-^%8ecP+XoiD-Cxm&VKZn<#^f;_4X9={rwo$T4f57uCXW60NBkJ%lRr
zQs+H*b1VP7bmpBS6pyv#bru&&&3oGo*=ea>A@0aX6dwSZkuAe(GkK}HPA3E@5_oB+
zm3kE-%n~Q3aVMR$O`zsE44eqAQ1qGUIFuztX(Au(oQzh3W}Ch?#7&SDK@~;6}wuLRC4k?Xuh3O{hCB^VZ3_R;pjI%
zrep1H&*rl7N~{r5Q%6YNg`KVQ+OUwjYEgh)^j)tI@X^=+7P>79Zwv(9?$J2)+?bE;
z<^gauB%^7(+hVTV$!vYFGCQRzUtkvF?Bc7In=VYBrPB&6yh@e(X(CM4
zW@5OcPiG~4-n7fSP(j^SZCmQZU4|8#=6I;=wC$s(Z#~M}Vg&CFFdSE0c`_+8R~UGC
zA%D4RsPNSK2IDiTmqyz4$ukO12SaP55-JhrGaKKHH-(&2jFT-Si+7Nk%wX&$i{omn
z8R*+>5EkXPCK`6WxTPw!6&ynU}%jtmJ*dXG@ITMwz&A03L!Ouvd
zcwB@}+I6!JS-0Dmq9yJTWlMgUblkO`uAlDe7ffeNy&;@T|M|GeI1V-)8I82$6N2av
z7v)SWtj#SpU!NB??XR)9ED&}+{QgFmH^w?Msj%yju4Y&Pc6z#V1DbEtn(3rdaq{Hl
z`=JKN7U^88kyrJvi5M%3H`WwR7D;OG;;LM;@wzshWaoO$3ksswTC}2d=ChQE9^yGEH}nuBhUWwzuqoXG
zpb*y`YkIfOAfpyMnoZZ4Z-@2E>i`Qji&T}=){1!%g
z%44BaThLywk3=vs?A^$AzHfKK
zhwm|SpyC4040WxaeuBZbK(?XRJ-pYL2VD6y$7p)PV9Sc^R;^rjE$)#w-!r~&1u+*w
zAy`+-oKMmB@bpC|r~w~u+=YsCXjT$c^B%j3W+z3rwV|$v?hPsJHQFcE;h$``&i6No
z*yPUBYi=fPaZc{Ob;v=UTUOhxHxzm;v6oQq$Gl^|ygFalYxVR2eW%F~hBsti-M>w%
z*oec_4s%miNW0(&qOo@*oW0ng?Cq5T?fJsM^o$o@qtnCRcobS^<%YhPl(V(+EGzJp)t>jl&_C>gG5MJ@+OCL-Tq}DVE=9A9ZhR0Af;bH~m1-R|Ga~qVR86cP$0*e7
zxL|_BrCnt&{yd5cAHv9ISRUwHeaJn||)S!>&
z{S&)`TUDIX^|qrg6D(404s390y?NoxvZyn#d$!=M#spdI+)O2Mwj!-nRsKleTp3eC
z<F4VPx$dV~s_-w(`fw7CZNTHV$mH5z;`MoC!O)e@QlZgNi
zd%SuMwLNa?_lS;L%W8o!jrPPSIebAJec_`*Al+=d--syc`9r4V1hNW|n)FHL{q)dE
zrW=|x)nFsr>G9^*5;+Wknj4?W&%dirQ?K6{8{Zc4<%OJH9MeO7qf2%(q5N@J!RoVZ
ziB-$^2~M*_y}|R)lokOr3$F0%YUW+AR{o;vTQX$4^1tumB`eqbQ
z3U?(k?UhjSP-z6q@~4#Rd^6pq=Z7F!nS0O1pZHnn$d
zDz;FhUT_wfT9_|vv+#H%C@>#-`r$Y?n|RMYTCH2dLx|+-(tM$@33ib;_Qh3_6ILD&
zW*#4KMOXA52sp)xsKT3kEct5}f({04_jwu~yP*_jXhHr@4a4wifwI-|>TWv+ucJ
zU0pu4+^?hG9_4)X)x6;juU*X8#6zEkZi`Q2pv1-=IJgdmIfOPi@Xe=}T8715{6-Vn
zV862yd_E{v%v&+$>)>KqRJ(`)4;6yZLYPd{tIo4jSjb$Avz@mcA(QUjCsAdqwHf|a
zRCd}9(^US2v
z3q@JM+Cxjw*v>EPqlnm0zCymbvNbz{2Xx661t~hTyKKz+?6Hi+>gl)Ce5I~_%wu)G
zZC1FyXnzLNQ;l{6c4pitBV5??9I63+lSby&cEtR|)1R9sH^yXrVE=9S{neDso1S&pl%&8%h80(4Qz)))p2xxlcO48D9e6CwK71(n
zGJVwBXG!TiM~!*J{8GFfZTK2Krms($SE)rJupDzEWn)FZSH`6#7%_lWJcTP?{{DRg6e^!gMl68)MR{_bT$
z+7VI2@$XSxtV;!(g$3tSOFX{okDcXIjhxZ5jqfpWW4$i+%Hor-Q1H>!4@?Gdo&4Er
zAKx^9Q`d<>pN6jC!kWRkNKq!y$#$ZQ8vI~^xzYP`{SL5)C!=Ur^q!GU1n$<>6lw?y
zgxY#apR`>sI{Dov^5fi0HDg)!3u`nj{2}~ar|Z3#jGCRMWD$$&W}4R+ol)mCIPNIJ
zKC|Kj>sAaVHbUzJv!{X;Y)ZW=qrpM&xPFB~ZQVw2#TfV~s2L&L)3L>oI1wAbU{UboTA8ov8B^rYH$x-`jMxCB8w8{_x?2fp>5x>q8I9!V*ytP~f~10|jP4R71*8T2{`UK4
zXM4_bc6RQ4?%n;oU+?$5qrj93Ybzwv+~=f`s>ut*uL|1q)*k<8aKBuORu}lXf^zWC
zXC+jFt^sV4*^ELkG3QW<>rteMWd{)0AAi^mS5{>;y2MjTV`f
zbEy@S^%c|K6nAopc=X2MDtw0T)j`_B>EL}?;`FS1_zxG5lKG@u|~RW!y{}=!d&x&L5E{3mIeBT+B7fOTeLr5J!!1W$>5PN
zVmm@*;@YHNjpZTZV-0BEZ(^RWF}}JDb`w1Zjf|#kJnFDRIoDoye+%(kOJ>8Em?{N4
zZalvD;?SLM>F0w3qYbtm?swv+{Y+evuc|f*_-cPFWln_tk$hq8Q+m6l{{SWN5L1IlVZHRM
zZ+a#^q`YTz(eKj%H^?F6l6_}64XGSq*35(H=XPM{izKx~=4kg+l70`FEs|v`LP1+~
z5L?&B1&3G6lPuyc9h?d~J{|W8Q@&MUq0w*TGmW+g>;`TfXphA6LrlvTr5U!6!rBD#
z(h2*cRi^Wk39xgcW2z;#B-5eAqxqAovu7vh9m`p|z=5>DaiNYj&k@c_f+}uO*}j+C
z@og2%@vWLO!bGa?T8PzKT9`wr>6A5*C2w^exjl=cpvxOd$N+6)B{j+`KGr+v|
zUmi*BRSd+P^|$3hbkmj39JnN@9t3^sDS$n1B~wxY#1g>_wzy;b&kDZ59)7hK8KJ9p
zTmX>DsTUlqt(lpMv1e~tWbgBaT(M_Fq!w)(wiNL1q2sfG%6(Ct$I319g%+?oRk8{X
z2>!#w{l%y8YR_u&ZDB-_=QLFb581!|jh|{_^Z5D;cYG7e8*{9b#fg8(Uaf#@l=KD_
zU%B^wtvc}d`07p?=`!xXybEv_>F)v%`$!Trvk%BLsONL*(qhmGA%AY>4Y7GvuGi+V
zwkA#P3(-E?x6zaNEbf}--u@}d8JNg{(`(vUUFjUZt#l(JE#^^3mi^K9?!JlcU*>l~
zu6{vvm1STsAqfo#nOQMhK<&8bCOX@*W!&-5toBfpHii)N3Qi1wQc6%#$s{p?
zG!ICjHC^1J>m_uebf);TReZld+5{LXMPqm0yN31-@dykZRSX>+Ls{DhB0VH9DON&U
zi__9f5N(dH*7&3h6IbM_L=eZ#q`>8^SpH6YD?8m94;;zm1Y}BFusz~-sn;TXOjzT#
zHXQl3p2|edXQ;8nuoUid9eNWyuLrEOd(;zMc6@m+)1f5oFlD0h1K(R-W4zU9jDAJ~
zXdv*&maV~;I1!V^>cRuZb0SQXv-MH%9~nx1=4PY>v87Ab#;+ZqAE1vpZ8Fx-&N1W>
z$mga|5n&XRr+oip;(a#HOVIesj|pIJk)iPpPYkOoG=Nh81Oz`Kl~*#Okt7&xnbeY3
zl0R$pWTq3k_7QrrXejog(UEq|B3tulUXVn(+)HuIAncSrQsVX7Qy2T+DI2vuixot$gb&Kno|RC~uQ-g-j}bnmg(Bw$b=g
z@%KeM$78tvz_J+AZE%1gxCVYX-mI-G&FXBxf!$PKg+8iun)YsC)mCGAJvG=0(^hr+
zM3c)-;VI~GLXH16{;{gR!&gQBrRQW|d+tixm%79W9IOKCJi4yhU;hJCci}61VCQ@7
zDNUD|2|KgHm-hcQo_CV_u##_xctk#kQXyO-5=EQgU_NW%sb#&|wDgZT$SP$MPLM=c
ztolW1kkA7meTGaCh%8m1{79^2jyuid9i)=kU$K$(!c;_QDM#@tmwi3;UTAzjDfFBG
z@x{4rI%Njkb-)`(78uDb{xQ8ZE%>tUhtzDmr$F%98Ezz!;n6*Sjyl@##pgVqPEhCQ>Qsj66=n4SRl69f#-y{j59JnBiKHKXdUsBR>BQx3Bl$@6*}!9X
zW7v*{&dluE$Y#>5AZppPoi7qg0b6cnwf^%wFcMI7@3mU*o!6z$K>qorPEO<$t9$hD
z6-#==I+YZ|#mH+`Fo(!HUrxe?Bh7xhiI}rJ^h3fi9bXq`kqLHs*{*MMS`tYgfR
zmHL|Z(bfLnNSE1twEx+CIPad3*q^WVnHE9I@{#U0(p6sk`VN0YO5lAza;sLQLzfk=
zS(9GbgCD~lZEdm1a8M}3yY+g#>&mJiqni8C^6Zo;;2?icGT>s;4zNJGaC3%!)BEtj
zp$~4k@$}PdSjjmxZ91OdRS3*E~-=
zbIF@!@&8J14m2=-sIPRobrpDO%j>U3(ww8XA*+D5a>)y~OYe!pDb?D-iUT-MAKl?H@6&GLZBa$V+m>2AP
z|FZE%0otV^&edW&ftI-i%z*Mt(LTT@{fDBV8aJ2=+I0TJXq$xWZL(l??#+<-$Z7
zt{_|9=HORh8tbEwmov4lZh;b-F`t>qMLMJYHcdvFK2;)(4<$Dv8D7
z53}WrlDQQuh81XjX{E7py9SYGUHXhJSsh>_jD3VT1m`n$&134tC9yFp8Uo3D%q3$v61Ca}#81iON
zAP=Wzz5(}%Bech&Hg>#mxs&7{`7(0Zs&S(>7pW&%+}V-PKd=|voiyv;D%&{AJKxuI
zdph
zyL+;1aVlh5mg)jU51U*fY8AeDJC5TB4TTo1QmFF2#k`)p6z?;aHDHF?xvuZ?HDfhhE2E+6pVkz81P|K#-Q
zd|=WzLE7vQBL}A=m8GdrpX37GhVsqX7JVg+&z7vLNagQ7Rocx#imeduP4+*V0;=DF
z%)8i^cj$&7mmN{|5}himo{
zY%+^&l<_7Rr)uRuHo?Ffc{c)dOTU*h?Nmt=>%>tM~
z8NK%g^cGkAOXQp8?>{fDcz-nhnfK5`U&5v@_3wLQ#`LJneB%V;BUaUb3#W9}
zARduO`>EKVtn>^uRFB{y`Al)isI_YJ(!ck+XD_D~{Q`%xL}#A_dp;z&Jpl2kO7q%u
z_aDKY{Ml$Dg>k{3^8|UhNYyy;1bi=BxxcEX<6GP3L}C$e6%Dp*BX>6;l?u8lARQr0
zLBS_h3I}UXdW41#Pyd*Sk=gWKJby*PAN45KqK$gH9GITL0Od^a*#e(I2`dY
zu^yPL%Z-puuS5l82U)XU?~p)*gNzbQ%ed_p^(o^b&ee+^xY^Htfe?{LoZ-Wx1J{0=1@`j4BXmmtj65NK0xiIU{x<+oH_ON
z;x`1wZQodCQnc5An7l~p(kYAs2;5SA3%8B^Dgn`
zcZ+F#j)~!%)=wSxr6oU;+N6WrT+7d~@{B9t?-v^Af#Y2Kb;_s|IJZ|Y>G%7`GH#2b
zy|RUo?exowZ%hlDSl9r6f)8f3kUdiT-;Kr|8T0%1o!l+moDJ9MsRdP-5*D~~XIBA5
z3wPDzKbYKCVBW4*-Rwc5S)}h#^pUbzaz1IrFD(v)*yLX}o37M(PENXs)Wj{FD$UlV
zs9u^08urvMsOFgla-wGp%pReEohkZrUV-b
z)|II+z1Xb%iC%V9*0a(=?9wJU?N`z2-l3f$AAZ4~>)}m)v*bHKuU!Hd?3$b3lxX)~
z@KBI73M(zR1c_u;_}R#R*NHSJ#XOFnnq~_914To1LAu;jk;BsfmWGX>S;(Tb3dZ({
z$J>5n(#0IiqB0+8OVctpI1mo-n{9|DOP{%D85NSem7-*D?OZ)MCQdSrsr1PDm8Mvr
z`HrFDY9O`d)vbTPj1gV2GIxq$V&ezvoHgp+rK_J6sb;1kM*Ph^_bQJn$^?FqcTD!W
z$sA0H=yi=q>cxEk4?v;2HMiy|4f1Y{(9VB33=q&Ti<$$9ZD4o5ImA`E-bzIV-S=c#
zVH@~}D8!Xb{6XQaqAhHvspy60>IVxz&y3uZ(P*mX_0}f1BB`U$;FmM`8YJ92xrlzG)ESy}Elz31%vy3TI`q7|3GOiMz
z31884h35v#*5^tF`??}4<
zP;X8ZQl`{G>3~<_*_!iTjMI+|mH7I)29>JNykOHn8~F8~U?UU!=1k?CL;vdW+t}ZK
z{bnj@zuG(!0(D)-HeDdh91T=lu^4i<#UD-qFCfaC5rpeDGH6>nO-z!oP6z8HwBR#d
zrbH&x#|L`sfhT!V)0RZD|B6OBLE4D?m9+BH!I#1JhchTWT7Q&P9r^QlXn3iQOwDdL
z{Ky4MPF*urm@wK-F+;#|lh%u@n@M_&sy3^Q>@4(9#8S7VRU4AhP90Y>;3p7&TQp}?
zhacO+9=fM-u!}+tPIjGyg=7@BG6%x+6rLw#z)VaCeeXMy2ESEZobFzHl~7R{EdMpF
zqA@i-i`tc_9o}%QNlo!LFmHD)j|#{B2-Qp6I;OJ5F9m~0LAJ!C_b#OSD=M`l02=Sk_w
zLe|UnRxPK@fvk-{%S}N;rCmsDp5=ByV#7Q)cl&eL@%V_RJ8|y&mHD~~y0lh3DT$s_
zQzLJ+cm)Ym?Fnlk=K5?GJ#C%RddtNn&N^eV+f2TWOq!YJ7RVcZ(IYQ|UYQepQj3#2
z#`JNsjdN;+)OjNN1obvfi)>YK{oxH|D!)_ezVR83&`Wj{?ZtUoaWC(vu*d9HXi
z+2sGoqZUafV$>hKV*hx=x(Gg&lQhdr&yOHHK2+dq>=o@*=jPq;>GAFI3phCOS#B@J
z>%+-&0n7gvzUPrm#uod-$pPR0Szmg(F};rSo|}20BL1_^&t?pq;c0F?)(w}OUSWf0
zZONc7HHvp^QIE?W%wpPdffeSNlAuq0x$}w>H|MkFRSc(g(=%A?<}|!H*6esj?Lv!O;F%ZlU~@!}YZ*Lx5N{d8-d2toPA%c`WI*z8RV-
zcPHcVl23!Q(?$VVa}
z4*y8#jfC#J8Rm^=pM^t#d9#V1JGmt`X={x|PDmoEo5crAZn
zTE|};(e?D50`S1kEn%bF3uR`OW*-J(6`m}Av10qm}iO^+aI
znl#z%Y5iAI(4^yxfclc;CrGlqdi*5(btqAHS3|6h?r8IYpklpp{H&05sPPH@QiiW$
zV~BvC&bk19gz=l><4Ke9p0sZ+ld@Uu>F^smd5>e(OSk59_4uKJCNtCN!X{G~p}h(x
zPwpQ&LA_ZVZDCOdvk3W}{*3jkv|BKtv{BH$%;72;EUYkm@*d}h*$CS4%zGxxc06f@
z;+P40uFb-^m6Nn=J}~v<9&JwtWdO(
z$A&5?UlzaRobYZUv(Ke2s7uNTZR5ZDcHt9cYxGICoETPf|K~F2HnW1gHr2pwQFAf8
z6iv8%dh9cf`gMOG&CZqG>watf0J8B$qcQy&!n?WI1kp)x3&!i)+-?%GLNOSLi^d(d
zuOFQ4kQ4-yVV&OPg+;_A1m0;~a2#)jjF4HFQCmv%agM5U=N6I{tyvN;;hm*+=yk35
zDvcvgSf)pw60}x)*+Co+w6r{1lf0`n7EupV{6$*J@%+|SZN9LeN*iveT5+3-Qxy6-
z?`01B{iofBk4D<(kp)xrZ;VT=2`^`)r;YpWq72T8=}tm&uXezh`;~DLWjs^1l1?
z4L=`U2GN6+IFk5Ye1`4~EvtQhjlpB!X|k~D!VTpCE_R&W-IX_T_xJu{Znx|9)q|o{
zPj`lNvBKK<-#@F{-B<)FXw=`Ynl@_=P<~juZ*DSW3l5nL!o$I-)ij()K5&K8^tT42
zTmEz(tV)_12%a5>lN_ymi@fnu)p2*^`H{Ni#~L;4BSNb?C-%)W)i&>nH9&kEt;W0}
z7UnTh%kZ(r&GCDQ>&~ndgTJp0x!tW9b(O40@)x@^zuv3Ue03diCf)3$*qIc~O^b(g
zsAo=@B4mf#5c2yclaw9KIaR!gY!Oyea>_lM6D9{X(lbbLwBe`Wf^-t0W;eZvlTlPS
zKfiC|%V8xqOBu_G?D=18JPz(zb+*@g6N0f}|8YKxzHC~?VY&AC
z16+e{uIp9cKG+soMv#aOSfJ^_WMiAp5s8=m}n`CzW9Afu6uPx~(E^xnQ2ADemx<`!Tt5sn=m~w_&|N_ANNTkN0HXG-fQN=^1Pi7qxZ%r4NS-Eo7Z!YgT8s@?y25o*0H24vw}z6F(w|a`na&C{
z89IbukeGy6y;Ur?OIo6>@QZl*8y?dv{Nrg>
z`>TV+qfKjO{xOHp2+uI;1lCJ){_|n82Q|%%+y&D3;K`0qUE%wwqRHwoMbK%zUSarS5{XeuDWTIXBr-PsJowGis<3v<>T6eZ-M!3Uyxr0bFG7A;V@=8;XCy;0?#k@1^?c_AX}B06U_9!
zr4OXOM}=vSCRbMSMeHr7y-=eVX*FzZ0p|^5Dy7CyJt%KWheLYSHp0T+>q)B#MT&hf
zs}MP1_ZT?qX!44^=oieSTC#K1XXk(|Dug*yi=cds$9O3GRY+z=zmDot=M7w$N_D&&
zT(PcENvEwO0U!M1mZv6R<*(`uko=7lupomQt!9dYYuqxq9Iam#j9-2{tsJ6osg_|@
z+Takukkjb7KUtqdZB$3=6Y|#?2c;xLg%DHAy7sE9VjER*13=u$+`YP4vQdEt#vjFK
zpyEcK0qGiESboBE%8tH|r%&0r;Yly;(xeT>zrVB1A7WRaP18JRQqKXl)%zb{Cpo3q
zJ}X>Y{r;>{3MS*7Niu^-WuK-EQW9j
zR%+$_8k*(mTb^Xw9n6K+p+~
zIrr8%Z`yE)4Nu>78kWz`zp#}>F5StvpmQQhi+qUVnEZ>QJ=vs3$0v5=Ge(;sJfCgw
zx;_5{(R<;I;Rg&;1O_8RAdRPzCiNSH+f00E)_U|~j_M$~H|(rVT-km%W
zhd#9!FM^{hpW(df72PtXBK08_ia&^qVLNL=yKyxBm(c+{6yHE-uoCH_l{JV?8!r(_
zaJp>+(=`B6ZH!)bVOJwxuy3p*_+6Qz755g;@+>
z#WHKn8A13;SIPU|czLP5igaf8)`G9SjUNC$5neEjaisG5=_;6{%`|AAuxJ2iIn|cE
z(F(`K12<C2C1|=q9I|Xka{H*2o7(@K;`sMkMVkJ7wR0sT!c#1$nUvtN(HG7~S
z-b2Q&D}-nzq`ymbi?5=(f^vfvb(ByZ)yx8*OZ18
zw9kuQfv*7wab@c9(9Ko(XpW}_NLA*ugDewA)~gYegk|a_%ASc-F}EM34Zf$LRK|=U
z>kg2>)JTI1zbRb`_jZ?;{JDz_$<~F*H)-TluL^qfm1PlZv~6d_xFtgUR)NIZ7e#KQ9nt+e#jEST~K8L5Cg4`#C
zH|*>jIrW|4o$M7>eHbYZNOOmzF}Ed1NWqm?^>!u;NZ3xl#qRaakOvPk6WYuCBVD)C
zs0NrV**UXY`@D>VfRc|+`CyUV*lb;Kb|P?-xj-nhCh?4@8UQ08H6IOek~H%EPM#{Q
zt48XO>iCx?*&{7K^cSHArgin?jXTL_ByF=m`dvEGe71*;T{L;$o2~Mbwn%kM
zekk<)lcMHE_?3Q|=~hp}#G4;0k$W`OdDA13r5M)z$Xdq;WI%y|BI<
z<4CX
z6l@~GG>m3@EQdOpINkOX@2oKAQsN4VZbnoLVC&pF8*6&aO=B6*6#M#1IsW`U3@Zi$
zeQESl)n!Jt=!h4%G5^mj@OQ+1&)ll#{8swG#kH^hm;Frzk?DEO$u`HYckqDy>Ba{Q
zVzL1q)6%1#YY`isn#b*h$*DmFxf;v|Jb52(j5GT;A7WM~RZS2QI}q@Ett8>y=={^y
zf&ji@TN4JjMm+t18BqUZr*y@9!4<`)Tmz}rrslMQV!@mEdP)TJ3MxpSAcv%yTmP9v
zEgq?E5a5@Pht_)BLr`Y}nR-+a$*6Oq%TwFt1GyivHd;tyvNT8|vH3!6)@{P_?=p|J{=WV(
zjJxj^q>5hJltR{;Zvr(UqL609^a5I(ev~z^f|%Q!EGT#d83Un2s>led{5mxkS=0#I
zj91@xF4!`3_StNIHis{z7*&DUED^*ML~=Wp+J(>aVl3ihVzo0$(h+(1@`rn@Y=KMn
z0`Sls6?O0t2b8w!WG4gV_K_RNssO7ll4Fr})6#BFZ}%-9gJySoR4z7pnl!DgNMgQF
zHbY2YWOz_Qdxw-$1rg=Lm13!bXK0^+>KW50Aixd4ke$Miw?Or|K#wWCWYb~bn9`~3
z8$*CtU9WW?#%gdWJdoA@BX?f4N|N%B)7SpNYV6czU82Ghq-k;F3yF7DZ->LA526gq
z>0Wxv@#cBBTjH6=`T#z$zjw`a1Mvvxy?)qC&^@o^lUQYYF-Ho@B&G0;Gc|G|G>?)?
zX7l=HauC2&mJ6Y48K)uVB=`OD)Vl<4L@1_~O&w$x^Lg*!ywVF;S)-IMT<@T{fB3tM
zTvP*VI({QPeq!47Vex7H?Z>c&`M(?)9v+y!`=GB3Ka)=@8985=Sg2{~KtXXCmeR%g
z5L=zEyBscQX%r>hR>x&z_%tMhBzy?I#PU$B2Mz22GeDrMVO3PQ5=iNL)>XpNgK7Ot
z{F&XFF9sb^$NlfUwuqa30ID^{sV%H7o4P7dwp*k~CU1p+eMV`I-`HHR`2r9#v_%aq
zrN1i4@gQvarT4YXWP(UbV0yF}U2DkrgHA5%;@q=VaDy8F3JZ6wrm2o3GcW~z-k|!p
zZ&aHUJ~ctSwDv2Iu>e{x+sJ&W&o0^+rP|Yhh>0#EPHR2GSXu+%
znp~6lt`Htx20R+u6y-f`M@?i;YZEIZ2{#q1_Jt8Vkdc;{Mtc-rnjRZuO2F{3GsEFX)~CRGo-e7)
z-Zbd%ls6NB!}j`;OwTLk0pg^qpQy#gTl9raP=sDz6Hd}s;#g7mTeLEtu;0il8YYL+
zzff%*uiEwFlBU!G%t+lcJ(a!aCnqIA%y9%kh?NF83m{$qU1*(8_!GPBNz*zZM+H_1
zx-s=pmpgE73->Z6x8OUyK}{LD+7GD0;ElI5I68)5vm|$7AW?Xb)p_uOIb9`QQ&f1_
zK(hH4$)9dmO&!-_!Ab88(wcU(Kwn-U74sz5zx(8yS*NKqPXR(t6vVtX<^3jOOuuz;
zM&V}K6C^8+RA4e*DoBxp#1eSwBCMgvLGS{yvo1t(Fl5?}_nM>i(`UiebBH
zU7cwyH%)ILR0i7zvPvfjzQ@>%<6C)ms$>R$@iia7Z8yo7=-a((Qwjm5pcMk|poCO$
zH((vDb!BC35)V>ykxuK#zEZ$yAuQPP{Y-czPWf)1PikgHxb<07*pbzre)=rhF}fV3
zkirxw?@Q=0R*vGe7v8Ubd?L`^O7~^-N0zT%dx;lB*OWLVt4GWMXJ3>NtXX3|H`zxK
z*pH67*F}&ehc|{`B-r^@g}MIT9-K)Cvn2nXwe%|=V(;Y5n`BVNds^vEZx@PpEN?y8
zA4WQpLEk=nNha9ULqQ{sGE_QEOxy~IXZF|(XErrA7c6Z9-XQMJn#|}=CTzX@+)I`x
zljg>Y4VdDdF>b*3G^IEUekNe;^WYtc`#2-A5Syd#$3*R!(;Ry&*F&zs4G;F|nxTSa
zD_$r8c4mxh=2J>bH>Y_jDcgYJ)Z|f(@`JAFFBcuOv(G%vnjO2kx}+Ww_e+@8ptNs(
zPTF76jgX@Zr}la$I93d*i%gdlwix=9TvJF#jQ-M&N>3Th+YF_4l)>i}K|K7CieiI-
ze3jECHsaYPLZkssR&H_I9T)O2b-;~4bBh?2{;htN
zDrPjf`nCok!6`;TR|k6d5cnng?WFZk2oIvzL8*>gs2v)8Y;|3DvXhzFM!>9Xn%kMj
z#+x~i;qCdPY{v