From 0e48e34c8adb26f8678e7a408a441733932bd3b3 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 18 Jan 2018 01:04:19 +0000 Subject: [PATCH 01/14] Adopt PSR-2 coding style The Laravel framework adopts the PSR-2 coding style in version 5.1. Laravel apps *should* adopt this coding style as well. Read the [PSR-2 coding style guide][1] for more details and check out [PHPCS][2] to use as a code formatting tool. [1]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md [2]: https://github.com/squizlabs/PHP_CodeSniffer --- app/Achievements/UserMadeTenComments.php | 2 - app/BonExchange.php | 3 - app/Category.php | 1 - app/Client.php | 1 - app/Comment.php | 1 - app/Console/Commands/autoGroup.php | 1 - app/Console/Commands/autoPreWarning.php | 30 +- app/Console/Commands/autoSeedbox.php | 2 +- app/Console/Commands/autoWarning.php | 50 +- app/Helpers/Bbcode.php | 4 +- app/Helpers/LanguageCensor.php | 6 +- app/Helpers/LogActivity.php | 1 - app/Helpers/MediaInfo.php | 89 +- app/Hook/ClickableHook.php | 17 +- .../Controllers/AchievementsController.php | 1 - app/Http/Controllers/AnnounceController.php | 17 +- app/Http/Controllers/ArticleController.php | 1 - .../Auth/ForgotUsernameController.php | 45 +- app/Http/Controllers/BonusController.php | 1 - app/Http/Controllers/BookmarkController.php | 1 - app/Http/Controllers/BugController.php | 1 - app/Http/Controllers/CatalogController.php | 1 - app/Http/Controllers/CategoryController.php | 1 - app/Http/Controllers/CommentController.php | 3 - app/Http/Controllers/FollowController.php | 1 - app/Http/Controllers/ForumController.php | 2 - app/Http/Controllers/InviteController.php | 4 +- .../Controllers/LockAccountController.php | 1 - .../Controllers/NotificationController.php | 12 +- app/Http/Controllers/PageController.php | 3 +- app/Http/Controllers/PollController.php | 3 - app/Http/Controllers/RequestController.php | 4 - app/Http/Controllers/ShoutboxController.php | 2 +- app/Http/Controllers/Staff/BanController.php | 78 +- .../Controllers/Staff/MassPMController.php | 1 - .../Controllers/Staff/TorrentController.php | 1 - app/Http/Controllers/Staff/UserController.php | 80 +- app/Http/Controllers/TorrentController.php | 2 +- app/Http/Middleware/CheckIfAlreadyVoted.php | 2 - app/Http/Middleware/HtmlEncrypt.php | 1 - app/Http/Middleware/LockAccount.php | 4 - app/Listeners/RecordFailedLoginAttempt.php | 4 +- app/Mail/NewReply.php | 1 - app/Notifications/UsernameReminder.php | 2 +- app/Services/Bencode.php | 3 +- app/Services/Clients/Client.php | 1 - app/Services/Clients/MangaUpdatesClient.php | 17 +- app/Services/Clients/TmdbClient.php | 35 +- app/Services/Clients/TvdbClient.php | 1 - app/Services/Data/Movie.php | 1 - app/Services/Data/Tv.php | 1 - app/Services/MovieScrapper.php | 1 - app/User.php | 3 +- ...017_12_10_020753_create_articles_table.php | 1 - .../2017_12_10_020753_create_ban_table.php | 1 - ...12_10_020753_create_bon_exchange_table.php | 1 - ...0_020753_create_bon_transactions_table.php | 1 - ...17_12_10_020753_create_bookmarks_table.php | 1 - ...10_020753_create_catalog_torrent_table.php | 1 - ...017_12_10_020753_create_catalogs_table.php | 1 - ...7_12_10_020753_create_categories_table.php | 1 - ...2017_12_10_020753_create_clients_table.php | 1 - ...017_12_10_020753_create_comments_table.php | 1 - ...753_create_failed_login_attempts_table.php | 1 - ..._020753_create_featured_torrents_table.php | 1 - .../2017_12_10_020753_create_files_table.php | 1 - ...2017_12_10_020753_create_follows_table.php | 1 - .../2017_12_10_020753_create_forums_table.php | 1 - ...17_12_10_020753_create_graveyard_table.php | 1 - .../2017_12_10_020753_create_groups_table.php | 1 - ...2017_12_10_020753_create_history_table.php | 1 - ...2017_12_10_020753_create_invites_table.php | 1 - .../2017_12_10_020753_create_jobs_table.php | 1 - .../2017_12_10_020753_create_likes_table.php | 1 - ..._10_020753_create_log_activities_table.php | 1 - ...2_10_020753_create_notifications_table.php | 1 - ...2017_12_10_020753_create_options_table.php | 1 - .../2017_12_10_020753_create_pages_table.php | 1 - ...10_020753_create_password_resets_table.php | 1 - .../2017_12_10_020753_create_peers_table.php | 1 - ..._12_10_020753_create_permissions_table.php | 1 - ...020753_create_personal_freeleech_table.php | 1 - .../2017_12_10_020753_create_polls_table.php | 1 - .../2017_12_10_020753_create_posts_table.php | 1 - ...0_020753_create_private_messages_table.php | 1 - ...2017_12_10_020753_create_reports_table.php | 1 - ..._10_020753_create_request_bounty_table.php | 1 - ..._10_020753_create_request_claims_table.php | 1 - ...017_12_10_020753_create_requests_table.php | 1 - .../2017_12_10_020753_create_rss_table.php | 1 - ...017_12_10_020753_create_sessions_table.php | 1 - ...017_12_10_020753_create_shoutbox_table.php | 1 - ..._12_10_020753_create_tag_torrent_table.php | 1 - .../2017_12_10_020753_create_tags_table.php | 1 - .../2017_12_10_020753_create_thanks_table.php | 1 - .../2017_12_10_020753_create_topics_table.php | 1 - ...017_12_10_020753_create_torrents_table.php | 1 - .../2017_12_10_020753_create_types_table.php | 1 - ...2017_12_10_020753_create_uploads_table.php | 1 - ...0_020753_create_user_activations_table.php | 1 - ...7_12_10_020753_create_user_notes_table.php | 1 - .../2017_12_10_020753_create_users_table.php | 1 - .../2017_12_10_020753_create_voters_table.php | 1 - ...017_12_10_020753_create_warnings_table.php | 1 - ...754_add_foreign_keys_to_articles_table.php | 1 - ...0_020754_add_foreign_keys_to_ban_table.php | 1 - ...0754_add_foreign_keys_to_clients_table.php | 1 - ...754_add_foreign_keys_to_comments_table.php | 1 - ...0754_add_foreign_keys_to_history_table.php | 1 - ...020754_add_foreign_keys_to_peers_table.php | 1 - ...0754_add_foreign_keys_to_reports_table.php | 1 - ...0_020754_add_foreign_keys_to_rss_table.php | 1 - ...754_add_foreign_keys_to_torrents_table.php | 1 - ...20754_add_foreign_keys_to_voters_table.php | 1 - ...754_add_foreign_keys_to_warnings_table.php | 1 - ...0_020753_create_freeleech_tokens_table.php | 1 - .../seeds/AchievementDetailsTableSeeder.php | 2 - database/seeds/BonExchangeTableSeeder.php | 2 - database/seeds/CategoriesTableSeeder.php | 2 - database/seeds/ForumsTableSeeder.php | 214 +++-- database/seeds/GroupsTableSeeder.php | 2 - database/seeds/PagesTableSeeder.php | 2 - database/seeds/PermissionsTableSeeder.php | 528 ++++++------ database/seeds/TypesTableSeeder.php | 2 - routes/web.php | 805 +++++++++--------- 125 files changed, 1049 insertions(+), 1124 deletions(-) diff --git a/app/Achievements/UserMadeTenComments.php b/app/Achievements/UserMadeTenComments.php index 0c27872f91..686edd8121 100644 --- a/app/Achievements/UserMadeTenComments.php +++ b/app/Achievements/UserMadeTenComments.php @@ -36,7 +36,6 @@ class UserMadeTenComments extends Achievement */ public function whenProgress($progress) { - } /* @@ -44,6 +43,5 @@ public function whenProgress($progress) */ public function whenUnlocked($progress) { - } } diff --git a/app/BonExchange.php b/app/BonExchange.php index e4a1c6f482..c46a4473c0 100644 --- a/app/BonExchange.php +++ b/app/BonExchange.php @@ -107,7 +107,4 @@ public function getItemCost($id) ->get() ->toArray()[0]['cost']; } - } - -?> diff --git a/app/Category.php b/app/Category.php index caaa2a806c..0e6d3a8a27 100755 --- a/app/Category.php +++ b/app/Category.php @@ -47,5 +47,4 @@ public function requests() { return $this->hasMany(\App\Requests::class); } - } diff --git a/app/Client.php b/app/Client.php index 46bec7c61f..d471fbb2c5 100644 --- a/app/Client.php +++ b/app/Client.php @@ -14,7 +14,6 @@ use Illuminate\Database\Eloquent\Model; - class Client extends Model { /** diff --git a/app/Comment.php b/app/Comment.php index a9b1713caa..2d9d274b8f 100755 --- a/app/Comment.php +++ b/app/Comment.php @@ -62,5 +62,4 @@ public function getContentHtml() { return Bbcode::parse($this->content); } - } diff --git a/app/Console/Commands/autoGroup.php b/app/Console/Commands/autoGroup.php index 428f7cd7cd..bf34e64ad2 100644 --- a/app/Console/Commands/autoGroup.php +++ b/app/Console/Commands/autoGroup.php @@ -51,7 +51,6 @@ public function handle() $users = User::whereIn('group_id', $groups)->get(); foreach ($users as $user) { - $hiscount = History::where('user_id', '=', $user->id)->count(); // Temp Hard Coding of Group Requirements (Config Files To Come) (Upload in Bytes!) (Seedtime in Seconds!) diff --git a/app/Console/Commands/autoPreWarning.php b/app/Console/Commands/autoPreWarning.php index bc4f228a35..33a77d7a0a 100644 --- a/app/Console/Commands/autoPreWarning.php +++ b/app/Console/Commands/autoPreWarning.php @@ -46,35 +46,33 @@ class autoPreWarning extends Command public function handle() { if (config('hitrun.enabled') == true) { - $current = new Carbon(); - $prewarn = History::with(['user', 'torrent']) + $current = new Carbon(); + $prewarn = History::with(['user', 'torrent']) ->where('actual_downloaded', '>', 0) ->where('active', '=', 0) ->where('seedtime', '<=', config('hitrun.seedtime')) ->where('updated_at', '<', $current->copy()->subDays(config('hitrun.prewarn'))->toDateTimeString()) ->get(); - foreach ($prewarn as $pre) { - if (!$pre->user->group->is_immune) { - if ($pre->actual_downloaded > ($pre->torrent->size * (config('hitrun.buffer') / 100))) { + foreach ($prewarn as $pre) { + if (!$pre->user->group->is_immune) { + if ($pre->actual_downloaded > ($pre->torrent->size * (config('hitrun.buffer') / 100))) { + $exsist = Warning::where('torrent', '=', $pre->torrent->id)->where('user_id', '=', $pre->user->id)->first(); - $exsist = Warning::where('torrent', '=', $pre->torrent->id)->where('user_id', '=', $pre->user->id)->first(); + // Send Pre Warning PM If Actual Warning Doesnt Already Exsist + if (!$exsist) { + $timeleft = config('hitrun.grace') - config('hitrun.prewarn'); - // Send Pre Warning PM If Actual Warning Doesnt Already Exsist - if (!$exsist) { - - $timeleft = config('hitrun.grace') - config('hitrun.prewarn'); - - // Send Prewarning PM To The Offender - PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $pre->user->id, 'subject' => "Hit and Run Warning Incoming", 'message' => "You have received a automated [b]PRE-WARNING PM[/b] from the system because [b]you have been disconnected for " . config('hitrun.prewarn') . " days on Torrent " . $pre->torrent->name . " + // Send Prewarning PM To The Offender + PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $pre->user->id, 'subject' => "Hit and Run Warning Incoming", 'message' => "You have received a automated [b]PRE-WARNING PM[/b] from the system because [b]you have been disconnected for " . config('hitrun.prewarn') . " days on Torrent " . $pre->torrent->name . " If you fail to seed it within " . $timeleft . " day(s) you will recieve a automated WARNING which will last " . config('hitrun.expire') ." days![/b] [color=red][b] THIS IS AN AUTOMATED SYSTEM MESSAGE, PLEASE DO NOT REPLY![/b][/color]"]); - } + } - unset($exist); + unset($exist); + } } } } } - } } diff --git a/app/Console/Commands/autoSeedbox.php b/app/Console/Commands/autoSeedbox.php index 47cba25dbd..6a1c09d6d7 100644 --- a/app/Console/Commands/autoSeedbox.php +++ b/app/Console/Commands/autoSeedbox.php @@ -14,7 +14,7 @@ use App\Torrent; use App\Peer; -Use App\Client; +use App\Client; use Illuminate\Console\Command; use Illuminate\Support\Facades\DB; diff --git a/app/Console/Commands/autoWarning.php b/app/Console/Commands/autoWarning.php index c60f941b1d..88523e2b6d 100644 --- a/app/Console/Commands/autoWarning.php +++ b/app/Console/Commands/autoWarning.php @@ -46,45 +46,43 @@ class autoWarning extends Command public function handle() { if (config('hitrun.enabled') == true) { - $current = new Carbon(); - $hitrun = History::with(['user', 'torrent']) + $current = new Carbon(); + $hitrun = History::with(['user', 'torrent']) ->where('actual_downloaded', '>', 0) ->where('active', '=', 0) ->where('seedtime', '<=', config('hitrun.seedtime')) ->where('updated_at', '<', $current->copy()->subDays(config('hitrun.grace'))->toDateTimeString()) ->get(); - foreach ($hitrun as $hr) { - if (!$hr->user->group->is_immune) { - if ($hr->actual_downloaded > ($hr->torrent->size * (config('hitrun.buffer') / 100))) { + foreach ($hitrun as $hr) { + if (!$hr->user->group->is_immune) { + if ($hr->actual_downloaded > ($hr->torrent->size * (config('hitrun.buffer') / 100))) { + $exsist = Warning::where('torrent', '=', $hr->torrent->id)->where('user_id', '=', $hr->user->id)->first(); - $exsist = Warning::where('torrent', '=', $hr->torrent->id)->where('user_id', '=', $hr->user->id)->first(); + // Insert Warning Into Warnings Table if doesnt already exsist + if (!$exsist) { + $warning = new Warning(); + $warning->user_id = $hr->user->id; + $warning->warned_by = "1"; + $warning->torrent = $hr->torrent->id; + $warning->reason = "Hit and Run Warning For Torrent {$hr->torrent->name}"; + $warning->expires_on = $current->copy()->addDays(config('hitrun.expire')); + $warning->active = "1"; + $warning->save(); - // Insert Warning Into Warnings Table if doesnt already exsist - if (!$exsist) { + // Add +1 To Users Warnings Count In Users Table + $hr->user->hitandruns++; + $hr->user->save(); - $warning = new Warning(); - $warning->user_id = $hr->user->id; - $warning->warned_by = "1"; - $warning->torrent = $hr->torrent->id; - $warning->reason = "Hit and Run Warning For Torrent {$hr->torrent->name}"; - $warning->expires_on = $current->copy()->addDays(config('hitrun.expire')); - $warning->active = "1"; - $warning->save(); - - // Add +1 To Users Warnings Count In Users Table - $hr->user->hitandruns++; - $hr->user->save(); - - // Send PM To The Offender - PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $hr->user->id, 'subject' => "Hit and Run Warning Recieved", 'message' => "You have received a automated [b]WARNING[/b] from the system because [b]you failed to follow the Hit and Run rules in relation to Torrent " . $hr->torrent->name . "[/b] + // Send PM To The Offender + PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $hr->user->id, 'subject' => "Hit and Run Warning Recieved", 'message' => "You have received a automated [b]WARNING[/b] from the system because [b]you failed to follow the Hit and Run rules in relation to Torrent " . $hr->torrent->name . "[/b] [color=red][b]THIS IS AN AUTOMATED SYSTEM MESSAGE, PLEASE DO NOT REPLY![/b][/color]"]); - } + } - unset($exist); + unset($exist); + } } } } } - } } diff --git a/app/Helpers/Bbcode.php b/app/Helpers/Bbcode.php index b0d6e96fed..532ac225b1 100644 --- a/app/Helpers/Bbcode.php +++ b/app/Helpers/Bbcode.php @@ -18,10 +18,10 @@ use Config; -class Bbcode { +class Bbcode +{ private function __construct() { - } public static function decodaWithDefaults($data) diff --git a/app/Helpers/LanguageCensor.php b/app/Helpers/LanguageCensor.php index f2899cdb74..56658bf001 100644 --- a/app/Helpers/LanguageCensor.php +++ b/app/Helpers/LanguageCensor.php @@ -22,13 +22,13 @@ */ class LanguageCensor { - static protected function isSpecial($c) + protected static function isSpecial($c) { $specialChars = "<>\n [].;,"; return strpos($specialChars, $c) !== false; } - static protected function matchWordIndexes($string, $word) + protected static function matchWordIndexes($string, $word) { $result = []; $length = strlen($word); @@ -53,7 +53,7 @@ static protected function matchWordIndexes($string, $word) * * @return mixed */ - static public function censor($source) + public static function censor($source) { $redactArray = Config::get('censor.redact', []); foreach ($redactArray as $word) { diff --git a/app/Helpers/LogActivity.php b/app/Helpers/LogActivity.php index 3753abf634..7b4eacd9f0 100644 --- a/app/Helpers/LogActivity.php +++ b/app/Helpers/LogActivity.php @@ -34,5 +34,4 @@ public static function logActivityLists() { return LogActivityModel::latest()->paginate(50); } - } diff --git a/app/Helpers/MediaInfo.php b/app/Helpers/MediaInfo.php index a36e079a9d..41a88eee86 100755 --- a/app/Helpers/MediaInfo.php +++ b/app/Helpers/MediaInfo.php @@ -71,7 +71,6 @@ private function parseProperty($sections, $section) } if ($property && $value) { switch (strtolower($section)) { - case 'general': switch ($property) { case "complete name": @@ -232,7 +231,6 @@ private function parseProperty($sections, $section) break; } break; - } } } @@ -297,70 +295,86 @@ public function prepareViewCrumbs($data) { $output = ["general"=>[],"video"=>[],"audio"=>[]]; - $general_crumbs = array("format"=>"ucfirst","duration"=>NULL); + $general_crumbs = array("format"=>"ucfirst","duration"=>null); - if($data['general'] === NULL){ - $output["general"] = NULL; + if ($data['general'] === null) { + $output["general"] = null; } else { - if(isset($data['general']['format'])) $output['general'][] = ucfirst($data['general']['format']); - if(isset($data['general']['duration'])) $output['general'][] = $data['general']['duration']; + if (isset($data['general']['format'])) { + $output['general'][] = ucfirst($data['general']['format']); + } + if (isset($data['general']['duration'])) { + $output['general'][] = $data['general']['duration']; + } } - if($data['video'] === NULL){ - $output["video"] = NULL; + if ($data['video'] === null) { + $output["video"] = null; } else { - $temp_output = array(); - foreach($data["video"] as $video_element){ - + foreach ($data["video"] as $video_element) { $temp_video_output = array(); - if(isset($video_element['format'])) $temp_video_output[] = strtoupper($video_element['format']); - if(isset($video_element['width']) && isset($video_element['height'])) $temp_video_output[] = $video_element['width']." x ".$video_element['height']; - foreach(array("aspect_ratio","frame_rate","bit_depth","bit_rate","format_profile","scan_type","title","color primaries") as $property){ - if(isset($video_element[$property])) $temp_video_output[] = $video_element[$property]; + if (isset($video_element['format'])) { + $temp_video_output[] = strtoupper($video_element['format']); + } + if (isset($video_element['width']) && isset($video_element['height'])) { + $temp_video_output[] = $video_element['width']." x ".$video_element['height']; + } + foreach (array("aspect_ratio","frame_rate","bit_depth","bit_rate","format_profile","scan_type","title","color primaries") as $property) { + if (isset($video_element[$property])) { + $temp_video_output[] = $video_element[$property]; + } } - if(!empty($temp_video_output)) $temp_output[]=$temp_video_output; + if (!empty($temp_video_output)) { + $temp_output[]=$temp_video_output; + } } - $output["video"] = !empty($temp_output) ? $temp_output : NULL; + $output["video"] = !empty($temp_output) ? $temp_output : null; } - if($data['audio'] === NULL){ - $output["audio"] = NULL; + if ($data['audio'] === null) { + $output["audio"] = null; } else { - $temp_output = array(); - foreach($data["audio"] as $audio_element){ - + foreach ($data["audio"] as $audio_element) { $temp_audio_output = array(); - foreach(array("language","format","channels","bit_rate","title") as $property){ - if(isset($audio_element[$property])) $temp_audio_output[] = $audio_element[$property]; + foreach (array("language","format","channels","bit_rate","title") as $property) { + if (isset($audio_element[$property])) { + $temp_audio_output[] = $audio_element[$property]; + } } - if(!empty($temp_audio_output)) $temp_output[]=$temp_audio_output; + if (!empty($temp_audio_output)) { + $temp_output[]=$temp_audio_output; + } } - $output["audio"] = !empty($temp_output) ? $temp_output : NULL; + $output["audio"] = !empty($temp_output) ? $temp_output : null; } - if($data['text'] === NULL){ - $output["text"] = NULL; + if ($data['text'] === null) { + $output["text"] = null; } else { - $temp_output = array(); - foreach($data["text"] as $text_element){ - + foreach ($data["text"] as $text_element) { $temp_text_output = array(); - foreach(array("language","format","title") as $property){ - if(isset($text_element[$property])) $temp_text_output[] = $text_element[$property]; + foreach (array("language","format","title") as $property) { + if (isset($text_element[$property])) { + $temp_text_output[] = $text_element[$property]; + } + } + if (isset($text_element['forced']) && strtolower($text_element['forced']) == "yes") { + $temp_text_output[] = "Forced"; } - if(isset($text_element['forced']) && strtolower($text_element['forced']) == "yes") $temp_text_output[] = "Forced"; - if(!empty($temp_text_output)) $temp_output[]=$temp_text_output; + if (!empty($temp_text_output)) { + $temp_output[]=$temp_text_output; + } } - $output["text"] = !empty($temp_output) ? $temp_output : NULL; + $output["text"] = !empty($temp_output) ? $temp_output : null; } @@ -369,7 +383,6 @@ public function prepareViewCrumbs($data) private function parseAudioFormat($string) { - } private function computerSize($number, $size) diff --git a/app/Hook/ClickableHook.php b/app/Hook/ClickableHook.php index 22674ccb27..404dfa9d65 100644 --- a/app/Hook/ClickableHook.php +++ b/app/Hook/ClickableHook.php @@ -12,7 +12,8 @@ /** * Converts URLs and emails (not wrapped in tags) into clickable links. */ -class ClickableHook extends AbstractHook { +class ClickableHook extends AbstractHook +{ /** * Matches a link or an email, and converts it to an anchor tag. @@ -21,7 +22,8 @@ class ClickableHook extends AbstractHook { * @return string */ - public function beforeParse($content) { + public function beforeParse($content) + { $parser = $this->getParser(); // To make sure we won't parse links inside [url] or [img] tags, we'll first replace all urls/imgs with uniqids @@ -35,7 +37,9 @@ public function beforeParse($content) { $i = 0; foreach ($ignoredTags as $tag) { if (preg_match_all(sprintf('/\[%s[\s=\]].*?\[\/%s\]/is', $tag, $tag), $content, $matches, PREG_SET_ORDER)) { - $matches = array_unique(array_map(function($x) { return $x[0]; }, $matches)); + $matches = array_unique(array_map(function ($x) { + return $x[0]; + }, $matches)); foreach ($matches as $val) { $uniqid = uniqid($i++); @@ -112,7 +116,8 @@ public function beforeParse($content) { * @param array $matches * @return string */ - protected function _emailCallback($matches) { + protected function _emailCallback($matches) + { // is like http://user:pass@domain.com ? Then we do not touch it. if ($matches[1]) { return $matches[0]; @@ -130,11 +135,11 @@ protected function _emailCallback($matches) { * @param array $matches * @return string */ - protected function _urlCallback($match) { + protected function _urlCallback($match) + { return $this->getParser()->getFilter('Url')->parse(array( 'tag' => 'url', 'attributes' => array() ), trim($match)); } - } diff --git a/app/Http/Controllers/AchievementsController.php b/app/Http/Controllers/AchievementsController.php index f336edfb75..c2825a3a16 100755 --- a/app/Http/Controllers/AchievementsController.php +++ b/app/Http/Controllers/AchievementsController.php @@ -32,5 +32,4 @@ public function index() return view('user.achievements', ['user' => $user, 'achievements' => $achievements, 'locked' => $locked, 'pending' => $pending]); } - } diff --git a/app/Http/Controllers/AnnounceController.php b/app/Http/Controllers/AnnounceController.php index f03c784fe0..b938f80b57 100644 --- a/app/Http/Controllers/AnnounceController.php +++ b/app/Http/Controllers/AnnounceController.php @@ -197,9 +197,20 @@ public function announce(Request $request, $passkey) $seeders++; // Counts the number of seeders } - unset($p['id'], $p['md5_peer_id'], $p['hash'], $p['agent'], $p['uploaded'], - $p['downloaded'], $p['left'], $p['torrent_id'], $p['user_id'], $p['seeder'], - $p['created_at'], $p['updated_at']); + unset( + $p['id'], + $p['md5_peer_id'], + $p['hash'], + $p['agent'], + $p['uploaded'], + $p['downloaded'], + $p['left'], + $p['torrent_id'], + $p['user_id'], + $p['seeder'], + $p['created_at'], + $p['updated_at'] + ); } // Pull Count On Users Peers Per Torrent diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index 01afb16203..0355183a40 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -46,5 +46,4 @@ public function post($slug, $id) return view('article.article', ['article' => $article, 'comments' => $comments]); } - } diff --git a/app/Http/Controllers/Auth/ForgotUsernameController.php b/app/Http/Controllers/Auth/ForgotUsernameController.php index ba5eddde07..92f0dac335 100644 --- a/app/Http/Controllers/Auth/ForgotUsernameController.php +++ b/app/Http/Controllers/Auth/ForgotUsernameController.php @@ -12,7 +12,7 @@ class ForgotUsernameController extends Controller { - /** + /** * Create a new controller instance. * * @return void @@ -22,7 +22,7 @@ public function __construct() $this->middleware('guest'); } - /** + /** * Get a validator for an incoming registration request. * * @param array $data @@ -30,7 +30,8 @@ public function __construct() */ protected function validator(array $data) { - $validator = Validator::make($data, + $validator = Validator::make( + $data, ['email' => 'required|email'], ['email.required' => 'Email is required', 'email.email' => 'Email is invalid'] ); @@ -38,31 +39,33 @@ protected function validator(array $data) return $validator; } - public function showForgotUsernameForm(){ - return view('auth.username'); - } + public function showForgotUsernameForm() + { + return view('auth.username'); + } - public function sendUserameReminder(Request $request) + public function sendUserameReminder(Request $request) { - $validator = $this->validator($request->all()); + $validator = $this->validator($request->all()); - if ($validator->fails()) { - $this->throwValidationException( - $request, $validator - ); - } + if ($validator->fails()) { + $this->throwValidationException( + $request, + $validator + ); + } - $email = $request->get('email'); + $email = $request->get('email'); - // get the user associated to this activation key - $user = User::where('email', $email)->first(); + // get the user associated to this activation key + $user = User::where('email', $email)->first(); - if (empty($user)) { - return redirect()->route('username.request')->with(Toastr::warning('We could not find this email in our system!', 'Error', ['options'])); - } + if (empty($user)) { + return redirect()->route('username.request')->with(Toastr::warning('We could not find this email in our system!', 'Error', ['options'])); + } - //send username reminder notification - $user->notify(new UsernameReminder()); + //send username reminder notification + $user->notify(new UsernameReminder()); return redirect()->route('login')->with(Toastr::success('Your username has been sent to your email address!', 'Yay!', ['options'])); } diff --git a/app/Http/Controllers/BonusController.php b/app/Http/Controllers/BonusController.php index 12a2c48bde..f5f6540a6c 100755 --- a/app/Http/Controllers/BonusController.php +++ b/app/Http/Controllers/BonusController.php @@ -516,5 +516,4 @@ public function getLegendarySeedCount() ->where('history.user_id', '=', $user->id) ->count(); } - } diff --git a/app/Http/Controllers/BookmarkController.php b/app/Http/Controllers/BookmarkController.php index 141894122f..c377f2996a 100644 --- a/app/Http/Controllers/BookmarkController.php +++ b/app/Http/Controllers/BookmarkController.php @@ -48,5 +48,4 @@ public function unBookmark($id) Auth::user()->bookmarks()->detach($id); return back()->with(Toastr::info('Torrent Has Been Unbookmarked Successfully!', 'Info', ['options'])); } - } diff --git a/app/Http/Controllers/BugController.php b/app/Http/Controllers/BugController.php index 9827a75ac1..d0532b35df 100755 --- a/app/Http/Controllers/BugController.php +++ b/app/Http/Controllers/BugController.php @@ -48,5 +48,4 @@ public function bug() } return view('bug.bug'); } - } diff --git a/app/Http/Controllers/CatalogController.php b/app/Http/Controllers/CatalogController.php index 6b607ff0a8..74dadd3e7f 100644 --- a/app/Http/Controllers/CatalogController.php +++ b/app/Http/Controllers/CatalogController.php @@ -66,5 +66,4 @@ public function torrents($imdb) return view('catalogs.torrents', ['torrents' => $torrents, 'user' => $user]); } - } diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 9914eb7f81..e299fd7ada 100755 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -48,5 +48,4 @@ public function categories() return view('category.categories', ['categories' => $categories]); } - } diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php index 2208e2f8ba..70c54080d0 100755 --- a/app/Http/Controllers/CommentController.php +++ b/app/Http/Controllers/CommentController.php @@ -236,7 +236,6 @@ public function quickthanks($id) $appurl = env('APP_URL', 'http://unit3d.site'); Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has left a comment on Torrent [url={$appurl}/torrents/" . $torrent->slug . "." . $torrent->id . "]" . $torrent->name . "[/url]"]); Cache::forget('shoutbox_messages'); - } else { Toastr::warning('A Error Has Occured And Your Comment Was Not Posted!', 'Sorry', ['options']); } @@ -278,7 +277,6 @@ public function deleteComment($comment_id) $comment = Comment::findOrFail($comment_id); if ($user->group->is_modo || $user->id == $comment->user_id) { - $comment->delete(); return back()->with(Toastr::success('Comment Has Been Deleted.', 'Yay!', ['options'])); @@ -286,5 +284,4 @@ public function deleteComment($comment_id) abort(403, 'Unauthorized action.'); } } - } diff --git a/app/Http/Controllers/FollowController.php b/app/Http/Controllers/FollowController.php index 9ff7b00b48..138a9cc6b2 100644 --- a/app/Http/Controllers/FollowController.php +++ b/app/Http/Controllers/FollowController.php @@ -61,5 +61,4 @@ public function unfollow(User $user) return back()->with(Toastr::error('You are not following this user to begin with', 'Error!', ['options'])); } } - } diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index c22e532cef..3de706ad44 100755 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -293,7 +293,6 @@ public function newTopic($slug, $id) $topic->forum_id = $forum->id; $v = Validator::make($topic->toArray(), $topic->rules); if ($v->passes()) { - $topic->save(); $post = new Post(); @@ -652,5 +651,4 @@ public function dislikePost($postId) return back()->with(Toastr::success('Dislike Successfully Applied!', 'Yay', ['options'])); } } - } diff --git a/app/Http/Controllers/InviteController.php b/app/Http/Controllers/InviteController.php index a49ce5e3dd..a296e363ab 100644 --- a/app/Http/Controllers/InviteController.php +++ b/app/Http/Controllers/InviteController.php @@ -29,7 +29,6 @@ use \Toastr; use Carbon\Carbon; - class InviteController extends Controller { @@ -60,7 +59,8 @@ public function process(Request $request) //generate a random string using Laravel's str_random helper $code = str_random(); } //check if the token already exists and if it does, try again - while (Invite::where('code', $code)->first()); + while (Invite::where('code', $code)->first()) { + } //create a new invite record $invite = Invite::create([ diff --git a/app/Http/Controllers/LockAccountController.php b/app/Http/Controllers/LockAccountController.php index c561224258..f36ae56f32 100644 --- a/app/Http/Controllers/LockAccountController.php +++ b/app/Http/Controllers/LockAccountController.php @@ -49,5 +49,4 @@ public function unlock(Request $request) } return back()->with(Toastr::error('Your Password Is Incorrect', 'Whoops!', ['options'])); } - } diff --git a/app/Http/Controllers/NotificationController.php b/app/Http/Controllers/NotificationController.php index f5fc7f76dd..2c7ec7fefd 100644 --- a/app/Http/Controllers/NotificationController.php +++ b/app/Http/Controllers/NotificationController.php @@ -11,23 +11,27 @@ class NotificationController extends Controller { - public function get() { + public function get() + { $notification = Auth::user()->notifications; return view('notification.notifications', ['notification' => $notification]); } - public function read($id) { + public function read($id) + { Auth::user()->unreadNotifications()->findOrFail($id)->markAsRead(); return Redirect::back()->with(Toastr::success('Notification Marked As Read!', 'Yay!', ['options'])); } - public function massRead() { + public function massRead() + { $current = new Carbon(); Auth::user()->unreadNotifications()->update(['read_at' => $current]); return Redirect::back()->with(Toastr::success('All Notifications Marked As Read!', 'Yay!', ['options'])); } - public function delete($id) { + public function delete($id) + { Auth::user()->notifications()->findOrFail($id)->delete(); return Redirect::back()->with(Toastr::success('Notification Deleted!', 'Yay!', ['options'])); } diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 3662739b2b..731a793689 100755 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -39,7 +39,7 @@ public function page($slug, $id) */ public function staff() { - $staff = DB::table('users')->leftJoin('groups','users.group_id','=','groups.id')->select('users.id','users.title','users.username','groups.name','groups.color','groups.icon')->where('groups.is_admin','=','1')->orWhere('groups.is_modo','=','1')->get(); + $staff = DB::table('users')->leftJoin('groups', 'users.group_id', '=', 'groups.id')->select('users.id', 'users.title', 'users.username', 'groups.name', 'groups.color', 'groups.icon')->where('groups.is_admin', '=', '1')->orWhere('groups.is_modo', '=', '1')->get(); return view('page.staff', ['staff' => $staff]); } @@ -66,5 +66,4 @@ public function about() { return view('page.aboutus'); } - } diff --git a/app/Http/Controllers/PollController.php b/app/Http/Controllers/PollController.php index 3bd4133b91..66c3e35737 100644 --- a/app/Http/Controllers/PollController.php +++ b/app/Http/Controllers/PollController.php @@ -62,11 +62,9 @@ public function vote(VoteOnPoll $request) } if (Voter::where('user_id', '=', $user->id)->where('poll_id', '=', $poll->id)->exists()) { - Toastr::error('Bro have already vote on this poll. Your vote has not been counted.', 'Whoops!', ['options']); return redirect('poll/' . $poll->slug . '/result'); - } if ($poll->ip_checking == 1) { @@ -88,5 +86,4 @@ public function result($slug) return view('poll.result', compact('poll')); } - } diff --git a/app/Http/Controllers/RequestController.php b/app/Http/Controllers/RequestController.php index 7fd8bf418f..b87b77146c 100644 --- a/app/Http/Controllers/RequestController.php +++ b/app/Http/Controllers/RequestController.php @@ -368,7 +368,6 @@ public function addRequestModeration($request_id, $info_hash) $appurl = env('APP_URL', 'http://unit3d.site'); PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $request->user_id, 'subject' => "Your Request " . $request->name . " Has Been Filled!", 'message' => $request->filled_by . " Has Filled Your Request [url={$appurl}/request/" . $request->id . "]" . $request->name . "[/url]" . " Please Approve or Decline The FullFill! "]); - } /** @@ -476,7 +475,6 @@ public function claimRequest($id) $request = Requests::findOrFail($id); if ($request->claimed == 0) { - $requestClaim = new RequestsClaims([ 'request_id' => $id, 'username' => $user->username, @@ -505,9 +503,7 @@ public function unclaimRequest($id) $claimer = RequestsClaims::where('request_id', '=', $id)->first(); if ($user->group->is_modo || $user->username == $claimer->username) { - if ($request->claimed == 1) { - $requestClaim = RequestsClaims::where('request_id', '=', $id)->firstOrFail(); $requestClaim->delete(); diff --git a/app/Http/Controllers/ShoutboxController.php b/app/Http/Controllers/ShoutboxController.php index fd8123b9d6..0538d937c4 100755 --- a/app/Http/Controllers/ShoutboxController.php +++ b/app/Http/Controllers/ShoutboxController.php @@ -97,7 +97,7 @@ public function send() } } - static public function getMessages($after = null) + public static function getMessages($after = null) { $messages = Cache::remember('shoutbox_messages', 1440, function () { return Shoutbox::orderBy('id', 'desc')->take(50)->get(); diff --git a/app/Http/Controllers/Staff/BanController.php b/app/Http/Controllers/Staff/BanController.php index c37fe633ab..9f13490f48 100644 --- a/app/Http/Controllers/Staff/BanController.php +++ b/app/Http/Controllers/Staff/BanController.php @@ -48,32 +48,32 @@ public function ban($username, $id) if ($user->group->is_modo || Auth::user()->id == $user->id) { return redirect()->route('home')->with(Toastr::error('You Cannot Ban Yourself Or Other Staff', 'Alert', ['options'])); } else { - $user->group_id = 5; - $user->can_upload = 0; - $user->can_download = 0; - $user->can_comment = 0; - $user->can_invite = 0; - $user->can_request = 0; - $user->can_chat = 0; - $user->save(); - - $staff = Auth::user(); - $v = Validator::make(Request::all(), [ + $user->group_id = 5; + $user->can_upload = 0; + $user->can_download = 0; + $user->can_comment = 0; + $user->can_invite = 0; + $user->can_request = 0; + $user->can_chat = 0; + $user->save(); + + $staff = Auth::user(); + $v = Validator::make(Request::all(), [ 'owned_by' => 'required', 'created_by' => 'required|numeric', 'ban_reason' => 'required', - ]); + ]); - $ban = new Ban(); - $ban->owned_by = $user->id; - $ban->created_by = $staff->id; - $ban->ban_reason = Request::get('ban_reason'); - $ban->save(); + $ban = new Ban(); + $ban->owned_by = $user->id; + $ban->created_by = $staff->id; + $ban->ban_reason = Request::get('ban_reason'); + $ban->save(); // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has banned member " . $user->username . "."); + \LogActivity::addToLog("Staff Member " . $staff->username . " has banned member " . $user->username . "."); - return redirect()->route('home')->with(Toastr::success('User Is Now Banned!', 'Alert', ['options'])); + return redirect()->route('home')->with(Toastr::success('User Is Now Banned!', 'Alert', ['options'])); } } @@ -92,32 +92,32 @@ public function unban($username, $id) if ($user->group->is_modo || Auth::user()->id == $user->id) { return redirect()->route('home')->with(Toastr::error('You Cannot Unban Yourself Or Other Staff', 'Alert', ['options'])); } else { - $user->group_id = Request::get('group_id'); - $user->can_upload = 1; - $user->can_download = 1; - $user->can_comment = 1; - $user->can_invite = 1; - $user->can_request = 1; - $user->can_chat = 1; - $user->save(); - - $staff = Auth::user(); - $v = Validator::make(Request::all(), [ + $user->group_id = Request::get('group_id'); + $user->can_upload = 1; + $user->can_download = 1; + $user->can_comment = 1; + $user->can_invite = 1; + $user->can_request = 1; + $user->can_chat = 1; + $user->save(); + + $staff = Auth::user(); + $v = Validator::make(Request::all(), [ 'unban_reason' => 'required', 'removed_at' => 'required' - ]); + ]); - $ban = new Ban(); - $ban->owned_by = $user->id; - $ban->created_by = $staff->id; - $ban->unban_reason = Request::get('unban_reason'); - $ban->removed_at = Carbon::now(); - $ban->save(); + $ban = new Ban(); + $ban->owned_by = $user->id; + $ban->created_by = $staff->id; + $ban->unban_reason = Request::get('unban_reason'); + $ban->removed_at = Carbon::now(); + $ban->save(); // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has unbanned member " . $user->username . "."); + \LogActivity::addToLog("Staff Member " . $staff->username . " has unbanned member " . $user->username . "."); - return redirect()->route('home')->with(Toastr::success('User Is Now Relieved Of His Ban!', 'Alert', ['options'])); + return redirect()->route('home')->with(Toastr::success('User Is Now Relieved Of His Ban!', 'Alert', ['options'])); } } } diff --git a/app/Http/Controllers/Staff/MassPMController.php b/app/Http/Controllers/Staff/MassPMController.php index f363c835f7..3038af6b23 100644 --- a/app/Http/Controllers/Staff/MassPMController.php +++ b/app/Http/Controllers/Staff/MassPMController.php @@ -56,7 +56,6 @@ public function sendMassPM() ]); if ($v->passes()) { - foreach ($users as $user) { PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $user->id, 'subject' => Request::get('title'), 'message' => Request::get('message')]); } diff --git a/app/Http/Controllers/Staff/TorrentController.php b/app/Http/Controllers/Staff/TorrentController.php index 9435782b7c..0ab2542edd 100755 --- a/app/Http/Controllers/Staff/TorrentController.php +++ b/app/Http/Controllers/Staff/TorrentController.php @@ -50,5 +50,4 @@ public function search() return view('Staff.torrent.index', ['torrents' => $torrents]); } - } diff --git a/app/Http/Controllers/Staff/UserController.php b/app/Http/Controllers/Staff/UserController.php index 629f99344b..b7b33adfda 100755 --- a/app/Http/Controllers/Staff/UserController.php +++ b/app/Http/Controllers/Staff/UserController.php @@ -172,57 +172,57 @@ protected function userDelete($username, $id) return redirect()->route('home')->with(Toastr::error('You Cannot Delete Yourself Or Other Staff', 'Alert', ['options'])); } else { // Removes UserID from Torrents if any and replaces with System UserID (0) - foreach (Torrent::where('user_id', '=', $user->id)->get() as $tor) { - $tor->user_id = 1; - $tor->save(); - } + foreach (Torrent::where('user_id', '=', $user->id)->get() as $tor) { + $tor->user_id = 1; + $tor->save(); + } // Removes UserID from Comments if any and replaces with System UserID (0) - foreach (Comment::where('user_id', '=', $user->id)->get() as $com) { - $com->user_id = 1; - $com->save(); - } + foreach (Comment::where('user_id', '=', $user->id)->get() as $com) { + $com->user_id = 1; + $com->save(); + } // Removes UserID from Posts if any and replaces with System UserID (0) - foreach (Post::where('user_id', '=', $user->id)->get() as $post) { - $post->user_id = 1; - $post->save(); - } + foreach (Post::where('user_id', '=', $user->id)->get() as $post) { + $post->user_id = 1; + $post->save(); + } // Removes UserID from Topic Creators if any and replaces with System UserID (0) - foreach (Topic::where('first_post_user_id', '=', $user->id)->get() as $topic) { - $topic->first_post_user_id = 1; - $topic->save(); - } + foreach (Topic::where('first_post_user_id', '=', $user->id)->get() as $topic) { + $topic->first_post_user_id = 1; + $topic->save(); + } // Removes UserID from Topic if any and replaces with System UserID (0) - foreach (Topic::where('last_post_user_id', '=', $user->id)->get() as $topic) { - $topic->last_post_user_id = 1; - $topic->save(); - } + foreach (Topic::where('last_post_user_id', '=', $user->id)->get() as $topic) { + $topic->last_post_user_id = 1; + $topic->save(); + } // Removes UserID from PM if any and replaces with System UserID (0) - foreach (PrivateMessage::where('sender_id', '=', $user->id)->get() as $sent) { - $sent->sender_id = 1; - $sent->save(); - } + foreach (PrivateMessage::where('sender_id', '=', $user->id)->get() as $sent) { + $sent->sender_id = 1; + $sent->save(); + } // Removes UserID from PM if any and replaces with System UserID (0) - foreach (PrivateMessage::where('reciever_id', '=', $user->id)->get() as $recieved) { - $recieved->reciever_id = 1; - $recieved->save(); - } + foreach (PrivateMessage::where('reciever_id', '=', $user->id)->get() as $recieved) { + $recieved->reciever_id = 1; + $recieved->save(); + } // Removes all Posts made by User from the shoutbox - foreach (Shoutbox::where('user', '=', $user->id)->get() as $shout) { - $shout->delete(); - } + foreach (Shoutbox::where('user', '=', $user->id)->get() as $shout) { + $shout->delete(); + } // Removes all notes for user - foreach (Note::where('user_id', '=', $user->id)->get() as $note) { - $note->delete(); - } + foreach (Note::where('user_id', '=', $user->id)->get() as $note) { + $note->delete(); + } // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has deleted " . $user->username . " account."); + \LogActivity::addToLog("Staff Member " . $staff->username . " has deleted " . $user->username . " account."); - if ($user->delete()) { - return redirect('staff_dashboard')->with(Toastr::success('Account Has Been Removed', 'Success!', ['options'])); - } else { - return redirect('staff_dashboard')->with(Toastr::warning('Something Went Wrong!', 'Error', ['options'])); - } + if ($user->delete()) { + return redirect('staff_dashboard')->with(Toastr::success('Account Has Been Removed', 'Success!', ['options'])); + } else { + return redirect('staff_dashboard')->with(Toastr::warning('Something Went Wrong!', 'Error', ['options'])); + } } } } diff --git a/app/Http/Controllers/TorrentController.php b/app/Http/Controllers/TorrentController.php index 78f7af0a8a..5c18c361bc 100755 --- a/app/Http/Controllers/TorrentController.php +++ b/app/Http/Controllers/TorrentController.php @@ -515,7 +515,7 @@ public function torrent($slug, $id) $general_crumbs = $view_crumbs['general']; $video = $parsed['video']; $video_crumbs = $view_crumbs['video']; - $settings = ($parsed['video'] !== NULL && isset($parsed['video'][0]) && isset($parsed['video'][0]['encoding_settings'])) ? $parsed['video'][0]['encoding_settings'] : NULL; + $settings = ($parsed['video'] !== null && isset($parsed['video'][0]) && isset($parsed['video'][0]['encoding_settings'])) ? $parsed['video'][0]['encoding_settings'] : null; $audio = $parsed['audio']; $audio_crumbs = $view_crumbs['audio']; $subtitle = $parsed['text']; diff --git a/app/Http/Middleware/CheckIfAlreadyVoted.php b/app/Http/Middleware/CheckIfAlreadyVoted.php index 9f8df01e30..b249dcbc86 100644 --- a/app/Http/Middleware/CheckIfAlreadyVoted.php +++ b/app/Http/Middleware/CheckIfAlreadyVoted.php @@ -39,11 +39,9 @@ public function handle($request, Closure $next) //flash a Toastr and redirect to results. if ($poll->ip_checking == 1) { if (Voter::where('ip_address', '=', $request->ip())->where('poll_id', '=', $poll->id)->exists()) { - Toastr::error('There is already a vote on this poll from your IP. Your vote has not been counted.', 'Whoops!', ['options']); return redirect('poll/' . $poll->slug . '/result'); - } } diff --git a/app/Http/Middleware/HtmlEncrypt.php b/app/Http/Middleware/HtmlEncrypt.php index f2813f70b3..ed46239b2a 100644 --- a/app/Http/Middleware/HtmlEncrypt.php +++ b/app/Http/Middleware/HtmlEncrypt.php @@ -49,7 +49,6 @@ public function handle($request, Closure $next) } return $response; - } public function encryptHtml($content) diff --git a/app/Http/Middleware/LockAccount.php b/app/Http/Middleware/LockAccount.php index 3863e4ab83..7557826e18 100644 --- a/app/Http/Middleware/LockAccount.php +++ b/app/Http/Middleware/LockAccount.php @@ -30,13 +30,9 @@ class LockAccount public function handle($request, Closure $next) { if ($request->session()->has('locked')) { - return Redirect::route('lock')->with(Toastr::info('Your Account Is Locked', 'Info', ['options'])); - } return $next($request); - } - } diff --git a/app/Listeners/RecordFailedLoginAttempt.php b/app/Listeners/RecordFailedLoginAttempt.php index 061a1a13a2..1b13d9907f 100644 --- a/app/Listeners/RecordFailedLoginAttempt.php +++ b/app/Listeners/RecordFailedLoginAttempt.php @@ -32,8 +32,8 @@ public function handle(Failed $event) if (isset($event->user) && is_a($event->user, 'Illuminate\Database\Eloquent\Model')) { $event->user->notify(new FailedLogin( - Request::getClientIp() - )); + Request::getClientIp() + )); } } } diff --git a/app/Mail/NewReply.php b/app/Mail/NewReply.php index 7b1569b3e1..e2fc1b6179 100755 --- a/app/Mail/NewReply.php +++ b/app/Mail/NewReply.php @@ -45,6 +45,5 @@ public function build() return $this->markdown('emails.new_reply') ->from(config('other.email'), config('other.title')) ->subject('The topic ' . $this->topic->name . ' has a new reply'); - } } diff --git a/app/Notifications/UsernameReminder.php b/app/Notifications/UsernameReminder.php index 6c1108d1fc..1f31747530 100644 --- a/app/Notifications/UsernameReminder.php +++ b/app/Notifications/UsernameReminder.php @@ -19,7 +19,7 @@ class UsernameReminder extends Notification implements ShouldQueue */ public function __construct() { - // nothing special to do + // nothing special to do } /** diff --git a/app/Services/Bencode.php b/app/Services/Bencode.php index 3ebf687761..9077bd09ca 100755 --- a/app/Services/Bencode.php +++ b/app/Services/Bencode.php @@ -12,7 +12,8 @@ namespace App\Services; -use function theodorejb\polycast\{safe_int, safe_float}; +use function theodorejb\polycast\safe_int; +use function theodorejb\polycast\safe_float; /** * Bencode library for torrents diff --git a/app/Services/Clients/Client.php b/app/Services/Clients/Client.php index ab01c00209..67b4013584 100755 --- a/app/Services/Clients/Client.php +++ b/app/Services/Clients/Client.php @@ -45,7 +45,6 @@ public function request($url, array $options = []) try { $response = $this->guzzle->request('GET', $url, $options); } catch (\Exception $e) { - } if (!empty($response)) { diff --git a/app/Services/Clients/MangaUpdatesClient.php b/app/Services/Clients/MangaUpdatesClient.php index f460ef4f37..988eef8b04 100755 --- a/app/Services/Clients/MangaUpdatesClient.php +++ b/app/Services/Clients/MangaUpdatesClient.php @@ -30,7 +30,6 @@ public function __construct() public function find($key) { - } public function manga($id) @@ -41,13 +40,19 @@ public function manga($id) $data = []; $data['description'] = $dom->filter('.sContainer .sContent')->first()->html(); - preg_match('/(?:class\=\"sCat\"\>\Associated Names\<\/b\>\<\/div\>)+\n?(?:\
)(.+)(?:\n?+\<\/div\>)/i', - $webpage, $aka_titles); + preg_match( + '/(?:class\=\"sCat\"\>\Associated Names\<\/b\>\<\/div\>)+\n?(?:\
)(.+)(?:\n?+\<\/div\>)/i', + $webpage, + $aka_titles + ); $aka_titles = explode('
', $aka_titles[1]); $data['aka_titles'] = array_filter($aka_titles, 'html_entity_decode'); - preg_match('/(?:class\=\"sCat\"\>\Genre\<\/b\>\<\/div\>)+\n?(?:\
)(.+)(?:\n?+\<\/div\>)/i', $webpage, - $genre_block); + preg_match( + '/(?:class\=\"sCat\"\>\Genre\<\/b\>\<\/div\>)+\n?(?:\
)(.+)(?:\n?+\<\/div\>)/i', + $webpage, + $genre_block + ); preg_match_all('/series\.html\?act\=genresearch\&\;genre\=([\w-+]+)/i', $genre_block[1], $genres); $data['genres'] = array_filter($genres[1], 'urldecode'); @@ -56,11 +61,9 @@ public function manga($id) public function authors($id) { - } public function characters($id) { - } } diff --git a/app/Services/Clients/TmdbClient.php b/app/Services/Clients/TmdbClient.php index 96066f896b..1b8be05b84 100755 --- a/app/Services/Clients/TmdbClient.php +++ b/app/Services/Clients/TmdbClient.php @@ -134,11 +134,17 @@ private function formatMovie($movie) 'writers' => $this->formatCasts($movie['credits'], 'writers'), 'producers' => $this->formatCasts($movie['credits'], 'producers'), 'poster' => !empty($movie['poster_path']) ? $this->imagePath . $movie['poster_path'] : null, - 'posters' => !empty($movie['images']['posters']) ? $this->formatImages($movie['images']['posters'], - $this->imagePath, $movie['poster_path']) : null, + 'posters' => !empty($movie['images']['posters']) ? $this->formatImages( + $movie['images']['posters'], + $this->imagePath, + $movie['poster_path'] + ) : null, 'backdrop' => !empty($movie['backdrop_path']) ? $this->imageBackdropPath . $movie['backdrop_path'] : null, - 'backdrops' => !empty($movie['images']['backdrops']) ? $this->formatImages($movie['images']['backdrops'], - $this->imageBackdropPath, $movie['backdrop_path']) : null, + 'backdrops' => !empty($movie['images']['backdrops']) ? $this->formatImages( + $movie['images']['backdrops'], + $this->imageBackdropPath, + $movie['backdrop_path'] + ) : null, 'tmdbRating' => $movie['vote_average'], 'tmdbVotes' => $movie['vote_count'], ]); @@ -166,11 +172,17 @@ private function formatTv($movie) 'genres' => $this->formatGenres($movie['genres']), 'videoTrailer' => $this->formatVideoTrailers($movie), 'poster' => !empty($movie['poster_path']) ? $this->imagePath . $movie['poster_path'] : null, - 'posters' => !empty($movie['images']['posters']) ? $this->formatImages($movie['images']['posters'], - $this->imagePath, $movie['poster_path']) : null, + 'posters' => !empty($movie['images']['posters']) ? $this->formatImages( + $movie['images']['posters'], + $this->imagePath, + $movie['poster_path'] + ) : null, 'backdrop' => !empty($movie['backdrop_path']) ? $this->imageBackdropPath . $movie['backdrop_path'] : null, - 'backdrops' => !empty($movie['images']['backdrops']) ? $this->formatImages($movie['images']['backdrops'], - $this->imageBackdropPath, $movie['backdrop_path']) : null, + 'backdrops' => !empty($movie['images']['backdrops']) ? $this->formatImages( + $movie['images']['backdrops'], + $this->imageBackdropPath, + $movie['backdrop_path'] + ) : null, 'tmdbRating' => $movie['vote_average'], 'tmdbVotes' => $movie['vote_count'], ]); @@ -193,8 +205,11 @@ private function formatPerson($person) 'placeOfBirth' => $person['place_of_birth'], 'biography' => $person['biography'], 'photo' => !empty($person['profile_path']) ? $this->imageProfilePath . $person['profile_path'] : null, - 'photos' => !empty($person['images']['profiles']) ? $this->formatImages($person['images']['profiles'], - $this->imageProfilePath, $person['profile_path']) : null, + 'photos' => !empty($person['images']['profiles']) ? $this->formatImages( + $person['images']['profiles'], + $this->imageProfilePath, + $person['profile_path'] + ) : null, ]); } diff --git a/app/Services/Clients/TvdbClient.php b/app/Services/Clients/TvdbClient.php index 57a93244d1..4e41c6aef3 100755 --- a/app/Services/Clients/TvdbClient.php +++ b/app/Services/Clients/TvdbClient.php @@ -75,7 +75,6 @@ public function tv($id) public function person($id) { - } private function formatTv($data) diff --git a/app/Services/Data/Movie.php b/app/Services/Data/Movie.php index 9fcb4df4f4..c485734b39 100755 --- a/app/Services/Data/Movie.php +++ b/app/Services/Data/Movie.php @@ -181,7 +181,6 @@ public function merge(Movie $data, Movie $data2 = null) foreach ($movies as $movie) { foreach ($movie as $movie_key => $movie_value) { - if ($movie_key == 'title' && $movie_value != $this->title) { $this->aka[] = $movie_value; } diff --git a/app/Services/Data/Tv.php b/app/Services/Data/Tv.php index 819ea62b62..f69731da3c 100755 --- a/app/Services/Data/Tv.php +++ b/app/Services/Data/Tv.php @@ -67,5 +67,4 @@ public function __construct($data = []) } $this->ended = $this->endDate ? true : $this->ended; } - } diff --git a/app/Services/MovieScrapper.php b/app/Services/MovieScrapper.php index 02102380da..e8f583bbf4 100755 --- a/app/Services/MovieScrapper.php +++ b/app/Services/MovieScrapper.php @@ -94,7 +94,6 @@ public function scrape($type, $imdb = null, $tmdb = null, $tvdb = null) return $tvdb_tv->merge($tmdb_tv, $omdb_tv); } - } public function person($tmdb) diff --git a/app/User.php b/app/User.php index 25e468e013..2fb99fa38e 100755 --- a/app/User.php +++ b/app/User.php @@ -259,7 +259,8 @@ public function bookmarks() return $this->belongsToMany(\App\Torrent::class, 'bookmarks', 'user_id', 'torrent_id')->withTimeStamps(); } - public function hasBookmarked($torrent_id) { + public function hasBookmarked($torrent_id) + { return $this->bookmarks()->where('torrent_id', '=', $torrent_id)->first() !== null; } diff --git a/database/migrations/2017_12_10_020753_create_articles_table.php b/database/migrations/2017_12_10_020753_create_articles_table.php index 5398435ac9..fd1ab392d4 100644 --- a/database/migrations/2017_12_10_020753_create_articles_table.php +++ b/database/migrations/2017_12_10_020753_create_articles_table.php @@ -44,5 +44,4 @@ public function down() { Schema::drop('articles'); } - } diff --git a/database/migrations/2017_12_10_020753_create_ban_table.php b/database/migrations/2017_12_10_020753_create_ban_table.php index b5b148afa1..0c9ac08150 100644 --- a/database/migrations/2017_12_10_020753_create_ban_table.php +++ b/database/migrations/2017_12_10_020753_create_ban_table.php @@ -44,5 +44,4 @@ public function down() { Schema::drop('ban'); } - } diff --git a/database/migrations/2017_12_10_020753_create_bon_exchange_table.php b/database/migrations/2017_12_10_020753_create_bon_exchange_table.php index 9a79f04aaa..cb7c739094 100644 --- a/database/migrations/2017_12_10_020753_create_bon_exchange_table.php +++ b/database/migrations/2017_12_10_020753_create_bon_exchange_table.php @@ -45,5 +45,4 @@ public function down() { Schema::drop('bon_exchange'); } - } diff --git a/database/migrations/2017_12_10_020753_create_bon_transactions_table.php b/database/migrations/2017_12_10_020753_create_bon_transactions_table.php index 4c70311965..25635eb07e 100644 --- a/database/migrations/2017_12_10_020753_create_bon_transactions_table.php +++ b/database/migrations/2017_12_10_020753_create_bon_transactions_table.php @@ -46,5 +46,4 @@ public function down() { Schema::drop('bon_transactions'); } - } diff --git a/database/migrations/2017_12_10_020753_create_bookmarks_table.php b/database/migrations/2017_12_10_020753_create_bookmarks_table.php index 4b7223a106..8a29903bbf 100644 --- a/database/migrations/2017_12_10_020753_create_bookmarks_table.php +++ b/database/migrations/2017_12_10_020753_create_bookmarks_table.php @@ -41,5 +41,4 @@ public function down() { Schema::drop('bookmarks'); } - } diff --git a/database/migrations/2017_12_10_020753_create_catalog_torrent_table.php b/database/migrations/2017_12_10_020753_create_catalog_torrent_table.php index 976b1580c6..47504caa73 100644 --- a/database/migrations/2017_12_10_020753_create_catalog_torrent_table.php +++ b/database/migrations/2017_12_10_020753_create_catalog_torrent_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('catalog_torrent'); } - } diff --git a/database/migrations/2017_12_10_020753_create_catalogs_table.php b/database/migrations/2017_12_10_020753_create_catalogs_table.php index 2d65ea07df..1d5b98600b 100644 --- a/database/migrations/2017_12_10_020753_create_catalogs_table.php +++ b/database/migrations/2017_12_10_020753_create_catalogs_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('catalogs'); } - } diff --git a/database/migrations/2017_12_10_020753_create_categories_table.php b/database/migrations/2017_12_10_020753_create_categories_table.php index e8a1f6c724..c180603b10 100644 --- a/database/migrations/2017_12_10_020753_create_categories_table.php +++ b/database/migrations/2017_12_10_020753_create_categories_table.php @@ -43,5 +43,4 @@ public function down() { Schema::drop('categories'); } - } diff --git a/database/migrations/2017_12_10_020753_create_clients_table.php b/database/migrations/2017_12_10_020753_create_clients_table.php index 2095359e16..3e4d3d1ccc 100644 --- a/database/migrations/2017_12_10_020753_create_clients_table.php +++ b/database/migrations/2017_12_10_020753_create_clients_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('clients'); } - } diff --git a/database/migrations/2017_12_10_020753_create_comments_table.php b/database/migrations/2017_12_10_020753_create_comments_table.php index 2b5ceeb69c..cf2fcdd938 100644 --- a/database/migrations/2017_12_10_020753_create_comments_table.php +++ b/database/migrations/2017_12_10_020753_create_comments_table.php @@ -45,5 +45,4 @@ public function down() { Schema::drop('comments'); } - } diff --git a/database/migrations/2017_12_10_020753_create_failed_login_attempts_table.php b/database/migrations/2017_12_10_020753_create_failed_login_attempts_table.php index 891284003f..019143c67e 100644 --- a/database/migrations/2017_12_10_020753_create_failed_login_attempts_table.php +++ b/database/migrations/2017_12_10_020753_create_failed_login_attempts_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('failed_login_attempts'); } - } diff --git a/database/migrations/2017_12_10_020753_create_featured_torrents_table.php b/database/migrations/2017_12_10_020753_create_featured_torrents_table.php index 7ba4aeae14..c23ba819bf 100644 --- a/database/migrations/2017_12_10_020753_create_featured_torrents_table.php +++ b/database/migrations/2017_12_10_020753_create_featured_torrents_table.php @@ -41,5 +41,4 @@ public function down() { Schema::drop('featured_torrents'); } - } diff --git a/database/migrations/2017_12_10_020753_create_files_table.php b/database/migrations/2017_12_10_020753_create_files_table.php index 1adab94241..ed78f0f059 100644 --- a/database/migrations/2017_12_10_020753_create_files_table.php +++ b/database/migrations/2017_12_10_020753_create_files_table.php @@ -41,5 +41,4 @@ public function down() { Schema::drop('files'); } - } diff --git a/database/migrations/2017_12_10_020753_create_follows_table.php b/database/migrations/2017_12_10_020753_create_follows_table.php index 0222c9bf5a..a4d2448c79 100644 --- a/database/migrations/2017_12_10_020753_create_follows_table.php +++ b/database/migrations/2017_12_10_020753_create_follows_table.php @@ -41,5 +41,4 @@ public function down() { Schema::drop('follows'); } - } diff --git a/database/migrations/2017_12_10_020753_create_forums_table.php b/database/migrations/2017_12_10_020753_create_forums_table.php index 63d2958ae3..0e74aaa6c9 100644 --- a/database/migrations/2017_12_10_020753_create_forums_table.php +++ b/database/migrations/2017_12_10_020753_create_forums_table.php @@ -51,5 +51,4 @@ public function down() { Schema::drop('forums'); } - } diff --git a/database/migrations/2017_12_10_020753_create_graveyard_table.php b/database/migrations/2017_12_10_020753_create_graveyard_table.php index c098ba06d9..e70dade189 100644 --- a/database/migrations/2017_12_10_020753_create_graveyard_table.php +++ b/database/migrations/2017_12_10_020753_create_graveyard_table.php @@ -43,5 +43,4 @@ public function down() { Schema::drop('graveyard'); } - } diff --git a/database/migrations/2017_12_10_020753_create_groups_table.php b/database/migrations/2017_12_10_020753_create_groups_table.php index 29808bf5b4..863648661d 100644 --- a/database/migrations/2017_12_10_020753_create_groups_table.php +++ b/database/migrations/2017_12_10_020753_create_groups_table.php @@ -50,5 +50,4 @@ public function down() { Schema::drop('groups'); } - } diff --git a/database/migrations/2017_12_10_020753_create_history_table.php b/database/migrations/2017_12_10_020753_create_history_table.php index 75cdefc8e8..6c8b6f07df 100644 --- a/database/migrations/2017_12_10_020753_create_history_table.php +++ b/database/migrations/2017_12_10_020753_create_history_table.php @@ -52,5 +52,4 @@ public function down() { Schema::drop('history'); } - } diff --git a/database/migrations/2017_12_10_020753_create_invites_table.php b/database/migrations/2017_12_10_020753_create_invites_table.php index 6b430dccdd..a843d3e2a6 100644 --- a/database/migrations/2017_12_10_020753_create_invites_table.php +++ b/database/migrations/2017_12_10_020753_create_invites_table.php @@ -46,5 +46,4 @@ public function down() { Schema::drop('invites'); } - } diff --git a/database/migrations/2017_12_10_020753_create_jobs_table.php b/database/migrations/2017_12_10_020753_create_jobs_table.php index 9585a6b1ea..3da665c76a 100644 --- a/database/migrations/2017_12_10_020753_create_jobs_table.php +++ b/database/migrations/2017_12_10_020753_create_jobs_table.php @@ -45,5 +45,4 @@ public function down() { Schema::drop('jobs'); } - } diff --git a/database/migrations/2017_12_10_020753_create_likes_table.php b/database/migrations/2017_12_10_020753_create_likes_table.php index 2b10c07c42..715bf40192 100644 --- a/database/migrations/2017_12_10_020753_create_likes_table.php +++ b/database/migrations/2017_12_10_020753_create_likes_table.php @@ -43,5 +43,4 @@ public function down() { Schema::drop('likes'); } - } diff --git a/database/migrations/2017_12_10_020753_create_log_activities_table.php b/database/migrations/2017_12_10_020753_create_log_activities_table.php index 3c1c903673..b73f3a2184 100644 --- a/database/migrations/2017_12_10_020753_create_log_activities_table.php +++ b/database/migrations/2017_12_10_020753_create_log_activities_table.php @@ -45,5 +45,4 @@ public function down() { Schema::drop('log_activities'); } - } diff --git a/database/migrations/2017_12_10_020753_create_notifications_table.php b/database/migrations/2017_12_10_020753_create_notifications_table.php index c0a125e75d..a5ffaeab93 100644 --- a/database/migrations/2017_12_10_020753_create_notifications_table.php +++ b/database/migrations/2017_12_10_020753_create_notifications_table.php @@ -45,5 +45,4 @@ public function down() { Schema::drop('notifications'); } - } diff --git a/database/migrations/2017_12_10_020753_create_options_table.php b/database/migrations/2017_12_10_020753_create_options_table.php index 17a7fc7754..1ecfed60b0 100644 --- a/database/migrations/2017_12_10_020753_create_options_table.php +++ b/database/migrations/2017_12_10_020753_create_options_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('options'); } - } diff --git a/database/migrations/2017_12_10_020753_create_pages_table.php b/database/migrations/2017_12_10_020753_create_pages_table.php index 0272d31c58..7d14a61af8 100644 --- a/database/migrations/2017_12_10_020753_create_pages_table.php +++ b/database/migrations/2017_12_10_020753_create_pages_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('pages'); } - } diff --git a/database/migrations/2017_12_10_020753_create_password_resets_table.php b/database/migrations/2017_12_10_020753_create_password_resets_table.php index 79e7686691..8ff33f2741 100644 --- a/database/migrations/2017_12_10_020753_create_password_resets_table.php +++ b/database/migrations/2017_12_10_020753_create_password_resets_table.php @@ -40,5 +40,4 @@ public function down() { Schema::drop('password_resets'); } - } diff --git a/database/migrations/2017_12_10_020753_create_peers_table.php b/database/migrations/2017_12_10_020753_create_peers_table.php index f9f4c74712..956921849c 100644 --- a/database/migrations/2017_12_10_020753_create_peers_table.php +++ b/database/migrations/2017_12_10_020753_create_peers_table.php @@ -51,5 +51,4 @@ public function down() { Schema::drop('peers'); } - } diff --git a/database/migrations/2017_12_10_020753_create_permissions_table.php b/database/migrations/2017_12_10_020753_create_permissions_table.php index da3c81c848..73031671a5 100644 --- a/database/migrations/2017_12_10_020753_create_permissions_table.php +++ b/database/migrations/2017_12_10_020753_create_permissions_table.php @@ -46,5 +46,4 @@ public function down() { Schema::drop('permissions'); } - } diff --git a/database/migrations/2017_12_10_020753_create_personal_freeleech_table.php b/database/migrations/2017_12_10_020753_create_personal_freeleech_table.php index 4ac565196c..15671a5f09 100644 --- a/database/migrations/2017_12_10_020753_create_personal_freeleech_table.php +++ b/database/migrations/2017_12_10_020753_create_personal_freeleech_table.php @@ -40,5 +40,4 @@ public function down() { Schema::drop('personal_freeleech'); } - } diff --git a/database/migrations/2017_12_10_020753_create_polls_table.php b/database/migrations/2017_12_10_020753_create_polls_table.php index 28944518dc..3f1f7d04b3 100644 --- a/database/migrations/2017_12_10_020753_create_polls_table.php +++ b/database/migrations/2017_12_10_020753_create_polls_table.php @@ -44,5 +44,4 @@ public function down() { Schema::drop('polls'); } - } diff --git a/database/migrations/2017_12_10_020753_create_posts_table.php b/database/migrations/2017_12_10_020753_create_posts_table.php index 61878894bb..18573ef398 100644 --- a/database/migrations/2017_12_10_020753_create_posts_table.php +++ b/database/migrations/2017_12_10_020753_create_posts_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('posts'); } - } diff --git a/database/migrations/2017_12_10_020753_create_private_messages_table.php b/database/migrations/2017_12_10_020753_create_private_messages_table.php index c6e96ab048..d551052257 100644 --- a/database/migrations/2017_12_10_020753_create_private_messages_table.php +++ b/database/migrations/2017_12_10_020753_create_private_messages_table.php @@ -46,5 +46,4 @@ public function down() { Schema::drop('private_messages'); } - } diff --git a/database/migrations/2017_12_10_020753_create_reports_table.php b/database/migrations/2017_12_10_020753_create_reports_table.php index 61beef8d28..f3b6945577 100644 --- a/database/migrations/2017_12_10_020753_create_reports_table.php +++ b/database/migrations/2017_12_10_020753_create_reports_table.php @@ -46,5 +46,4 @@ public function down() { Schema::drop('reports'); } - } diff --git a/database/migrations/2017_12_10_020753_create_request_bounty_table.php b/database/migrations/2017_12_10_020753_create_request_bounty_table.php index 7890082c31..9934873df6 100644 --- a/database/migrations/2017_12_10_020753_create_request_bounty_table.php +++ b/database/migrations/2017_12_10_020753_create_request_bounty_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('request_bounty'); } - } diff --git a/database/migrations/2017_12_10_020753_create_request_claims_table.php b/database/migrations/2017_12_10_020753_create_request_claims_table.php index 63c9ea993a..da431cc3ff 100644 --- a/database/migrations/2017_12_10_020753_create_request_claims_table.php +++ b/database/migrations/2017_12_10_020753_create_request_claims_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('request_claims'); } - } diff --git a/database/migrations/2017_12_10_020753_create_requests_table.php b/database/migrations/2017_12_10_020753_create_requests_table.php index 5738d838cd..872a8c6263 100644 --- a/database/migrations/2017_12_10_020753_create_requests_table.php +++ b/database/migrations/2017_12_10_020753_create_requests_table.php @@ -56,5 +56,4 @@ public function down() { Schema::drop('requests'); } - } diff --git a/database/migrations/2017_12_10_020753_create_rss_table.php b/database/migrations/2017_12_10_020753_create_rss_table.php index 0dd883414d..7169ca8426 100644 --- a/database/migrations/2017_12_10_020753_create_rss_table.php +++ b/database/migrations/2017_12_10_020753_create_rss_table.php @@ -41,5 +41,4 @@ public function down() { Schema::drop('rss'); } - } diff --git a/database/migrations/2017_12_10_020753_create_sessions_table.php b/database/migrations/2017_12_10_020753_create_sessions_table.php index efc874fdc7..e31c0c175d 100644 --- a/database/migrations/2017_12_10_020753_create_sessions_table.php +++ b/database/migrations/2017_12_10_020753_create_sessions_table.php @@ -43,5 +43,4 @@ public function down() { Schema::drop('sessions'); } - } diff --git a/database/migrations/2017_12_10_020753_create_shoutbox_table.php b/database/migrations/2017_12_10_020753_create_shoutbox_table.php index 265539e604..99ef8962c7 100644 --- a/database/migrations/2017_12_10_020753_create_shoutbox_table.php +++ b/database/migrations/2017_12_10_020753_create_shoutbox_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('shoutbox'); } - } diff --git a/database/migrations/2017_12_10_020753_create_tag_torrent_table.php b/database/migrations/2017_12_10_020753_create_tag_torrent_table.php index 48a81aadd6..03b43de56b 100644 --- a/database/migrations/2017_12_10_020753_create_tag_torrent_table.php +++ b/database/migrations/2017_12_10_020753_create_tag_torrent_table.php @@ -40,5 +40,4 @@ public function down() { Schema::drop('tag_torrent'); } - } diff --git a/database/migrations/2017_12_10_020753_create_tags_table.php b/database/migrations/2017_12_10_020753_create_tags_table.php index 0a909775e7..987e9c8a8b 100644 --- a/database/migrations/2017_12_10_020753_create_tags_table.php +++ b/database/migrations/2017_12_10_020753_create_tags_table.php @@ -40,5 +40,4 @@ public function down() { Schema::drop('tags'); } - } diff --git a/database/migrations/2017_12_10_020753_create_thanks_table.php b/database/migrations/2017_12_10_020753_create_thanks_table.php index a86a4e4e35..30acebb18f 100644 --- a/database/migrations/2017_12_10_020753_create_thanks_table.php +++ b/database/migrations/2017_12_10_020753_create_thanks_table.php @@ -41,5 +41,4 @@ public function down() { Schema::drop('thanks'); } - } diff --git a/database/migrations/2017_12_10_020753_create_topics_table.php b/database/migrations/2017_12_10_020753_create_topics_table.php index 43bd662bb0..061fa9f246 100644 --- a/database/migrations/2017_12_10_020753_create_topics_table.php +++ b/database/migrations/2017_12_10_020753_create_topics_table.php @@ -56,5 +56,4 @@ public function down() { Schema::drop('topics'); } - } diff --git a/database/migrations/2017_12_10_020753_create_torrents_table.php b/database/migrations/2017_12_10_020753_create_torrents_table.php index 531799e888..61a1252994 100644 --- a/database/migrations/2017_12_10_020753_create_torrents_table.php +++ b/database/migrations/2017_12_10_020753_create_torrents_table.php @@ -70,5 +70,4 @@ public function down() { Schema::drop('torrents'); } - } diff --git a/database/migrations/2017_12_10_020753_create_types_table.php b/database/migrations/2017_12_10_020753_create_types_table.php index 12f8603bf6..e7b8289477 100644 --- a/database/migrations/2017_12_10_020753_create_types_table.php +++ b/database/migrations/2017_12_10_020753_create_types_table.php @@ -41,5 +41,4 @@ public function down() { Schema::drop('types'); } - } diff --git a/database/migrations/2017_12_10_020753_create_uploads_table.php b/database/migrations/2017_12_10_020753_create_uploads_table.php index 241e9f9cf4..70d8d8e043 100644 --- a/database/migrations/2017_12_10_020753_create_uploads_table.php +++ b/database/migrations/2017_12_10_020753_create_uploads_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('uploads'); } - } diff --git a/database/migrations/2017_12_10_020753_create_user_activations_table.php b/database/migrations/2017_12_10_020753_create_user_activations_table.php index 27d1b89da2..e85423b8ea 100644 --- a/database/migrations/2017_12_10_020753_create_user_activations_table.php +++ b/database/migrations/2017_12_10_020753_create_user_activations_table.php @@ -41,5 +41,4 @@ public function down() { Schema::drop('user_activations'); } - } diff --git a/database/migrations/2017_12_10_020753_create_user_notes_table.php b/database/migrations/2017_12_10_020753_create_user_notes_table.php index 4595c8649e..6f6a8b309c 100644 --- a/database/migrations/2017_12_10_020753_create_user_notes_table.php +++ b/database/migrations/2017_12_10_020753_create_user_notes_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('user_notes'); } - } diff --git a/database/migrations/2017_12_10_020753_create_users_table.php b/database/migrations/2017_12_10_020753_create_users_table.php index d7424cab05..5d5ebce55f 100644 --- a/database/migrations/2017_12_10_020753_create_users_table.php +++ b/database/migrations/2017_12_10_020753_create_users_table.php @@ -72,5 +72,4 @@ public function down() { Schema::drop('users'); } - } diff --git a/database/migrations/2017_12_10_020753_create_voters_table.php b/database/migrations/2017_12_10_020753_create_voters_table.php index 8835a2c257..34eaeb08fc 100644 --- a/database/migrations/2017_12_10_020753_create_voters_table.php +++ b/database/migrations/2017_12_10_020753_create_voters_table.php @@ -42,5 +42,4 @@ public function down() { Schema::drop('voters'); } - } diff --git a/database/migrations/2017_12_10_020753_create_warnings_table.php b/database/migrations/2017_12_10_020753_create_warnings_table.php index a584703a6f..991dbfb64b 100644 --- a/database/migrations/2017_12_10_020753_create_warnings_table.php +++ b/database/migrations/2017_12_10_020753_create_warnings_table.php @@ -45,5 +45,4 @@ public function down() { Schema::drop('warnings'); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_articles_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_articles_table.php index b9c7adb5b8..eb85b6bc95 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_articles_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_articles_table.php @@ -40,5 +40,4 @@ public function down() $table->dropForeign('fk_articles_users1'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_ban_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_ban_table.php index 44cdb77bc8..6c0e612ecd 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_ban_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_ban_table.php @@ -42,5 +42,4 @@ public function down() $table->dropForeign('foreign_staff_ban_user_id'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_clients_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_clients_table.php index 6357a1e96e..278d73975f 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_clients_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_clients_table.php @@ -40,5 +40,4 @@ public function down() $table->dropForeign('clients_user_id_foreign'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_comments_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_comments_table.php index 55fa7808aa..d3841b19d6 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_comments_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_comments_table.php @@ -42,5 +42,4 @@ public function down() $table->dropForeign('fk_comments_users_1'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_history_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_history_table.php index e112129ac6..16e003a5a2 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_history_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_history_table.php @@ -42,5 +42,4 @@ public function down() $table->dropForeign('history_user_id_foreign'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_peers_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_peers_table.php index e2d35cca0e..db32e4c8c0 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_peers_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_peers_table.php @@ -42,5 +42,4 @@ public function down() $table->dropForeign('fk_peers_users1'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_reports_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_reports_table.php index 11cf2d3b3e..81cd733ce8 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_reports_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_reports_table.php @@ -42,5 +42,4 @@ public function down() $table->dropForeign('foreign_staff_user_id'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_rss_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_rss_table.php index 48e308308f..6e1970c0d8 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_rss_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_rss_table.php @@ -40,5 +40,4 @@ public function down() $table->dropForeign('rss_user_id'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_torrents_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_torrents_table.php index 77ce1faa8c..ccbcb9b3fd 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_torrents_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_torrents_table.php @@ -40,5 +40,4 @@ public function down() $table->dropForeign('category_id'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_voters_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_voters_table.php index ec1c001567..48e95ba2be 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_voters_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_voters_table.php @@ -40,5 +40,4 @@ public function down() $table->dropForeign('voters_poll_id_foreign'); }); } - } diff --git a/database/migrations/2017_12_10_020754_add_foreign_keys_to_warnings_table.php b/database/migrations/2017_12_10_020754_add_foreign_keys_to_warnings_table.php index 5ccc95e72e..1111c0f127 100644 --- a/database/migrations/2017_12_10_020754_add_foreign_keys_to_warnings_table.php +++ b/database/migrations/2017_12_10_020754_add_foreign_keys_to_warnings_table.php @@ -44,5 +44,4 @@ public function down() $table->dropForeign('warnings_warned_by_foreign'); }); } - } diff --git a/database/migrations/2018_1_10_020753_create_freeleech_tokens_table.php b/database/migrations/2018_1_10_020753_create_freeleech_tokens_table.php index 162111d618..268e4881e1 100644 --- a/database/migrations/2018_1_10_020753_create_freeleech_tokens_table.php +++ b/database/migrations/2018_1_10_020753_create_freeleech_tokens_table.php @@ -41,5 +41,4 @@ public function down() { Schema::drop('freeleech_tokens'); } - } diff --git a/database/seeds/AchievementDetailsTableSeeder.php b/database/seeds/AchievementDetailsTableSeeder.php index ec2b5f6e24..881060b3fc 100644 --- a/database/seeds/AchievementDetailsTableSeeder.php +++ b/database/seeds/AchievementDetailsTableSeeder.php @@ -468,7 +468,5 @@ public function run() 'updated_at' => '2017-08-28 23:55:56', ), )); - - } } diff --git a/database/seeds/BonExchangeTableSeeder.php b/database/seeds/BonExchangeTableSeeder.php index b0a65d8e87..2e48c7ca79 100644 --- a/database/seeds/BonExchangeTableSeeder.php +++ b/database/seeds/BonExchangeTableSeeder.php @@ -94,7 +94,5 @@ public function run() 'invite' => 0, ), )); - - } } diff --git a/database/seeds/CategoriesTableSeeder.php b/database/seeds/CategoriesTableSeeder.php index f00d18d78e..b69fdae534 100644 --- a/database/seeds/CategoriesTableSeeder.php +++ b/database/seeds/CategoriesTableSeeder.php @@ -55,7 +55,5 @@ public function run() 'meta' => 0, ), )); - - } } diff --git a/database/seeds/ForumsTableSeeder.php b/database/seeds/ForumsTableSeeder.php index d6b79a3c73..e4c59f6156 100644 --- a/database/seeds/ForumsTableSeeder.php +++ b/database/seeds/ForumsTableSeeder.php @@ -21,13 +21,13 @@ public function run() array ( 'id' => 1, 'position' => 0, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Blutopia Forums', 'slug' => 'blutopia-forums', 'description' => '', @@ -39,13 +39,13 @@ public function run() array ( 'id' => 2, 'position' => 1, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Tutorials', 'slug' => 'tutorials', 'description' => 'Post Helpful Tutorials Here!', @@ -57,13 +57,13 @@ public function run() array ( 'id' => 3, 'position' => 2, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Welcome', 'slug' => 'welcome', 'description' => 'Introduce Yourself Here!', @@ -75,13 +75,13 @@ public function run() array ( 'id' => 4, 'position' => 3, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'General', 'slug' => 'general', 'description' => 'Talk About It All Here!', @@ -93,13 +93,13 @@ public function run() array ( 'id' => 5, 'position' => 4, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Suggestions', 'slug' => 'suggestions', 'description' => 'Post All Suggestions Here!', @@ -111,13 +111,13 @@ public function run() array ( 'id' => 6, 'position' => 5, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Bugs', 'slug' => 'bugs', 'description' => 'Post All Bugs Here!', @@ -129,13 +129,13 @@ public function run() array ( 'id' => 7, 'position' => 6, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Feedback', 'slug' => 'feedback', 'description' => 'Post All Feedback Here!', @@ -147,13 +147,13 @@ public function run() array ( 'id' => 8, 'position' => 7, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Announcements', 'slug' => 'announcements', 'description' => 'Site Announcements Here!', @@ -165,16 +165,16 @@ public function run() array ( 'id' => 9, 'position' => 20, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Staff Zone', 'slug' => 'staff-zone', - 'description' => NULL, + 'description' => null, 'parent_id' => 0, 'created_at' => '2017-04-13 08:26:29', 'updated_at' => '2017-04-13 08:26:29', @@ -183,13 +183,13 @@ public function run() array ( 'id' => 10, 'position' => 21, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'General', 'slug' => 'general', 'description' => 'Talk About It All Here!', @@ -201,13 +201,13 @@ public function run() array ( 'id' => 11, 'position' => 8, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Music', 'slug' => 'music', 'description' => 'Discuss Music related things here!', @@ -219,13 +219,13 @@ public function run() array ( 'id' => 12, 'position' => 9, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Apps', 'slug' => 'apps', 'description' => 'Discuss Apps/Scripts Here For Mac, Windows, Linux, etc', @@ -237,13 +237,13 @@ public function run() array ( 'id' => 13, 'position' => 10, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Invites Section', 'slug' => 'invites-section', 'description' => 'For All Your Private Tracker Invite Needs!', @@ -255,13 +255,13 @@ public function run() array ( 'id' => 14, 'position' => 11, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Official Unlimited Invites', 'slug' => 'official-unlimited-invites', 'description' => 'Where Site Staff and Official Recruiters Can Make Their Unlimited Invite Topics !', @@ -273,13 +273,13 @@ public function run() array ( 'id' => 15, 'position' => 12, - 'num_topic' => NULL, - 'num_post' => NULL, - 'last_topic_id' => NULL, - 'last_topic_name' => NULL, - 'last_topic_slug' => NULL, - 'last_post_user_id' => NULL, - 'last_post_user_username' => NULL, + 'num_topic' => null, + 'num_post' => null, + 'last_topic_id' => null, + 'last_topic_name' => null, + 'last_topic_slug' => null, + 'last_post_user_id' => null, + 'last_post_user_username' => null, 'name' => 'Unofficial Invites', 'slug' => 'unofficial-invites', 'description' => 'Place where members can share their invites! NO SELLING OR TRADING!', @@ -288,7 +288,5 @@ public function run() 'updated_at' => '2017-10-31 10:23:03', ), )); - - } } diff --git a/database/seeds/GroupsTableSeeder.php b/database/seeds/GroupsTableSeeder.php index 3f31b75837..93f293f38b 100644 --- a/database/seeds/GroupsTableSeeder.php +++ b/database/seeds/GroupsTableSeeder.php @@ -316,7 +316,5 @@ public function run() 'autogroup' => 1, ), )); - - } } diff --git a/database/seeds/PagesTableSeeder.php b/database/seeds/PagesTableSeeder.php index f92c5c77c2..9b08265068 100644 --- a/database/seeds/PagesTableSeeder.php +++ b/database/seeds/PagesTableSeeder.php @@ -161,7 +161,5 @@ public function run() 'updated_at' => '2017-10-03 18:31:25', ), )); - - } } diff --git a/database/seeds/PermissionsTableSeeder.php b/database/seeds/PermissionsTableSeeder.php index 68d18a99f1..1f34753df4 100644 --- a/database/seeds/PermissionsTableSeeder.php +++ b/database/seeds/PermissionsTableSeeder.php @@ -17,7 +17,7 @@ public function run() \DB::table('permissions')->delete(); \DB::table('permissions')->insert(array ( - 0 => + 0 => array ( 'id' => 103, 'forum_id' => 18, @@ -29,7 +29,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 1 => + 1 => array ( 'id' => 104, 'forum_id' => 18, @@ -41,7 +41,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 2 => + 2 => array ( 'id' => 105, 'forum_id' => 18, @@ -53,7 +53,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 3 => + 3 => array ( 'id' => 106, 'forum_id' => 18, @@ -65,7 +65,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 4 => + 4 => array ( 'id' => 107, 'forum_id' => 18, @@ -77,7 +77,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 5 => + 5 => array ( 'id' => 108, 'forum_id' => 18, @@ -89,7 +89,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 6 => + 6 => array ( 'id' => 109, 'forum_id' => 18, @@ -101,7 +101,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 7 => + 7 => array ( 'id' => 110, 'forum_id' => 18, @@ -113,7 +113,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 8 => + 8 => array ( 'id' => 111, 'forum_id' => 18, @@ -125,7 +125,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 9 => + 9 => array ( 'id' => 112, 'forum_id' => 18, @@ -137,7 +137,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 10 => + 10 => array ( 'id' => 113, 'forum_id' => 18, @@ -149,7 +149,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 11 => + 11 => array ( 'id' => 114, 'forum_id' => 18, @@ -161,7 +161,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 12 => + 12 => array ( 'id' => 115, 'forum_id' => 18, @@ -173,7 +173,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 13 => + 13 => array ( 'id' => 116, 'forum_id' => 18, @@ -185,7 +185,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 14 => + 14 => array ( 'id' => 117, 'forum_id' => 18, @@ -197,7 +197,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 15 => + 15 => array ( 'id' => 118, 'forum_id' => 18, @@ -209,7 +209,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 16 => + 16 => array ( 'id' => 119, 'forum_id' => 18, @@ -221,7 +221,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 17 => + 17 => array ( 'id' => 120, 'forum_id' => 18, @@ -233,7 +233,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 18 => + 18 => array ( 'id' => 130, 'forum_id' => 29, @@ -245,7 +245,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 19 => + 19 => array ( 'id' => 131, 'forum_id' => 29, @@ -257,7 +257,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 20 => + 20 => array ( 'id' => 132, 'forum_id' => 29, @@ -269,7 +269,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 21 => + 21 => array ( 'id' => 133, 'forum_id' => 29, @@ -281,7 +281,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 22 => + 22 => array ( 'id' => 134, 'forum_id' => 29, @@ -293,7 +293,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 23 => + 23 => array ( 'id' => 135, 'forum_id' => 29, @@ -305,7 +305,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 24 => + 24 => array ( 'id' => 136, 'forum_id' => 29, @@ -317,7 +317,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 25 => + 25 => array ( 'id' => 137, 'forum_id' => 29, @@ -329,7 +329,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 26 => + 26 => array ( 'id' => 138, 'forum_id' => 29, @@ -341,7 +341,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 27 => + 27 => array ( 'id' => 139, 'forum_id' => 29, @@ -353,7 +353,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 28 => + 28 => array ( 'id' => 140, 'forum_id' => 29, @@ -365,7 +365,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 29 => + 29 => array ( 'id' => 141, 'forum_id' => 29, @@ -377,7 +377,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 30 => + 30 => array ( 'id' => 142, 'forum_id' => 29, @@ -389,7 +389,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 31 => + 31 => array ( 'id' => 143, 'forum_id' => 29, @@ -401,7 +401,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 32 => + 32 => array ( 'id' => 144, 'forum_id' => 29, @@ -413,7 +413,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 33 => + 33 => array ( 'id' => 145, 'forum_id' => 29, @@ -425,7 +425,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 34 => + 34 => array ( 'id' => 146, 'forum_id' => 29, @@ -437,7 +437,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 35 => + 35 => array ( 'id' => 147, 'forum_id' => 29, @@ -449,7 +449,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 36 => + 36 => array ( 'id' => 150, 'forum_id' => 31, @@ -461,7 +461,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 37 => + 37 => array ( 'id' => 151, 'forum_id' => 31, @@ -473,7 +473,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 38 => + 38 => array ( 'id' => 152, 'forum_id' => 31, @@ -485,7 +485,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 39 => + 39 => array ( 'id' => 153, 'forum_id' => 31, @@ -497,7 +497,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 40 => + 40 => array ( 'id' => 154, 'forum_id' => 31, @@ -509,7 +509,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 41 => + 41 => array ( 'id' => 155, 'forum_id' => 31, @@ -521,7 +521,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 42 => + 42 => array ( 'id' => 156, 'forum_id' => 31, @@ -533,7 +533,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 43 => + 43 => array ( 'id' => 157, 'forum_id' => 31, @@ -545,7 +545,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 44 => + 44 => array ( 'id' => 158, 'forum_id' => 31, @@ -557,7 +557,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 45 => + 45 => array ( 'id' => 159, 'forum_id' => 31, @@ -569,7 +569,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 46 => + 46 => array ( 'id' => 160, 'forum_id' => 31, @@ -581,7 +581,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 47 => + 47 => array ( 'id' => 161, 'forum_id' => 31, @@ -593,7 +593,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 48 => + 48 => array ( 'id' => 162, 'forum_id' => 31, @@ -605,7 +605,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 49 => + 49 => array ( 'id' => 163, 'forum_id' => 31, @@ -617,7 +617,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 50 => + 50 => array ( 'id' => 164, 'forum_id' => 31, @@ -629,7 +629,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 51 => + 51 => array ( 'id' => 165, 'forum_id' => 31, @@ -641,7 +641,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 52 => + 52 => array ( 'id' => 166, 'forum_id' => 31, @@ -653,7 +653,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 53 => + 53 => array ( 'id' => 167, 'forum_id' => 31, @@ -665,7 +665,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 54 => + 54 => array ( 'id' => 170, 'forum_id' => 32, @@ -677,7 +677,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 55 => + 55 => array ( 'id' => 171, 'forum_id' => 32, @@ -689,7 +689,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 56 => + 56 => array ( 'id' => 172, 'forum_id' => 32, @@ -701,7 +701,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 57 => + 57 => array ( 'id' => 173, 'forum_id' => 32, @@ -713,7 +713,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 58 => + 58 => array ( 'id' => 174, 'forum_id' => 32, @@ -725,7 +725,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 59 => + 59 => array ( 'id' => 175, 'forum_id' => 32, @@ -737,7 +737,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 60 => + 60 => array ( 'id' => 176, 'forum_id' => 32, @@ -749,7 +749,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 61 => + 61 => array ( 'id' => 177, 'forum_id' => 32, @@ -761,7 +761,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 62 => + 62 => array ( 'id' => 178, 'forum_id' => 32, @@ -773,7 +773,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 63 => + 63 => array ( 'id' => 179, 'forum_id' => 32, @@ -785,7 +785,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 64 => + 64 => array ( 'id' => 180, 'forum_id' => 32, @@ -797,7 +797,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 65 => + 65 => array ( 'id' => 181, 'forum_id' => 32, @@ -809,7 +809,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 66 => + 66 => array ( 'id' => 182, 'forum_id' => 32, @@ -821,7 +821,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 67 => + 67 => array ( 'id' => 183, 'forum_id' => 32, @@ -833,7 +833,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 68 => + 68 => array ( 'id' => 184, 'forum_id' => 32, @@ -845,7 +845,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 69 => + 69 => array ( 'id' => 185, 'forum_id' => 32, @@ -857,7 +857,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 70 => + 70 => array ( 'id' => 186, 'forum_id' => 32, @@ -869,7 +869,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 71 => + 71 => array ( 'id' => 187, 'forum_id' => 32, @@ -881,7 +881,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 72 => + 72 => array ( 'id' => 190, 'forum_id' => 33, @@ -893,7 +893,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 73 => + 73 => array ( 'id' => 191, 'forum_id' => 33, @@ -905,7 +905,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 74 => + 74 => array ( 'id' => 192, 'forum_id' => 33, @@ -917,7 +917,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 75 => + 75 => array ( 'id' => 193, 'forum_id' => 33, @@ -929,7 +929,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 76 => + 76 => array ( 'id' => 194, 'forum_id' => 33, @@ -941,7 +941,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 77 => + 77 => array ( 'id' => 195, 'forum_id' => 33, @@ -953,7 +953,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 78 => + 78 => array ( 'id' => 196, 'forum_id' => 33, @@ -965,7 +965,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 79 => + 79 => array ( 'id' => 197, 'forum_id' => 33, @@ -977,7 +977,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 80 => + 80 => array ( 'id' => 198, 'forum_id' => 33, @@ -989,7 +989,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 81 => + 81 => array ( 'id' => 199, 'forum_id' => 33, @@ -1001,7 +1001,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 82 => + 82 => array ( 'id' => 200, 'forum_id' => 33, @@ -1013,7 +1013,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 83 => + 83 => array ( 'id' => 201, 'forum_id' => 33, @@ -1025,7 +1025,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 84 => + 84 => array ( 'id' => 202, 'forum_id' => 33, @@ -1037,7 +1037,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 85 => + 85 => array ( 'id' => 203, 'forum_id' => 33, @@ -1049,7 +1049,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 86 => + 86 => array ( 'id' => 204, 'forum_id' => 33, @@ -1061,7 +1061,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 87 => + 87 => array ( 'id' => 205, 'forum_id' => 33, @@ -1073,7 +1073,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 88 => + 88 => array ( 'id' => 206, 'forum_id' => 33, @@ -1085,7 +1085,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 89 => + 89 => array ( 'id' => 207, 'forum_id' => 33, @@ -1097,7 +1097,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 90 => + 90 => array ( 'id' => 210, 'forum_id' => 35, @@ -1109,7 +1109,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 91 => + 91 => array ( 'id' => 211, 'forum_id' => 35, @@ -1121,7 +1121,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 92 => + 92 => array ( 'id' => 212, 'forum_id' => 35, @@ -1133,7 +1133,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 93 => + 93 => array ( 'id' => 213, 'forum_id' => 35, @@ -1145,7 +1145,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 94 => + 94 => array ( 'id' => 214, 'forum_id' => 35, @@ -1157,7 +1157,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 95 => + 95 => array ( 'id' => 215, 'forum_id' => 35, @@ -1169,7 +1169,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 96 => + 96 => array ( 'id' => 216, 'forum_id' => 35, @@ -1181,7 +1181,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 97 => + 97 => array ( 'id' => 217, 'forum_id' => 35, @@ -1193,7 +1193,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 98 => + 98 => array ( 'id' => 218, 'forum_id' => 35, @@ -1205,7 +1205,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 99 => + 99 => array ( 'id' => 219, 'forum_id' => 35, @@ -1217,7 +1217,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 100 => + 100 => array ( 'id' => 220, 'forum_id' => 35, @@ -1229,7 +1229,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 101 => + 101 => array ( 'id' => 221, 'forum_id' => 35, @@ -1241,7 +1241,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 102 => + 102 => array ( 'id' => 222, 'forum_id' => 35, @@ -1253,7 +1253,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 103 => + 103 => array ( 'id' => 223, 'forum_id' => 35, @@ -1265,7 +1265,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 104 => + 104 => array ( 'id' => 224, 'forum_id' => 35, @@ -1277,7 +1277,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 105 => + 105 => array ( 'id' => 225, 'forum_id' => 35, @@ -1289,7 +1289,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 106 => + 106 => array ( 'id' => 226, 'forum_id' => 35, @@ -1301,7 +1301,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 107 => + 107 => array ( 'id' => 227, 'forum_id' => 35, @@ -1313,7 +1313,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 108 => + 108 => array ( 'id' => 230, 'forum_id' => 36, @@ -1325,7 +1325,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 109 => + 109 => array ( 'id' => 231, 'forum_id' => 36, @@ -1337,7 +1337,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 110 => + 110 => array ( 'id' => 232, 'forum_id' => 36, @@ -1349,7 +1349,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 111 => + 111 => array ( 'id' => 233, 'forum_id' => 36, @@ -1361,7 +1361,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 112 => + 112 => array ( 'id' => 234, 'forum_id' => 36, @@ -1373,7 +1373,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 113 => + 113 => array ( 'id' => 235, 'forum_id' => 36, @@ -1385,7 +1385,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 114 => + 114 => array ( 'id' => 236, 'forum_id' => 36, @@ -1397,7 +1397,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 115 => + 115 => array ( 'id' => 237, 'forum_id' => 36, @@ -1409,7 +1409,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 116 => + 116 => array ( 'id' => 238, 'forum_id' => 36, @@ -1421,7 +1421,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 117 => + 117 => array ( 'id' => 239, 'forum_id' => 36, @@ -1433,7 +1433,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 118 => + 118 => array ( 'id' => 240, 'forum_id' => 36, @@ -1445,7 +1445,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 119 => + 119 => array ( 'id' => 241, 'forum_id' => 36, @@ -1457,7 +1457,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 120 => + 120 => array ( 'id' => 242, 'forum_id' => 36, @@ -1469,7 +1469,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 121 => + 121 => array ( 'id' => 243, 'forum_id' => 36, @@ -1481,7 +1481,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 122 => + 122 => array ( 'id' => 244, 'forum_id' => 36, @@ -1493,7 +1493,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 123 => + 123 => array ( 'id' => 245, 'forum_id' => 36, @@ -1505,7 +1505,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 124 => + 124 => array ( 'id' => 246, 'forum_id' => 36, @@ -1517,7 +1517,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 125 => + 125 => array ( 'id' => 247, 'forum_id' => 36, @@ -1529,7 +1529,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 126 => + 126 => array ( 'id' => 250, 'forum_id' => 37, @@ -1541,7 +1541,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 127 => + 127 => array ( 'id' => 251, 'forum_id' => 37, @@ -1553,7 +1553,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 128 => + 128 => array ( 'id' => 253, 'forum_id' => 37, @@ -1565,7 +1565,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 129 => + 129 => array ( 'id' => 254, 'forum_id' => 37, @@ -1577,7 +1577,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 130 => + 130 => array ( 'id' => 255, 'forum_id' => 37, @@ -1589,7 +1589,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 131 => + 131 => array ( 'id' => 256, 'forum_id' => 37, @@ -1601,7 +1601,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 132 => + 132 => array ( 'id' => 257, 'forum_id' => 37, @@ -1613,7 +1613,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 133 => + 133 => array ( 'id' => 258, 'forum_id' => 37, @@ -1625,7 +1625,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 134 => + 134 => array ( 'id' => 259, 'forum_id' => 37, @@ -1637,7 +1637,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 135 => + 135 => array ( 'id' => 260, 'forum_id' => 37, @@ -1649,7 +1649,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 136 => + 136 => array ( 'id' => 261, 'forum_id' => 37, @@ -1661,7 +1661,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 137 => + 137 => array ( 'id' => 262, 'forum_id' => 37, @@ -1673,7 +1673,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 138 => + 138 => array ( 'id' => 263, 'forum_id' => 37, @@ -1685,7 +1685,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 139 => + 139 => array ( 'id' => 264, 'forum_id' => 37, @@ -1697,7 +1697,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 140 => + 140 => array ( 'id' => 265, 'forum_id' => 37, @@ -1709,7 +1709,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 141 => + 141 => array ( 'id' => 266, 'forum_id' => 37, @@ -1721,7 +1721,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 142 => + 142 => array ( 'id' => 267, 'forum_id' => 37, @@ -1733,7 +1733,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 143 => + 143 => array ( 'id' => 268, 'forum_id' => 37, @@ -1745,7 +1745,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 144 => + 144 => array ( 'id' => 269, 'forum_id' => 38, @@ -1757,7 +1757,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 145 => + 145 => array ( 'id' => 270, 'forum_id' => 38, @@ -1769,7 +1769,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 146 => + 146 => array ( 'id' => 271, 'forum_id' => 38, @@ -1781,7 +1781,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 147 => + 147 => array ( 'id' => 272, 'forum_id' => 38, @@ -1793,7 +1793,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 148 => + 148 => array ( 'id' => 273, 'forum_id' => 38, @@ -1805,7 +1805,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 149 => + 149 => array ( 'id' => 274, 'forum_id' => 38, @@ -1817,7 +1817,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 150 => + 150 => array ( 'id' => 275, 'forum_id' => 38, @@ -1829,7 +1829,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 151 => + 151 => array ( 'id' => 276, 'forum_id' => 38, @@ -1841,7 +1841,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 152 => + 152 => array ( 'id' => 277, 'forum_id' => 38, @@ -1853,7 +1853,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 153 => + 153 => array ( 'id' => 278, 'forum_id' => 38, @@ -1865,7 +1865,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 154 => + 154 => array ( 'id' => 279, 'forum_id' => 38, @@ -1877,7 +1877,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 155 => + 155 => array ( 'id' => 280, 'forum_id' => 38, @@ -1889,7 +1889,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 156 => + 156 => array ( 'id' => 281, 'forum_id' => 38, @@ -1901,7 +1901,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 157 => + 157 => array ( 'id' => 282, 'forum_id' => 38, @@ -1913,7 +1913,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 158 => + 158 => array ( 'id' => 283, 'forum_id' => 38, @@ -1925,7 +1925,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 159 => + 159 => array ( 'id' => 284, 'forum_id' => 38, @@ -1937,7 +1937,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 160 => + 160 => array ( 'id' => 285, 'forum_id' => 38, @@ -1949,7 +1949,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 161 => + 161 => array ( 'id' => 286, 'forum_id' => 38, @@ -1961,7 +1961,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 162 => + 162 => array ( 'id' => 287, 'forum_id' => 39, @@ -1973,7 +1973,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 163 => + 163 => array ( 'id' => 290, 'forum_id' => 39, @@ -1985,7 +1985,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 164 => + 164 => array ( 'id' => 291, 'forum_id' => 39, @@ -1997,7 +1997,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 165 => + 165 => array ( 'id' => 292, 'forum_id' => 39, @@ -2009,7 +2009,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 166 => + 166 => array ( 'id' => 293, 'forum_id' => 39, @@ -2021,7 +2021,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 167 => + 167 => array ( 'id' => 294, 'forum_id' => 39, @@ -2033,7 +2033,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 168 => + 168 => array ( 'id' => 295, 'forum_id' => 39, @@ -2045,7 +2045,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 169 => + 169 => array ( 'id' => 296, 'forum_id' => 39, @@ -2057,7 +2057,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 170 => + 170 => array ( 'id' => 297, 'forum_id' => 39, @@ -2069,7 +2069,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 171 => + 171 => array ( 'id' => 298, 'forum_id' => 39, @@ -2081,7 +2081,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 172 => + 172 => array ( 'id' => 299, 'forum_id' => 39, @@ -2093,7 +2093,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 173 => + 173 => array ( 'id' => 300, 'forum_id' => 39, @@ -2105,7 +2105,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 174 => + 174 => array ( 'id' => 301, 'forum_id' => 39, @@ -2117,7 +2117,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 175 => + 175 => array ( 'id' => 302, 'forum_id' => 39, @@ -2129,7 +2129,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 176 => + 176 => array ( 'id' => 303, 'forum_id' => 39, @@ -2141,7 +2141,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 177 => + 177 => array ( 'id' => 304, 'forum_id' => 39, @@ -2153,7 +2153,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 178 => + 178 => array ( 'id' => 305, 'forum_id' => 39, @@ -2165,7 +2165,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 179 => + 179 => array ( 'id' => 306, 'forum_id' => 39, @@ -2177,7 +2177,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 180 => + 180 => array ( 'id' => 309, 'forum_id' => 40, @@ -2189,7 +2189,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 181 => + 181 => array ( 'id' => 310, 'forum_id' => 40, @@ -2201,7 +2201,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 182 => + 182 => array ( 'id' => 311, 'forum_id' => 40, @@ -2213,7 +2213,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 183 => + 183 => array ( 'id' => 312, 'forum_id' => 40, @@ -2225,7 +2225,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 184 => + 184 => array ( 'id' => 313, 'forum_id' => 40, @@ -2237,7 +2237,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 185 => + 185 => array ( 'id' => 314, 'forum_id' => 40, @@ -2249,7 +2249,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 186 => + 186 => array ( 'id' => 315, 'forum_id' => 40, @@ -2261,7 +2261,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 187 => + 187 => array ( 'id' => 316, 'forum_id' => 40, @@ -2273,7 +2273,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 188 => + 188 => array ( 'id' => 317, 'forum_id' => 40, @@ -2285,7 +2285,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 189 => + 189 => array ( 'id' => 318, 'forum_id' => 40, @@ -2297,7 +2297,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 190 => + 190 => array ( 'id' => 319, 'forum_id' => 40, @@ -2309,7 +2309,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 191 => + 191 => array ( 'id' => 320, 'forum_id' => 40, @@ -2321,7 +2321,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 192 => + 192 => array ( 'id' => 322, 'forum_id' => 40, @@ -2333,7 +2333,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 193 => + 193 => array ( 'id' => 323, 'forum_id' => 40, @@ -2345,7 +2345,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 194 => + 194 => array ( 'id' => 324, 'forum_id' => 40, @@ -2357,7 +2357,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 195 => + 195 => array ( 'id' => 325, 'forum_id' => 40, @@ -2369,7 +2369,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 196 => + 196 => array ( 'id' => 326, 'forum_id' => 40, @@ -2381,7 +2381,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 197 => + 197 => array ( 'id' => 327, 'forum_id' => 40, @@ -2393,7 +2393,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 198 => + 198 => array ( 'id' => 330, 'forum_id' => 42, @@ -2405,7 +2405,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 199 => + 199 => array ( 'id' => 331, 'forum_id' => 42, @@ -2417,7 +2417,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 200 => + 200 => array ( 'id' => 332, 'forum_id' => 42, @@ -2429,7 +2429,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 201 => + 201 => array ( 'id' => 333, 'forum_id' => 42, @@ -2441,7 +2441,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 202 => + 202 => array ( 'id' => 334, 'forum_id' => 42, @@ -2453,7 +2453,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 203 => + 203 => array ( 'id' => 335, 'forum_id' => 42, @@ -2465,7 +2465,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 204 => + 204 => array ( 'id' => 336, 'forum_id' => 42, @@ -2477,7 +2477,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 205 => + 205 => array ( 'id' => 337, 'forum_id' => 42, @@ -2489,7 +2489,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 206 => + 206 => array ( 'id' => 338, 'forum_id' => 42, @@ -2501,7 +2501,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 207 => + 207 => array ( 'id' => 339, 'forum_id' => 42, @@ -2513,7 +2513,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 208 => + 208 => array ( 'id' => 358, 'forum_id' => 44, @@ -2525,7 +2525,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 209 => + 209 => array ( 'id' => 359, 'forum_id' => 44, @@ -2537,7 +2537,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 210 => + 210 => array ( 'id' => 360, 'forum_id' => 44, @@ -2549,7 +2549,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 211 => + 211 => array ( 'id' => 361, 'forum_id' => 44, @@ -2561,7 +2561,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 212 => + 212 => array ( 'id' => 362, 'forum_id' => 44, @@ -2573,7 +2573,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 213 => + 213 => array ( 'id' => 363, 'forum_id' => 44, @@ -2585,7 +2585,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 214 => + 214 => array ( 'id' => 364, 'forum_id' => 44, @@ -2597,7 +2597,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 215 => + 215 => array ( 'id' => 365, 'forum_id' => 44, @@ -2609,7 +2609,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 216 => + 216 => array ( 'id' => 366, 'forum_id' => 44, @@ -2621,7 +2621,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 217 => + 217 => array ( 'id' => 367, 'forum_id' => 44, @@ -2633,7 +2633,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 218 => + 218 => array ( 'id' => 368, 'forum_id' => 44, @@ -2645,7 +2645,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 219 => + 219 => array ( 'id' => 369, 'forum_id' => 44, @@ -2657,7 +2657,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 220 => + 220 => array ( 'id' => 370, 'forum_id' => 44, @@ -2669,7 +2669,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 221 => + 221 => array ( 'id' => 371, 'forum_id' => 44, @@ -2681,7 +2681,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 222 => + 222 => array ( 'id' => 372, 'forum_id' => 44, @@ -2693,7 +2693,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 223 => + 223 => array ( 'id' => 373, 'forum_id' => 44, @@ -2705,7 +2705,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 224 => + 224 => array ( 'id' => 374, 'forum_id' => 44, @@ -2717,7 +2717,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 225 => + 225 => array ( 'id' => 375, 'forum_id' => 44, @@ -2729,7 +2729,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 226 => + 226 => array ( 'id' => 376, 'forum_id' => 45, @@ -2741,7 +2741,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 227 => + 227 => array ( 'id' => 377, 'forum_id' => 45, @@ -2753,7 +2753,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 228 => + 228 => array ( 'id' => 378, 'forum_id' => 45, @@ -2765,7 +2765,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 229 => + 229 => array ( 'id' => 379, 'forum_id' => 45, @@ -2777,7 +2777,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 230 => + 230 => array ( 'id' => 380, 'forum_id' => 45, @@ -2789,7 +2789,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 231 => + 231 => array ( 'id' => 381, 'forum_id' => 45, @@ -2801,7 +2801,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 232 => + 232 => array ( 'id' => 382, 'forum_id' => 45, @@ -2813,7 +2813,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 233 => + 233 => array ( 'id' => 383, 'forum_id' => 45, @@ -2825,7 +2825,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 234 => + 234 => array ( 'id' => 384, 'forum_id' => 45, @@ -2837,7 +2837,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 235 => + 235 => array ( 'id' => 385, 'forum_id' => 45, @@ -2849,7 +2849,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 236 => + 236 => array ( 'id' => 386, 'forum_id' => 45, @@ -2861,7 +2861,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 237 => + 237 => array ( 'id' => 387, 'forum_id' => 45, @@ -2873,7 +2873,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 238 => + 238 => array ( 'id' => 388, 'forum_id' => 45, @@ -2885,7 +2885,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 239 => + 239 => array ( 'id' => 389, 'forum_id' => 45, @@ -2897,7 +2897,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 240 => + 240 => array ( 'id' => 390, 'forum_id' => 45, @@ -2909,7 +2909,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 241 => + 241 => array ( 'id' => 391, 'forum_id' => 45, @@ -2921,7 +2921,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 242 => + 242 => array ( 'id' => 392, 'forum_id' => 45, @@ -2933,7 +2933,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 243 => + 243 => array ( 'id' => 393, 'forum_id' => 45, @@ -2945,7 +2945,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 244 => + 244 => array ( 'id' => 394, 'forum_id' => 46, @@ -2957,7 +2957,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 245 => + 245 => array ( 'id' => 395, 'forum_id' => 46, @@ -2969,7 +2969,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 246 => + 246 => array ( 'id' => 396, 'forum_id' => 46, @@ -2981,7 +2981,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 247 => + 247 => array ( 'id' => 397, 'forum_id' => 46, @@ -2993,7 +2993,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 248 => + 248 => array ( 'id' => 398, 'forum_id' => 46, @@ -3005,7 +3005,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 249 => + 249 => array ( 'id' => 399, 'forum_id' => 46, @@ -3017,7 +3017,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 250 => + 250 => array ( 'id' => 400, 'forum_id' => 46, @@ -3029,7 +3029,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 251 => + 251 => array ( 'id' => 401, 'forum_id' => 46, @@ -3041,7 +3041,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 252 => + 252 => array ( 'id' => 402, 'forum_id' => 46, @@ -3053,7 +3053,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 253 => + 253 => array ( 'id' => 403, 'forum_id' => 46, @@ -3065,7 +3065,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 254 => + 254 => array ( 'id' => 404, 'forum_id' => 46, @@ -3077,7 +3077,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 255 => + 255 => array ( 'id' => 405, 'forum_id' => 46, @@ -3089,7 +3089,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 256 => + 256 => array ( 'id' => 406, 'forum_id' => 46, @@ -3101,7 +3101,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 257 => + 257 => array ( 'id' => 407, 'forum_id' => 46, @@ -3113,7 +3113,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 258 => + 258 => array ( 'id' => 408, 'forum_id' => 46, @@ -3125,7 +3125,7 @@ public function run() 'upload' => 0, 'download' => 0, ), - 259 => + 259 => array ( 'id' => 409, 'forum_id' => 46, @@ -3137,7 +3137,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 260 => + 260 => array ( 'id' => 410, 'forum_id' => 46, @@ -3149,7 +3149,7 @@ public function run() 'upload' => 1, 'download' => 1, ), - 261 => + 261 => array ( 'id' => 411, 'forum_id' => 46, @@ -3162,7 +3162,5 @@ public function run() 'download' => 1, ), )); - - } -} \ No newline at end of file +} diff --git a/database/seeds/TypesTableSeeder.php b/database/seeds/TypesTableSeeder.php index ae929e03ec..490a77a335 100644 --- a/database/seeds/TypesTableSeeder.php +++ b/database/seeds/TypesTableSeeder.php @@ -119,7 +119,5 @@ public function run() 'position' => 12, ), )); - - } } diff --git a/routes/web.php b/routes/web.php index 78cd0078b3..d1a1332fea 100755 --- a/routes/web.php +++ b/routes/web.php @@ -28,309 +28,308 @@ | Website (Not Authorized) |------------------------------------------ */ -Route::group(['before' => 'auth', 'middleware' => 'guest'], function () { - // Authentication Routes - Route::get('login', 'Auth\LoginController@showLoginForm')->name('login'); - Route::post('login', 'Auth\LoginController@login')->name(''); - - // Password Reset Routes - Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email'); - Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request'); - Route::post('password/reset', 'Auth\ResetPasswordController@reset')->name(''); - Route::get('/password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->name('password.reset'); - - // Registration Routes - Route::any('/register/{code?}', 'Auth\RegisterController@register')->name('register'); - - // Activation Routes - Route::get('/activate/{token}', 'Auth\ActivationController@activate')->name('activate'); - - // Forgot Username Routes - Route::get('username/reminder', 'Auth\ForgotUsernameController@showForgotUsernameForm')->name('username.request'); - Route::post('username/reminder', 'Auth\ForgotUsernameController@sendUserameReminder')->name('username.email'); -}); - -Route::group(['before' => 'auth'], function () { - // Announce - Route::any('/announce/{passkey}', 'AnnounceController@announce')->name('announce'); - - // RSS - Route::get('/rss/{passkey}', function () { - return abort(307); - })->name('rss'); - //Route::get('/torrents/rss/{passkey}', 'RssController@getData')->name('rss'); - - Route::get('/rss/{passkey}/download/{id}', function () { - return abort(307); - })->name('rssDownload'); - //Route::get('/rss/{passkey}/download/{id}','RssController@download')->name('rssDownload'); -}); + Route::group(['before' => 'auth', 'middleware' => 'guest'], function () { + // Authentication Routes + Route::get('login', 'Auth\LoginController@showLoginForm')->name('login'); + Route::post('login', 'Auth\LoginController@login')->name(''); + + // Password Reset Routes + Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email'); + Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request'); + Route::post('password/reset', 'Auth\ResetPasswordController@reset')->name(''); + Route::get('/password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->name('password.reset'); + + // Registration Routes + Route::any('/register/{code?}', 'Auth\RegisterController@register')->name('register'); + + // Activation Routes + Route::get('/activate/{token}', 'Auth\ActivationController@activate')->name('activate'); + + // Forgot Username Routes + Route::get('username/reminder', 'Auth\ForgotUsernameController@showForgotUsernameForm')->name('username.request'); + Route::post('username/reminder', 'Auth\ForgotUsernameController@sendUserameReminder')->name('username.email'); + }); + + Route::group(['before' => 'auth'], function () { + // Announce + Route::any('/announce/{passkey}', 'AnnounceController@announce')->name('announce'); + + // RSS + Route::get('/rss/{passkey}', function () { + return abort(307); + })->name('rss'); + //Route::get('/torrents/rss/{passkey}', 'RssController@getData')->name('rss'); + + Route::get('/rss/{passkey}/download/{id}', function () { + return abort(307); + })->name('rssDownload'); + //Route::get('/rss/{passkey}/download/{id}','RssController@download')->name('rssDownload'); + }); /* |------------------------------------------ | Website (When Authorized) |------------------------------------------ */ -Route::group(['middleware' => 'auth'], function () { - - // General - Route::get('/', 'HomeController@home')->name('home'); - Route::any('/contact', 'HomeController@contact')->name('contact'); - Route::post('logout', 'Auth\LoginController@logout')->name('logout'); - - // Article - Route::get('/articles', 'ArticleController@articles')->name('articles'); - Route::get('/articles/{slug}.{id}', 'ArticleController@post')->name('article'); - - // Bonus System - Route::get('/bonus', 'BonusController@bonus')->name('bonus'); - Route::any('/bonusexchange/{id}', 'BonusController@exchange')->name('bonusexchange'); - Route::post('/bongift', 'BonusController@gift')->name('bongift'); - - // Bookmarks - Route::get('/bookmarks', 'BookmarkController@bookmarks')->name('bookmarks'); - Route::any('/torrents/bookmark/{id}', 'TorrentController@bookmark')->name('bookmark'); - Route::any('/torrents/unbookmark/{id}', 'BookmarkController@unBookmark')->name('unbookmark'); - - // User/Torrent Report - Route::any('/report', 'ReportController@postReport')->name('postReport'); - - // Bug Report - Route::get('/bug', 'BugController@bug')->name('bug'); - Route::post('/bug', 'BugController@bug')->name('bug'); - - // Category - Route::get('/categories', 'CategoryController@categories')->name('categories'); - Route::get('/categories/{slug}.{id}', 'CategoryController@category')->name('category'); - - // Catalogs - Route::get('/catalogs', 'CatalogController@catalogs')->name('catalogs'); - Route::get('/catalog/{slug}.{id}', 'CatalogController@catalog')->name('catalog'); - Route::get('/catalog/torrents/{imdb}', 'CatalogController@torrents')->name('catalog_torrents'); - - // Staff List - Route::any('/staff', 'PageController@staff')->name('staff'); - - // Black List - Route::any('/blacklist', 'PageController@blacklist')->name('blacklist'); - - // About Us - Route::any('/aboutus', 'PageController@about')->name('about'); - - // Comments - Route::any('/comment/article/{slug}.{id}', 'CommentController@article')->name('comment_article'); - Route::any('/comment/torrent/{slug}.{id}', 'CommentController@torrent')->name('comment_torrent'); - Route::any('/comment/thanks/{id}', 'CommentController@quickthanks')->name('comment_thanks'); - Route::any('/comment/request/{id}', 'CommentController@request')->name('comment_request'); - Route::any('/comment/edit/{comment_id}', 'CommentController@editComment')->name('comment_edit'); - Route::any('/comment/delete/{comment_id}', 'CommentController@deleteComment')->name('comment_delete'); - - //Extra-Stats - Route::get('/stats', 'StatsController@index')->name('stats'); - //USER - Route::get('/stats/user/uploaded', 'StatsController@uploaded')->name('uploaded'); - Route::get('/stats/user/downloaded', 'StatsController@downloaded')->name('downloaded'); - Route::get('/stats/user/seeders', 'StatsController@seeders')->name('seeders'); - Route::get('/stats/user/leechers', 'StatsController@leechers')->name('leechers'); - Route::get('/stats/user/uploaders', 'StatsController@uploaders')->name('uploaders'); - Route::get('/stats/user/bankers', 'StatsController@bankers')->name('bankers'); - Route::get('/stats/user/seedtime', 'StatsController@seedtime')->name('seedtime'); - Route::get('/stats/user/seedsize', 'StatsController@seedsize')->name('seedsize'); - //TORRENT - Route::get('/stats/torrent/seeded', 'StatsController@seeded')->name('seeded'); - Route::get('/stats/torrent/leeched', 'StatsController@leeched')->name('leeched'); - Route::get('/stats/torrent/completed', 'StatsController@completed')->name('completed'); - Route::get('/stats/torrent/dying', 'StatsController@dying')->name('dying'); - Route::get('/stats/torrent/dead', 'StatsController@dead')->name('dead'); - //REQUEST - Route::get('/stats/request/bountied', 'StatsController@bountied')->name('bountied'); - //GROUPS - Route::get('/stats/groups', 'StatsController@groups')->name('groups'); - Route::get('/stats/groups/group/{id}', 'StatsController@group')->name('group'); - - // Page - Route::get('/p/{slug}.{id}', 'PageController@page')->name('page'); - - // Private Messages System - Route::get('/{username}.{id}/inbox', 'PrivateMessageController@getPrivateMessages')->name('inbox'); - Route::get('/{username}.{id}/message/{pmid}', 'PrivateMessageController@getPrivateMessageById')->name('message'); - Route::get('/{username}.{id}/outbox', 'PrivateMessageController@getPrivateMessagesSent')->name('outbox'); - Route::get('/{username}.{id}/create', 'PrivateMessageController@makePrivateMessage')->name('create'); - Route::any('/{username}.{id}/mark-all-read', 'PrivateMessageController@markAllAsRead')->name('mark-all-read'); - Route::post('/send-private-message', 'PrivateMessageController@sendPrivateMessage')->name('send-pm'); - Route::any('/reply-private-message/{pmid}', 'PrivateMessageController@replyPrivateMessage')->name('reply-pm'); - Route::any('/{username}.{id}/searchPM', 'PrivateMessageController@searchPM')->name('searchPM'); - Route::any('/deletePM/{pmid}', 'PrivateMessageController@deletePrivateMessage')->name('delete-pm'); - - // Requests - Route::get('/requests', 'RequestController@requests')->name('requests'); - Route::any('/request/add', 'RequestController@addrequest')->name('add_request'); - Route::any('/request/{id}/edit', 'RequestController@editrequest')->name('edit_request'); - Route::get('/request/{id}', 'RequestController@request')->name('request'); - Route::any('/request/{id}/accept', 'RequestController@approveRequest')->name('approveRequest'); - Route::any('/request/{id}/delete', 'RequestController@deleteRequest')->name('deleteRequest'); - Route::any('/request/{id}/fill', 'RequestController@fillRequest')->name('fill_request'); - Route::any('/request/{id}/reject', 'RequestController@rejectRequest')->name('rejectRequest'); - Route::any('/request/{id}/vote', 'RequestController@addBonus')->name('add_votes'); - Route::get('/requests/search', 'RequestController@search')->name('request_search'); - Route::any('/request/{id}/claim', 'RequestController@claimRequest')->name('claimRequest'); - Route::any('/request/{id}/unclaim', 'RequestController@unclaimRequest')->name('unclaimRequest'); - - // Torrent - Route::any('filter', 'TorrentController@faceted'); - Route::get('/torrents', 'TorrentController@torrents')->name('torrents'); - Route::get('/torrents/{slug}.{id}', 'TorrentController@torrent')->name('torrent'); - Route::get('/torrents/{slug}.{id}/peers', 'TorrentController@peers')->name('peers'); - Route::get('/torrents/{slug}.{id}/history', 'TorrentController@history')->name('history'); - Route::any('/upload', 'TorrentController@upload')->name('upload'); - Route::get('/download_check/{slug}.{id}', 'TorrentController@downloadCheck')->name('download_check'); - Route::get('/download/{slug}.{id}', 'TorrentController@download')->name('download'); - Route::get('/poster', 'TorrentController@poster')->name('poster'); - Route::post('/torrents/{id}/delete', 'TorrentController@deleteTorrent')->name('delete'); - Route::get('/torrents/{id}/delete', 'TorrentController@deleteTorrent')->name('delete'); - Route::any('/torrents/{slug}.{id}/edit', 'TorrentController@edit')->name('edit'); - Route::any('/torrents/{slug}.{id}/torrent_fl', 'TorrentController@grantFL')->name('torrent_fl'); - Route::any('/torrents/{slug}.{id}/torrent_doubleup', 'TorrentController@grantDoubleUp')->name('torrent_doubleup'); - Route::get('/torrents/poster/search', 'TorrentController@posterSearch')->name('poster_search'); - Route::any('/torrents/{slug}.{id}/bumpTorrent', 'TorrentController@bumpTorrent')->name('bumpTorrent'); - Route::any('/torrents/{slug}.{id}/torrent_sticky', 'TorrentController@sticky')->name('torrent_sticky'); - Route::any('/torrents/{slug}.{id}/torrent_feature', 'TorrentController@grantFeatured')->name('torrent_feature'); - Route::any('/torrents/{slug}.{id}/reseed', 'TorrentController@reseedTorrent')->name('reseed'); - Route::any('/torrents/{slug}.{id}/tip_uploader', 'BonusController@tipUploader')->name('tip_uploader'); - Route::any('/torrents/{slug}.{id}/freeleech_token', 'TorrentController@freeleechToken')->name('freeleech_token'); - - // User - Route::get('/lockscreen', 'LockAccountController@lockscreen')->name('lock'); - Route::post('/lockscreen', 'LockAccountController@unlock')->name('unlock'); - Route::get('/members', 'UserController@members')->name('members'); - Route::any('/members/results', 'UserController@userSearch')->name('userSearch'); - Route::get('/{username}.{id}', 'UserController@profil')->name('profil'); - Route::any('/{username}.{id}/edit', 'UserController@editProfil')->name('user_edit_profil'); - Route::post('/{username}.{id}/photo', 'UserController@changePhoto')->name('user_change_photo'); - Route::get('/{username}.{id}/activate/{token}', 'UserController@activate')->name('user_activate'); - Route::post('/{username}.{id}/about', 'UserController@changeAbout')->name('user_change_about'); - Route::post('/{username}.{id}/photo', 'UserController@changeTitle')->name('user_change_title'); - Route::get('/achievements', 'AchievementsController@index')->name('achievements'); - Route::get('/{username}.{id}/warninglog', 'UserController@getWarnings')->name('warninglog'); - Route::any('/deactivateWarning/{id}', 'UserController@deactivateWarning')->name('deactivateWarning'); - Route::get('/{username}.{id}/myuploads', 'UserController@myUploads')->name('myuploads'); - Route::get('/{username}.{id}/myactive', 'UserController@myActive')->name('myactive'); - Route::get('/{username}.{id}/myhistory', 'UserController@myHistory')->name('myhistory'); - - // Follow System - Route::any('/follow/{user}', 'FollowController@follow')->name('follow'); - Route::any('/unfollow/{user}', 'FollowController@unfollow')->name('unfollow'); - - //Thank System - Route::any('/torrents/{slug}.{id}/thank', 'ThankController@torrentThank')->name('torrentThank'); - - // User Settings - Route::get('/{username}.{id}/settings', 'UserController@settings')->name('user_settings'); - Route::post('/{username}.{id}/settings', 'UserController@changeSettings')->name('user_settings'); - Route::any('/{username}.{id}/settings/change_password', 'UserController@changePassword')->name('change_password'); - Route::any('/{username}.{id}/settings/change_email', 'UserController@changeEmail')->name('change_email'); - Route::any('/{username}.{id}/settings/change_pid', 'UserController@changePID')->name('change_pid'); - - // User Language - Route::get('/{locale}/back', 'LanguageController@back')->name('back'); - - // User Clients - Route::any('/{username}.{id}/clients', 'UserController@clients')->name('user_clients'); - Route::post('/{username}.{id}/addcli', 'UserController@authorizeClient')->name('addcli'); - Route::post('/{username}.{id}/rmcli', 'UserController@removeClient')->name('rmcli'); - - // Invite System - Route::get('/invite', 'InviteController@invite')->name('invite'); - Route::post('/invite', 'InviteController@process')->name('process'); - Route::get('/invite/tree/{username}.{id}', 'InviteController@inviteTree')->name('inviteTree'); - - // Poll System - Route::get('/polls', 'PollController@index')->name('polls'); - Route::get('/poll/{slug}', 'PollController@show')->name('poll'); - Route::post('/poll/vote', 'PollController@vote')->middleware('check_ip'); - Route::get('/poll/{slug}/result', 'PollController@result')->name('poll_results'); - - // Graveyard System - Route::get('/graveyard', 'GraveyardController@index')->name('graveyard'); - Route::post('/graveyard/{id}', 'GraveyardController@resurrect')->name('resurrect'); - - // Notifications System - Route::get('/notifications', 'NotificationController@get')->name('get_notifications'); - Route::any('/notification/read/{id}', 'NotificationController@read')->name('read_notification'); - Route::any('/notification/massread', 'NotificationController@massRead')->name('massRead_notifications'); - Route::any('/notification/delete/{id}', 'NotificationController@delete')->name('delete_notification'); - -}); + Route::group(['middleware' => 'auth'], function () { + + // General + Route::get('/', 'HomeController@home')->name('home'); + Route::any('/contact', 'HomeController@contact')->name('contact'); + Route::post('logout', 'Auth\LoginController@logout')->name('logout'); + + // Article + Route::get('/articles', 'ArticleController@articles')->name('articles'); + Route::get('/articles/{slug}.{id}', 'ArticleController@post')->name('article'); + + // Bonus System + Route::get('/bonus', 'BonusController@bonus')->name('bonus'); + Route::any('/bonusexchange/{id}', 'BonusController@exchange')->name('bonusexchange'); + Route::post('/bongift', 'BonusController@gift')->name('bongift'); + + // Bookmarks + Route::get('/bookmarks', 'BookmarkController@bookmarks')->name('bookmarks'); + Route::any('/torrents/bookmark/{id}', 'TorrentController@bookmark')->name('bookmark'); + Route::any('/torrents/unbookmark/{id}', 'BookmarkController@unBookmark')->name('unbookmark'); + + // User/Torrent Report + Route::any('/report', 'ReportController@postReport')->name('postReport'); + + // Bug Report + Route::get('/bug', 'BugController@bug')->name('bug'); + Route::post('/bug', 'BugController@bug')->name('bug'); + + // Category + Route::get('/categories', 'CategoryController@categories')->name('categories'); + Route::get('/categories/{slug}.{id}', 'CategoryController@category')->name('category'); + + // Catalogs + Route::get('/catalogs', 'CatalogController@catalogs')->name('catalogs'); + Route::get('/catalog/{slug}.{id}', 'CatalogController@catalog')->name('catalog'); + Route::get('/catalog/torrents/{imdb}', 'CatalogController@torrents')->name('catalog_torrents'); + + // Staff List + Route::any('/staff', 'PageController@staff')->name('staff'); + + // Black List + Route::any('/blacklist', 'PageController@blacklist')->name('blacklist'); + + // About Us + Route::any('/aboutus', 'PageController@about')->name('about'); + + // Comments + Route::any('/comment/article/{slug}.{id}', 'CommentController@article')->name('comment_article'); + Route::any('/comment/torrent/{slug}.{id}', 'CommentController@torrent')->name('comment_torrent'); + Route::any('/comment/thanks/{id}', 'CommentController@quickthanks')->name('comment_thanks'); + Route::any('/comment/request/{id}', 'CommentController@request')->name('comment_request'); + Route::any('/comment/edit/{comment_id}', 'CommentController@editComment')->name('comment_edit'); + Route::any('/comment/delete/{comment_id}', 'CommentController@deleteComment')->name('comment_delete'); + + //Extra-Stats + Route::get('/stats', 'StatsController@index')->name('stats'); + //USER + Route::get('/stats/user/uploaded', 'StatsController@uploaded')->name('uploaded'); + Route::get('/stats/user/downloaded', 'StatsController@downloaded')->name('downloaded'); + Route::get('/stats/user/seeders', 'StatsController@seeders')->name('seeders'); + Route::get('/stats/user/leechers', 'StatsController@leechers')->name('leechers'); + Route::get('/stats/user/uploaders', 'StatsController@uploaders')->name('uploaders'); + Route::get('/stats/user/bankers', 'StatsController@bankers')->name('bankers'); + Route::get('/stats/user/seedtime', 'StatsController@seedtime')->name('seedtime'); + Route::get('/stats/user/seedsize', 'StatsController@seedsize')->name('seedsize'); + //TORRENT + Route::get('/stats/torrent/seeded', 'StatsController@seeded')->name('seeded'); + Route::get('/stats/torrent/leeched', 'StatsController@leeched')->name('leeched'); + Route::get('/stats/torrent/completed', 'StatsController@completed')->name('completed'); + Route::get('/stats/torrent/dying', 'StatsController@dying')->name('dying'); + Route::get('/stats/torrent/dead', 'StatsController@dead')->name('dead'); + //REQUEST + Route::get('/stats/request/bountied', 'StatsController@bountied')->name('bountied'); + //GROUPS + Route::get('/stats/groups', 'StatsController@groups')->name('groups'); + Route::get('/stats/groups/group/{id}', 'StatsController@group')->name('group'); + + // Page + Route::get('/p/{slug}.{id}', 'PageController@page')->name('page'); + + // Private Messages System + Route::get('/{username}.{id}/inbox', 'PrivateMessageController@getPrivateMessages')->name('inbox'); + Route::get('/{username}.{id}/message/{pmid}', 'PrivateMessageController@getPrivateMessageById')->name('message'); + Route::get('/{username}.{id}/outbox', 'PrivateMessageController@getPrivateMessagesSent')->name('outbox'); + Route::get('/{username}.{id}/create', 'PrivateMessageController@makePrivateMessage')->name('create'); + Route::any('/{username}.{id}/mark-all-read', 'PrivateMessageController@markAllAsRead')->name('mark-all-read'); + Route::post('/send-private-message', 'PrivateMessageController@sendPrivateMessage')->name('send-pm'); + Route::any('/reply-private-message/{pmid}', 'PrivateMessageController@replyPrivateMessage')->name('reply-pm'); + Route::any('/{username}.{id}/searchPM', 'PrivateMessageController@searchPM')->name('searchPM'); + Route::any('/deletePM/{pmid}', 'PrivateMessageController@deletePrivateMessage')->name('delete-pm'); + + // Requests + Route::get('/requests', 'RequestController@requests')->name('requests'); + Route::any('/request/add', 'RequestController@addrequest')->name('add_request'); + Route::any('/request/{id}/edit', 'RequestController@editrequest')->name('edit_request'); + Route::get('/request/{id}', 'RequestController@request')->name('request'); + Route::any('/request/{id}/accept', 'RequestController@approveRequest')->name('approveRequest'); + Route::any('/request/{id}/delete', 'RequestController@deleteRequest')->name('deleteRequest'); + Route::any('/request/{id}/fill', 'RequestController@fillRequest')->name('fill_request'); + Route::any('/request/{id}/reject', 'RequestController@rejectRequest')->name('rejectRequest'); + Route::any('/request/{id}/vote', 'RequestController@addBonus')->name('add_votes'); + Route::get('/requests/search', 'RequestController@search')->name('request_search'); + Route::any('/request/{id}/claim', 'RequestController@claimRequest')->name('claimRequest'); + Route::any('/request/{id}/unclaim', 'RequestController@unclaimRequest')->name('unclaimRequest'); + + // Torrent + Route::any('filter', 'TorrentController@faceted'); + Route::get('/torrents', 'TorrentController@torrents')->name('torrents'); + Route::get('/torrents/{slug}.{id}', 'TorrentController@torrent')->name('torrent'); + Route::get('/torrents/{slug}.{id}/peers', 'TorrentController@peers')->name('peers'); + Route::get('/torrents/{slug}.{id}/history', 'TorrentController@history')->name('history'); + Route::any('/upload', 'TorrentController@upload')->name('upload'); + Route::get('/download_check/{slug}.{id}', 'TorrentController@downloadCheck')->name('download_check'); + Route::get('/download/{slug}.{id}', 'TorrentController@download')->name('download'); + Route::get('/poster', 'TorrentController@poster')->name('poster'); + Route::post('/torrents/{id}/delete', 'TorrentController@deleteTorrent')->name('delete'); + Route::get('/torrents/{id}/delete', 'TorrentController@deleteTorrent')->name('delete'); + Route::any('/torrents/{slug}.{id}/edit', 'TorrentController@edit')->name('edit'); + Route::any('/torrents/{slug}.{id}/torrent_fl', 'TorrentController@grantFL')->name('torrent_fl'); + Route::any('/torrents/{slug}.{id}/torrent_doubleup', 'TorrentController@grantDoubleUp')->name('torrent_doubleup'); + Route::get('/torrents/poster/search', 'TorrentController@posterSearch')->name('poster_search'); + Route::any('/torrents/{slug}.{id}/bumpTorrent', 'TorrentController@bumpTorrent')->name('bumpTorrent'); + Route::any('/torrents/{slug}.{id}/torrent_sticky', 'TorrentController@sticky')->name('torrent_sticky'); + Route::any('/torrents/{slug}.{id}/torrent_feature', 'TorrentController@grantFeatured')->name('torrent_feature'); + Route::any('/torrents/{slug}.{id}/reseed', 'TorrentController@reseedTorrent')->name('reseed'); + Route::any('/torrents/{slug}.{id}/tip_uploader', 'BonusController@tipUploader')->name('tip_uploader'); + Route::any('/torrents/{slug}.{id}/freeleech_token', 'TorrentController@freeleechToken')->name('freeleech_token'); + + // User + Route::get('/lockscreen', 'LockAccountController@lockscreen')->name('lock'); + Route::post('/lockscreen', 'LockAccountController@unlock')->name('unlock'); + Route::get('/members', 'UserController@members')->name('members'); + Route::any('/members/results', 'UserController@userSearch')->name('userSearch'); + Route::get('/{username}.{id}', 'UserController@profil')->name('profil'); + Route::any('/{username}.{id}/edit', 'UserController@editProfil')->name('user_edit_profil'); + Route::post('/{username}.{id}/photo', 'UserController@changePhoto')->name('user_change_photo'); + Route::get('/{username}.{id}/activate/{token}', 'UserController@activate')->name('user_activate'); + Route::post('/{username}.{id}/about', 'UserController@changeAbout')->name('user_change_about'); + Route::post('/{username}.{id}/photo', 'UserController@changeTitle')->name('user_change_title'); + Route::get('/achievements', 'AchievementsController@index')->name('achievements'); + Route::get('/{username}.{id}/warninglog', 'UserController@getWarnings')->name('warninglog'); + Route::any('/deactivateWarning/{id}', 'UserController@deactivateWarning')->name('deactivateWarning'); + Route::get('/{username}.{id}/myuploads', 'UserController@myUploads')->name('myuploads'); + Route::get('/{username}.{id}/myactive', 'UserController@myActive')->name('myactive'); + Route::get('/{username}.{id}/myhistory', 'UserController@myHistory')->name('myhistory'); + + // Follow System + Route::any('/follow/{user}', 'FollowController@follow')->name('follow'); + Route::any('/unfollow/{user}', 'FollowController@unfollow')->name('unfollow'); + + //Thank System + Route::any('/torrents/{slug}.{id}/thank', 'ThankController@torrentThank')->name('torrentThank'); + + // User Settings + Route::get('/{username}.{id}/settings', 'UserController@settings')->name('user_settings'); + Route::post('/{username}.{id}/settings', 'UserController@changeSettings')->name('user_settings'); + Route::any('/{username}.{id}/settings/change_password', 'UserController@changePassword')->name('change_password'); + Route::any('/{username}.{id}/settings/change_email', 'UserController@changeEmail')->name('change_email'); + Route::any('/{username}.{id}/settings/change_pid', 'UserController@changePID')->name('change_pid'); + + // User Language + Route::get('/{locale}/back', 'LanguageController@back')->name('back'); + + // User Clients + Route::any('/{username}.{id}/clients', 'UserController@clients')->name('user_clients'); + Route::post('/{username}.{id}/addcli', 'UserController@authorizeClient')->name('addcli'); + Route::post('/{username}.{id}/rmcli', 'UserController@removeClient')->name('rmcli'); + + // Invite System + Route::get('/invite', 'InviteController@invite')->name('invite'); + Route::post('/invite', 'InviteController@process')->name('process'); + Route::get('/invite/tree/{username}.{id}', 'InviteController@inviteTree')->name('inviteTree'); + + // Poll System + Route::get('/polls', 'PollController@index')->name('polls'); + Route::get('/poll/{slug}', 'PollController@show')->name('poll'); + Route::post('/poll/vote', 'PollController@vote')->middleware('check_ip'); + Route::get('/poll/{slug}/result', 'PollController@result')->name('poll_results'); + + // Graveyard System + Route::get('/graveyard', 'GraveyardController@index')->name('graveyard'); + Route::post('/graveyard/{id}', 'GraveyardController@resurrect')->name('resurrect'); + + // Notifications System + Route::get('/notifications', 'NotificationController@get')->name('get_notifications'); + Route::any('/notification/read/{id}', 'NotificationController@read')->name('read_notification'); + Route::any('/notification/massread', 'NotificationController@massRead')->name('massRead_notifications'); + Route::any('/notification/delete/{id}', 'NotificationController@delete')->name('delete_notification'); + }); /* |------------------------------------------ | ShoutBox Routes Group (when authorized) |------------------------------------------ */ -Route::group(['prefix' => 'shoutbox', 'middleware' => 'auth'], function () { - Route::get('/', 'HomeController@home')->name('shoutbox-home'); - Route::get('/messages/{after?}', 'ShoutboxController@fetch')->name('shoutbox-fetch'); - Route::post('/send', 'ShoutboxController@send')->name('shoutbox-send'); - Route::get('/delete/{id}', 'ShoutboxController@deleteShout')->name('shout-delete'); -}); + Route::group(['prefix' => 'shoutbox', 'middleware' => 'auth'], function () { + Route::get('/', 'HomeController@home')->name('shoutbox-home'); + Route::get('/messages/{after?}', 'ShoutboxController@fetch')->name('shoutbox-fetch'); + Route::post('/send', 'ShoutboxController@send')->name('shoutbox-send'); + Route::get('/delete/{id}', 'ShoutboxController@deleteShout')->name('shout-delete'); + }); /* |------------------------------------------ | Forums Route Redirect |------------------------------------------ */ -Route::get('/forums', function () { - return redirect('/community'); -}); + Route::get('/forums', function () { + return redirect('/community'); + }); /* |------------------------------------------ | Community Routes Group (when authorized) |------------------------------------------ */ -Route::group(['prefix' => 'community', 'middleware' => 'auth'], function () { - // Display Forum Index - Route::get('/', 'ForumController@index')->name('forum_index'); - // Search Forums - Route::any('/search', 'ForumController@search')->name('forum_search'); - // Display Forum Categories - Route::get('/category/{slug}.{id}', 'ForumController@category')->name('forum_category'); - // Display Topics - Route::get('/forum/{slug}.{id}', 'ForumController@display')->name('forum_display'); - // Create New Topic - Route::any('/forum/{slug}.{id}/new-topic', 'ForumController@newTopic')->name('forum_new_topic'); - // View Topic - Route::get('/topic/{slug}.{id}', 'ForumController@topic')->name('forum_topic'); - // Close Topic - Route::get('/topic/{slug}.{id}/close', 'ForumController@closeTopic')->name('forum_close'); - // Open Topic - Route::get('/topic/{slug}.{id}/open', 'ForumController@openTopic')->name('forum_open'); - // Edit Post - Route::any('/topic/{slug}.{id}/post-{postId}/edit', 'ForumController@postEdit')->name('forum_post_edit'); - // Delete Post - Route::any('/topic/{slug}.{id}/post-{postId}/delete', 'ForumController@postDelete')->name('forum_post_delete'); - // Reply To Topic - Route::post('/topic/{slug}.{id}/reply', 'ForumController@reply')->name('forum_reply'); - // Edit Topic - Route::any('/topic/{slug}.{id}/edit', 'ForumController@editTopic')->name('forum_edit_topic'); - // Delete Topic - Route::any('/topic/{slug}.{id}/delete', 'ForumController@deleteTopic')->name('forum_delete_topic'); - // Pin Topic - Route::any('/topic/{slug}.{id}/pin', 'ForumController@pinTopic')->name('forum_pin_topic'); - // Unpin Topic - Route::any('/topic/{slug}.{id}/unpin', 'ForumController@unpinTopic')->name('forum_unpin_topic'); - - // Topic Label System - Route::get('/topic/{slug}.{id}/approved', 'ForumController@approvedTopic')->name('forum_approved'); - Route::get('/topic/{slug}.{id}/denied', 'ForumController@deniedTopic')->name('forum_denied'); - Route::get('/topic/{slug}.{id}/solved', 'ForumController@solvedTopic')->name('forum_solved'); - Route::get('/topic/{slug}.{id}/invalid', 'ForumController@invalidTopic')->name('forum_invalid'); - Route::get('/topic/{slug}.{id}/bug', 'ForumController@bugTopic')->name('forum_bug'); - Route::get('/topic/{slug}.{id}/suggestion', 'ForumController@suggestionTopic')->name('forum_suggestion'); - - // Like - Dislike System - Route::any('/like/post/{postId}', 'ForumController@likePost')->name('like'); - Route::any('/dislike/post/{postId}', 'ForumController@dislikePost')->name('dislike'); -}); + Route::group(['prefix' => 'community', 'middleware' => 'auth'], function () { + // Display Forum Index + Route::get('/', 'ForumController@index')->name('forum_index'); + // Search Forums + Route::any('/search', 'ForumController@search')->name('forum_search'); + // Display Forum Categories + Route::get('/category/{slug}.{id}', 'ForumController@category')->name('forum_category'); + // Display Topics + Route::get('/forum/{slug}.{id}', 'ForumController@display')->name('forum_display'); + // Create New Topic + Route::any('/forum/{slug}.{id}/new-topic', 'ForumController@newTopic')->name('forum_new_topic'); + // View Topic + Route::get('/topic/{slug}.{id}', 'ForumController@topic')->name('forum_topic'); + // Close Topic + Route::get('/topic/{slug}.{id}/close', 'ForumController@closeTopic')->name('forum_close'); + // Open Topic + Route::get('/topic/{slug}.{id}/open', 'ForumController@openTopic')->name('forum_open'); + // Edit Post + Route::any('/topic/{slug}.{id}/post-{postId}/edit', 'ForumController@postEdit')->name('forum_post_edit'); + // Delete Post + Route::any('/topic/{slug}.{id}/post-{postId}/delete', 'ForumController@postDelete')->name('forum_post_delete'); + // Reply To Topic + Route::post('/topic/{slug}.{id}/reply', 'ForumController@reply')->name('forum_reply'); + // Edit Topic + Route::any('/topic/{slug}.{id}/edit', 'ForumController@editTopic')->name('forum_edit_topic'); + // Delete Topic + Route::any('/topic/{slug}.{id}/delete', 'ForumController@deleteTopic')->name('forum_delete_topic'); + // Pin Topic + Route::any('/topic/{slug}.{id}/pin', 'ForumController@pinTopic')->name('forum_pin_topic'); + // Unpin Topic + Route::any('/topic/{slug}.{id}/unpin', 'ForumController@unpinTopic')->name('forum_unpin_topic'); + + // Topic Label System + Route::get('/topic/{slug}.{id}/approved', 'ForumController@approvedTopic')->name('forum_approved'); + Route::get('/topic/{slug}.{id}/denied', 'ForumController@deniedTopic')->name('forum_denied'); + Route::get('/topic/{slug}.{id}/solved', 'ForumController@solvedTopic')->name('forum_solved'); + Route::get('/topic/{slug}.{id}/invalid', 'ForumController@invalidTopic')->name('forum_invalid'); + Route::get('/topic/{slug}.{id}/bug', 'ForumController@bugTopic')->name('forum_bug'); + Route::get('/topic/{slug}.{id}/suggestion', 'ForumController@suggestionTopic')->name('forum_suggestion'); + + // Like - Dislike System + Route::any('/like/post/{postId}', 'ForumController@likePost')->name('like'); + Route::any('/dislike/post/{postId}', 'ForumController@dislikePost')->name('dislike'); + }); /* @@ -338,127 +337,127 @@ | Staff Dashboard Routes Group (when authorized and a staff group) |----------------------------------------------------------------- */ -Route::group(['prefix' => 'staff_dashboard', 'middleware' => ['auth', 'modo'], 'namespace' => 'Staff'], function () { - - // Staff Dashboard - Route::any('/', 'HomeController@home')->name('staff_dashboard'); - - // Ban - Route::any('/bans', 'BanController@getBans')->name('getBans'); - Route::any('/ban/{username}.{id}', 'BanController@ban')->name('ban'); - Route::any('/unban/{username}.{id}', 'BanController@unban')->name('unban'); - - // Flush Ghost Peers - Route::any('/flush', 'FlushController@deleteOldPeers')->name('flush'); - - // User Tools - Route::any('/user_search', 'UserController@members')->name('user_search'); - Route::any('/user_results', 'UserController@userSearch')->name('user_results'); - Route::any('/user_edit/{username}.{id}', 'UserController@userSettings')->name('user_setting'); - Route::any('/user_edit/{username}.{id}/edit', 'UserController@userEdit')->name('user_edit'); - Route::any('/user_edit/{username}.{id}/permissions', 'UserController@userPermissions')->name('user_permissions'); - Route::any('/user_delete/{username}.{id}', 'UserController@userDelete')->name('user_delete'); - Route::any('/user_edit/{username}.{id}/password', 'UserController@userPassword')->name('user_password'); - - // Moderation - Route::any('/torrents', 'TorrentController@index')->name('staff_torrent_index'); - Route::get('/moderation', 'ModerationController@moderation')->name('moderation'); - Route::get('/modertaion/{slug}.{id}/approve', 'ModerationController@approve')->name('moderation_approve'); - Route::get('/modertaion/{slug}.{id}/reject', 'ModerationController@reject')->name('moderation_reject'); - Route::any('/torrent_search', 'TorrentController@search')->name('torrent-search'); - - // Request section - Route::any('/request/{id}/reset', 'ModerationController@resetRequest')->name('resetRequest'); - - // User Staff Notes - Route::any('/notes/{username}.{id}', 'NoteController@postNote')->name('postNote'); - Route::any('/notes', 'NoteController@getNotes')->name('getNotes'); - Route::get('/notes/{note_id}', 'NoteController@getNote')->name('getNote'); - - // Reports - Route::any('/reports', 'ReportController@getReports')->name('getReports'); - Route::get('/reports/{report_id}', 'ReportController@getReport')->name('getReport'); - Route::post('/reports/{report_id}/solve', 'ReportController@solveReport')->name('solveReport'); - - // Catalog Groups - Route::get('/catalogs', 'CatalogController@getCatalogs')->name('getCatalog'); - Route::post('/catalogs', 'CatalogController@postCatalog')->name('postCatalog'); - Route::get('/catalogs/{genre_id}/delete', 'CatalogController@deleteCatalog')->name('deleteCatalog'); - Route::post('/catalogs/{catalog_id}/edit', 'CatalogController@editCatalog')->name('editCatalog'); - - // Catalog Torrents - Route::get('/catalog_torrent', 'CatalogController@getCatalogTorrent')->name('getCatalogTorrent'); - Route::post('/catalog_torrent', 'CatalogController@postCatalogTorrent')->name('postCatalogTorrent'); - Route::get('/catalog/{catalog_id}/records', 'CatalogController@getCatalogRecords')->name('getCatalogRecords'); - - // Categories - Route::get('/categories', 'CategoryController@index')->name('staff_category_index'); - Route::any('/categories/new', 'CategoryController@add')->name('staff_category_add'); - Route::any('/categories/edit/{slug}.{id}', 'CategoryController@edit')->name('staff_category_edit'); - Route::get('/categories/delete/{slug}.{id}', 'CategoryController@delete')->name('staff_category_delete'); - - // Types - Route::get('/types', 'TypeController@index')->name('staff_type_index'); - Route::any('/types/new', 'TypeController@add')->name('staff_type_add'); - Route::any('/types/edit/{slug}.{id}', 'TypeController@edit')->name('staff_type_edit'); - Route::get('/types/delete/{slug}.{id}', 'TypeController@delete')->name('staff_type_delete'); - - // Forum - Route::get('/forums', 'ForumController@index')->name('staff_forum_index'); - Route::any('/forums/new', 'ForumController@add')->name('staff_forum_add'); - Route::any('/forums/edit/{slug}.{id}', 'ForumController@edit')->name('staff_forum_edit'); - Route::get('/forums/delete/{slug}.{id}', 'ForumController@delete')->name('staff_forum_delete'); - - //Pages - Route::get('/pages', 'PageController@index')->name('staff_page_index'); - Route::any('/pages/new', 'PageController@add')->name('staff_page_add'); - Route::any('/pages/edit/{slug}.{id}', 'PageController@edit')->name('staff_page_edit'); - Route::get('/pages/delete/{slug}.{id}', 'PageController@delete')->name('staff_page_delete'); - - // Settings - Route::any('/settings', 'SettingsController@index')->name('staff_settings_index'); - - // Articles - Route::any('/articles', 'ArticleController@index')->name('staff_article_index'); - Route::any('/articles/new', 'ArticleController@add')->name('staff_article_add'); - Route::any('/articles/edit/{slug}.{id}', 'ArticleController@edit')->name('staff_article_edit'); - Route::any('/articles/delete/{slug}.{id}', 'ArticleController@delete')->name('staff_article_delete'); - - // Bugs - Route::any('/bug', 'BugController@index')->name('staff_bug_index'); - - // Blocks - Route::any('/blocks', 'BlockController@index')->name('staff_blocks_index'); - - // Groups - Route::any('/groups', 'GroupsController@index')->name('staff_groups_index'); - Route::any('/groups/add', 'GroupsController@add')->name('staff_groups_add'); - Route::any('/groups/edit/{group}.{id}', 'GroupsController@edit')->name('staff_groups_edit'); - - // Warnings - Route::any('/warnings', 'WarningController@getWarnings')->name('getWarnings'); - - // Invites - Route::any('/invites', 'InviteController@getInvites')->name('getInvites'); - - // Failed Logins - Route::any('/failedlogin', 'FailedLoginController@getFailedAttemps')->name('getFailedAttemps'); - - // Polls - Route::get('/polls', 'PollController@polls')->name('getPolls'); - Route::get('/poll/{id}', 'PollController@poll')->name('getPoll'); - Route::get('/polls/create', 'PollController@create')->name('getCreatePoll'); - Route::post('/polls/create', 'PollController@store')->name('postCreatePoll'); - - // Activity Log - Route::get('/activitylog', 'ActivityLogController@activityLog')->name('activityLog'); - - // System Gifting - Route::get('/systemgift', 'GiftController@index')->name('systemGift'); - Route::post('/systemgift/send', 'GiftController@gift')->name('sendSystemGift'); - - // MassPM - Route::get('/masspm', 'MassPMController@massPM')->name('massPM'); - Route::post('/masspm/send', 'MassPMController@sendMassPM')->name('sendMassPM'); -}); + Route::group(['prefix' => 'staff_dashboard', 'middleware' => ['auth', 'modo'], 'namespace' => 'Staff'], function () { + + // Staff Dashboard + Route::any('/', 'HomeController@home')->name('staff_dashboard'); + + // Ban + Route::any('/bans', 'BanController@getBans')->name('getBans'); + Route::any('/ban/{username}.{id}', 'BanController@ban')->name('ban'); + Route::any('/unban/{username}.{id}', 'BanController@unban')->name('unban'); + + // Flush Ghost Peers + Route::any('/flush', 'FlushController@deleteOldPeers')->name('flush'); + + // User Tools + Route::any('/user_search', 'UserController@members')->name('user_search'); + Route::any('/user_results', 'UserController@userSearch')->name('user_results'); + Route::any('/user_edit/{username}.{id}', 'UserController@userSettings')->name('user_setting'); + Route::any('/user_edit/{username}.{id}/edit', 'UserController@userEdit')->name('user_edit'); + Route::any('/user_edit/{username}.{id}/permissions', 'UserController@userPermissions')->name('user_permissions'); + Route::any('/user_delete/{username}.{id}', 'UserController@userDelete')->name('user_delete'); + Route::any('/user_edit/{username}.{id}/password', 'UserController@userPassword')->name('user_password'); + + // Moderation + Route::any('/torrents', 'TorrentController@index')->name('staff_torrent_index'); + Route::get('/moderation', 'ModerationController@moderation')->name('moderation'); + Route::get('/modertaion/{slug}.{id}/approve', 'ModerationController@approve')->name('moderation_approve'); + Route::get('/modertaion/{slug}.{id}/reject', 'ModerationController@reject')->name('moderation_reject'); + Route::any('/torrent_search', 'TorrentController@search')->name('torrent-search'); + + // Request section + Route::any('/request/{id}/reset', 'ModerationController@resetRequest')->name('resetRequest'); + + // User Staff Notes + Route::any('/notes/{username}.{id}', 'NoteController@postNote')->name('postNote'); + Route::any('/notes', 'NoteController@getNotes')->name('getNotes'); + Route::get('/notes/{note_id}', 'NoteController@getNote')->name('getNote'); + + // Reports + Route::any('/reports', 'ReportController@getReports')->name('getReports'); + Route::get('/reports/{report_id}', 'ReportController@getReport')->name('getReport'); + Route::post('/reports/{report_id}/solve', 'ReportController@solveReport')->name('solveReport'); + + // Catalog Groups + Route::get('/catalogs', 'CatalogController@getCatalogs')->name('getCatalog'); + Route::post('/catalogs', 'CatalogController@postCatalog')->name('postCatalog'); + Route::get('/catalogs/{genre_id}/delete', 'CatalogController@deleteCatalog')->name('deleteCatalog'); + Route::post('/catalogs/{catalog_id}/edit', 'CatalogController@editCatalog')->name('editCatalog'); + + // Catalog Torrents + Route::get('/catalog_torrent', 'CatalogController@getCatalogTorrent')->name('getCatalogTorrent'); + Route::post('/catalog_torrent', 'CatalogController@postCatalogTorrent')->name('postCatalogTorrent'); + Route::get('/catalog/{catalog_id}/records', 'CatalogController@getCatalogRecords')->name('getCatalogRecords'); + + // Categories + Route::get('/categories', 'CategoryController@index')->name('staff_category_index'); + Route::any('/categories/new', 'CategoryController@add')->name('staff_category_add'); + Route::any('/categories/edit/{slug}.{id}', 'CategoryController@edit')->name('staff_category_edit'); + Route::get('/categories/delete/{slug}.{id}', 'CategoryController@delete')->name('staff_category_delete'); + + // Types + Route::get('/types', 'TypeController@index')->name('staff_type_index'); + Route::any('/types/new', 'TypeController@add')->name('staff_type_add'); + Route::any('/types/edit/{slug}.{id}', 'TypeController@edit')->name('staff_type_edit'); + Route::get('/types/delete/{slug}.{id}', 'TypeController@delete')->name('staff_type_delete'); + + // Forum + Route::get('/forums', 'ForumController@index')->name('staff_forum_index'); + Route::any('/forums/new', 'ForumController@add')->name('staff_forum_add'); + Route::any('/forums/edit/{slug}.{id}', 'ForumController@edit')->name('staff_forum_edit'); + Route::get('/forums/delete/{slug}.{id}', 'ForumController@delete')->name('staff_forum_delete'); + + //Pages + Route::get('/pages', 'PageController@index')->name('staff_page_index'); + Route::any('/pages/new', 'PageController@add')->name('staff_page_add'); + Route::any('/pages/edit/{slug}.{id}', 'PageController@edit')->name('staff_page_edit'); + Route::get('/pages/delete/{slug}.{id}', 'PageController@delete')->name('staff_page_delete'); + + // Settings + Route::any('/settings', 'SettingsController@index')->name('staff_settings_index'); + + // Articles + Route::any('/articles', 'ArticleController@index')->name('staff_article_index'); + Route::any('/articles/new', 'ArticleController@add')->name('staff_article_add'); + Route::any('/articles/edit/{slug}.{id}', 'ArticleController@edit')->name('staff_article_edit'); + Route::any('/articles/delete/{slug}.{id}', 'ArticleController@delete')->name('staff_article_delete'); + + // Bugs + Route::any('/bug', 'BugController@index')->name('staff_bug_index'); + + // Blocks + Route::any('/blocks', 'BlockController@index')->name('staff_blocks_index'); + + // Groups + Route::any('/groups', 'GroupsController@index')->name('staff_groups_index'); + Route::any('/groups/add', 'GroupsController@add')->name('staff_groups_add'); + Route::any('/groups/edit/{group}.{id}', 'GroupsController@edit')->name('staff_groups_edit'); + + // Warnings + Route::any('/warnings', 'WarningController@getWarnings')->name('getWarnings'); + + // Invites + Route::any('/invites', 'InviteController@getInvites')->name('getInvites'); + + // Failed Logins + Route::any('/failedlogin', 'FailedLoginController@getFailedAttemps')->name('getFailedAttemps'); + + // Polls + Route::get('/polls', 'PollController@polls')->name('getPolls'); + Route::get('/poll/{id}', 'PollController@poll')->name('getPoll'); + Route::get('/polls/create', 'PollController@create')->name('getCreatePoll'); + Route::post('/polls/create', 'PollController@store')->name('postCreatePoll'); + + // Activity Log + Route::get('/activitylog', 'ActivityLogController@activityLog')->name('activityLog'); + + // System Gifting + Route::get('/systemgift', 'GiftController@index')->name('systemGift'); + Route::post('/systemgift/send', 'GiftController@gift')->name('sendSystemGift'); + + // MassPM + Route::get('/masspm', 'MassPMController@massPM')->name('massPM'); + Route::post('/masspm/send', 'MassPMController@sendMassPM')->name('sendMassPM'); + }); }); From fdb73966cd80b03ba4513e45a7a86415ef1af695 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 18 Jan 2018 01:04:20 +0000 Subject: [PATCH 02/14] Adopt PHP short array syntax Laravel 5 adopted the short array syntax which became available in PHP 5.4. --- app/Console/Commands/bonAllocation.php | 2 +- app/Helpers/MediaInfo.php | 26 +-- app/Hook/ClickableHook.php | 18 +- app/Http/Controllers/AnnounceController.php | 2 +- .../Controllers/Auth/RegisterController.php | 6 +- app/Http/Controllers/RssController.php | 4 +- config/moderation.php | 4 +- .../seeds/AchievementDetailsTableSeeder.php | 164 +++++++++--------- database/seeds/ArticlesTableSeeder.php | 8 +- database/seeds/BonExchangeTableSeeder.php | 28 +-- database/seeds/CategoriesTableSeeder.php | 16 +- database/seeds/GroupsTableSeeder.php | 76 ++++---- database/seeds/PagesTableSeeder.php | 28 +-- database/seeds/TypesTableSeeder.php | 56 +++--- 14 files changed, 219 insertions(+), 219 deletions(-) diff --git a/app/Console/Commands/bonAllocation.php b/app/Console/Commands/bonAllocation.php index fb2d209fa0..e3b8bcc655 100644 --- a/app/Console/Commands/bonAllocation.php +++ b/app/Console/Commands/bonAllocation.php @@ -159,7 +159,7 @@ public function handle() //Move data from SQL to array - $array = array(); + $array = []; foreach ($dying as $key => $value) { if (array_key_exists($value->user_id, $array)) { diff --git a/app/Helpers/MediaInfo.php b/app/Helpers/MediaInfo.php index 41a88eee86..8233ada578 100755 --- a/app/Helpers/MediaInfo.php +++ b/app/Helpers/MediaInfo.php @@ -264,12 +264,12 @@ private function parseBitRate($string) private function parseWidthHeight($string) { - return str_replace(array('pixels', ' '), null, strtolower($string)); + return str_replace(['pixels', ' '], null, strtolower($string)); } private function parseAudioChannels($string) { - $replace = array( + $replace = [ ' ' => '', 'channels' => 'ch', 'channel' => 'ch', @@ -277,7 +277,7 @@ private function parseAudioChannels($string) '7ch' => '6.1ch', '6ch' => '5.1ch', '2ch' => '2.0ch' - ); + ]; return str_ireplace(array_keys($replace), $replace, $string); } @@ -295,7 +295,7 @@ public function prepareViewCrumbs($data) { $output = ["general"=>[],"video"=>[],"audio"=>[]]; - $general_crumbs = array("format"=>"ucfirst","duration"=>null); + $general_crumbs = ["format"=>"ucfirst","duration"=>null]; if ($data['general'] === null) { $output["general"] = null; @@ -311,16 +311,16 @@ public function prepareViewCrumbs($data) if ($data['video'] === null) { $output["video"] = null; } else { - $temp_output = array(); + $temp_output = []; foreach ($data["video"] as $video_element) { - $temp_video_output = array(); + $temp_video_output = []; if (isset($video_element['format'])) { $temp_video_output[] = strtoupper($video_element['format']); } if (isset($video_element['width']) && isset($video_element['height'])) { $temp_video_output[] = $video_element['width']." x ".$video_element['height']; } - foreach (array("aspect_ratio","frame_rate","bit_depth","bit_rate","format_profile","scan_type","title","color primaries") as $property) { + foreach (["aspect_ratio","frame_rate","bit_depth","bit_rate","format_profile","scan_type","title","color primaries"] as $property) { if (isset($video_element[$property])) { $temp_video_output[] = $video_element[$property]; } @@ -337,10 +337,10 @@ public function prepareViewCrumbs($data) if ($data['audio'] === null) { $output["audio"] = null; } else { - $temp_output = array(); + $temp_output = []; foreach ($data["audio"] as $audio_element) { - $temp_audio_output = array(); - foreach (array("language","format","channels","bit_rate","title") as $property) { + $temp_audio_output = []; + foreach (["language","format","channels","bit_rate","title"] as $property) { if (isset($audio_element[$property])) { $temp_audio_output[] = $audio_element[$property]; } @@ -357,10 +357,10 @@ public function prepareViewCrumbs($data) if ($data['text'] === null) { $output["text"] = null; } else { - $temp_output = array(); + $temp_output = []; foreach ($data["text"] as $text_element) { - $temp_text_output = array(); - foreach (array("language","format","title") as $property) { + $temp_text_output = []; + foreach (["language","format","title"] as $property) { if (isset($text_element[$property])) { $temp_text_output[] = $text_element[$property]; } diff --git a/app/Hook/ClickableHook.php b/app/Hook/ClickableHook.php index 404dfa9d65..bf993a5ebe 100644 --- a/app/Hook/ClickableHook.php +++ b/app/Hook/ClickableHook.php @@ -28,11 +28,11 @@ public function beforeParse($content) // To make sure we won't parse links inside [url] or [img] tags, we'll first replace all urls/imgs with uniqids // and keep them in this array, and restore them at the end, after parsing - $ignoredStrings = array(); + $ignoredStrings = []; // The tags we won't touch // For example, neither [url="http://www.example.com"] nor [img]http://www.example.com[/img] will be replaced. - $ignoredTags = array('url', 'link', 'img', 'image'); + $ignoredTags = ['url', 'link', 'img', 'image']; $i = 0; foreach ($ignoredTags as $tag) { @@ -99,7 +99,7 @@ public function beforeParse($content) if ($parser->hasFilter('Email')) { $pattern = '(:\/\/[\w\.\+]+:)?([a-z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*)'; - $content = preg_replace_callback('/' . $pattern . '/i', array($this, '_emailCallback'), $content); + $content = preg_replace_callback('/' . $pattern . '/i', [$this, '_emailCallback'], $content); } // We restore the tags we ommited @@ -123,10 +123,10 @@ protected function _emailCallback($matches) return $matches[0]; } - return $this->getParser()->getFilter('Email')->parse(array( + return $this->getParser()->getFilter('Email')->parse([ 'tag' => 'email', - 'attributes' => array() - ), trim($matches[2])); + 'attributes' => [] + ], trim($matches[2])); } /** @@ -137,9 +137,9 @@ protected function _emailCallback($matches) */ protected function _urlCallback($match) { - return $this->getParser()->getFilter('Url')->parse(array( + return $this->getParser()->getFilter('Url')->parse([ 'tag' => 'url', - 'attributes' => array() - ), trim($match)); + 'attributes' => [] + ], trim($match)); } } diff --git a/app/Http/Controllers/AnnounceController.php b/app/Http/Controllers/AnnounceController.php index b938f80b57..6c079c40fb 100644 --- a/app/Http/Controllers/AnnounceController.php +++ b/app/Http/Controllers/AnnounceController.php @@ -444,7 +444,7 @@ public function announce(Request $request, $passkey) $torrent->leechers = Peer::whereRaw('torrent_id = ? AND `left` > 0', [$torrent->id])->count(); $torrent->save(); - $res = array(); + $res = []; $res['interval'] = (60 * 45); $res['min interval'] = (60 * 30); $res['tracker_id'] = $md5_peer_id; // A string that the client should send back on its next announcements. diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index d2f6432a9c..45fe2bd9ad 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -50,7 +50,7 @@ public function register($code = null) if (Request::isMethod('post')) { $key = Invite::where('code', '=', $code)->first(); if (config('other.invite-only') == true && !$key) { - return View::make('auth.register', array('code' => $code))->with(Toastr::warning('Invalid or Expired Invite Key!', 'Error', ['options'])); + return View::make('auth.register', ['code' => $code])->with(Toastr::warning('Invalid or Expired Invite Key!', 'Error', ['options'])); } $current = Carbon::now(); @@ -60,7 +60,7 @@ public function register($code = null) $v = Validator::make($input, $user->rules); if ($v->fails()) { $errors = $v->messages(); - return Redirect::route('register', array('code' => $code))->with(Toastr::warning('Either The Username/Email is already in use or you missed a field. Make sure password is also min 8 charaters!', 'Error', ['options'])); + return Redirect::route('register', ['code' => $code])->with(Toastr::warning('Either The Username/Email is already in use or you missed a field. Make sure password is also min 8 charaters!', 'Error', ['options'])); } else { // Create The User $group = Group::where('slug', '=', 'validating')->first(); @@ -103,6 +103,6 @@ public function register($code = null) return Redirect::route('login')->with(Toastr::info('Thanks for signing up! Please check your email to Validate your account', 'Yay!', ['options'])); } } - return View::make('auth.register', array('code' => $code)); + return View::make('auth.register', ['code' => $code]); } } diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 3504e97c3a..f2072df439 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -46,7 +46,7 @@ private function getUserData() return explode(',', $catArray); } - return array(); + return []; } private function getTorrents() @@ -67,7 +67,7 @@ public function getData($passkey) if ($this->auth($passkey)) { $torrents = $this->getTorrents(); - return Response::view('rss.default', array('passkey' => $passkey, 'torrents' => $torrents))->header('Content-Type', 'text/xml'); + return Response::view('rss.default', ['passkey' => $passkey, 'torrents' => $torrents])->header('Content-Type', 'text/xml'); } return abort(404); diff --git a/config/moderation.php b/config/moderation.php index c280538831..6f4bc168f3 100644 --- a/config/moderation.php +++ b/config/moderation.php @@ -10,7 +10,7 @@ * @author HDVinnie */ -return array( +return [ /* |-------------------------------------------------------------------------- | Status column @@ -45,4 +45,4 @@ | In other case, all resources except Rejected ones, will returned as well. */ 'strict' => true, -); +]; diff --git a/database/seeds/AchievementDetailsTableSeeder.php b/database/seeds/AchievementDetailsTableSeeder.php index 881060b3fc..339b6a0eac 100644 --- a/database/seeds/AchievementDetailsTableSeeder.php +++ b/database/seeds/AchievementDetailsTableSeeder.php @@ -26,9 +26,9 @@ public function run() \DB::table('achievement_details')->delete(); - \DB::table('achievement_details')->insert(array( + \DB::table('achievement_details')->insert([ 0 => - array( + [ 'id' => 2, 'name' => 'FirstComment', 'description' => 'Congratulations! You have made your first comment!', @@ -37,9 +37,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMadeComment', 'created_at' => '2017-02-28 17:22:37', 'updated_at' => '2017-04-21 12:52:01', - ), + ], 1 => - array( + [ 'id' => 3, 'name' => '10Comments', 'description' => 'Wow! You have already made 10 comments!', @@ -48,9 +48,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMadeTenComments', 'created_at' => '2017-02-28 17:22:37', 'updated_at' => '2017-04-21 12:21:06', - ), + ], 2 => - array( + [ 'id' => 4, 'name' => 'FirstUpload', 'description' => 'Congratulations! You have made your first torrent upload!', @@ -59,9 +59,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMadeUpload', 'created_at' => '2017-03-01 13:31:50', 'updated_at' => '2017-03-22 14:59:32', - ), + ], 3 => - array( + [ 'id' => 5, 'name' => '25Uploads', 'description' => 'You have made 25 torrent uploads!', @@ -70,9 +70,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade25Uploads', 'created_at' => '2017-03-02 23:19:34', 'updated_at' => '2017-04-21 12:21:06', - ), + ], 4 => - array( + [ 'id' => 6, 'name' => '50Comments', 'description' => 'Wow! You have already made 50 comments!', @@ -81,9 +81,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade50Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 5 => - array( + [ 'id' => 7, 'name' => '100Comments', 'description' => 'Wow! You have already made 100 comments!', @@ -92,9 +92,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade100Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 6 => - array( + [ 'id' => 8, 'name' => '200Comments', 'description' => 'Wow! You have already made 200 comments!', @@ -103,9 +103,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade200Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 7 => - array( + [ 'id' => 9, 'name' => '300Comments', 'description' => 'Wow! You have already made 300 comments!', @@ -114,9 +114,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade300Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 8 => - array( + [ 'id' => 10, 'name' => '400Comments', 'description' => 'Wow! You have already made 400 comments!', @@ -125,9 +125,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade400Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 9 => - array( + [ 'id' => 11, 'name' => '500Comments', 'description' => 'Wow! You have already made 500 comments!', @@ -136,9 +136,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade500Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 10 => - array( + [ 'id' => 12, 'name' => '600Comments', 'description' => 'Wow! You have already made 600 comments!', @@ -147,9 +147,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade600Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 11 => - array( + [ 'id' => 13, 'name' => '700Comments', 'description' => 'Wow! You have already made 700 comments!', @@ -158,9 +158,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade700Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 12 => - array( + [ 'id' => 14, 'name' => '800Comments', 'description' => 'Wow! You have already made 800 comments!', @@ -169,9 +169,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade800Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 13 => - array( + [ 'id' => 15, 'name' => '900Comments', 'description' => 'DAMN BRO! You have made 900 comments!', @@ -180,9 +180,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade900Comments', 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', - ), + ], 14 => - array( + [ 'id' => 16, 'name' => '50Uploads', 'description' => 'You have made 50 torrent uploads!', @@ -191,9 +191,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade50Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 15 => - array( + [ 'id' => 17, 'name' => '100Uploads', 'description' => 'You have made 100 torrent uploads!', @@ -202,9 +202,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade100Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 16 => - array( + [ 'id' => 18, 'name' => '200Uploads', 'description' => 'You have made 200 torrent uploads!', @@ -213,9 +213,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade200Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 17 => - array( + [ 'id' => 19, 'name' => '300Uploads', 'description' => 'You have made 300 torrent uploads!', @@ -224,9 +224,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade300Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 18 => - array( + [ 'id' => 20, 'name' => '400Uploads', 'description' => 'You have made 400 torrent uploads!', @@ -235,9 +235,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade400Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 19 => - array( + [ 'id' => 21, 'name' => '500Uploads', 'description' => 'You have made 500 torrent uploads!', @@ -246,9 +246,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade500Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 20 => - array( + [ 'id' => 22, 'name' => '600Uploads', 'description' => 'You have made 600 torrent uploads!', @@ -257,9 +257,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade600Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 21 => - array( + [ 'id' => 23, 'name' => '700Uploads', 'description' => 'You have made 700 torrent uploads!', @@ -268,9 +268,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade700Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 22 => - array( + [ 'id' => 24, 'name' => '800Uploads', 'description' => 'You have made 800 torrent uploads!', @@ -279,9 +279,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade800Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 23 => - array( + [ 'id' => 25, 'name' => '900Uploads', 'description' => 'DAMN BRO, you have made 900 torrent uploads!', @@ -290,9 +290,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade900Uploads', 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', - ), + ], 24 => - array( + [ 'id' => 26, 'name' => 'FirstPost', 'description' => 'Congratulations! You have made your first post!', @@ -301,9 +301,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMadeFirstPost', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:38:48', - ), + ], 25 => - array( + [ 'id' => 27, 'name' => '25Posts', 'description' => 'Wow! You have already made 25 posts!', @@ -312,9 +312,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade25Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 26 => - array( + [ 'id' => 28, 'name' => '50Posts', 'description' => 'Wow! You have already made 50 posts!', @@ -323,9 +323,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade50Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 27 => - array( + [ 'id' => 29, 'name' => '100Posts', 'description' => 'Wow! You have already made 100 posts!', @@ -334,9 +334,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade100Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 28 => - array( + [ 'id' => 30, 'name' => '200Posts', 'description' => 'Wow! You have already made 200 posts!', @@ -345,9 +345,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade200Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 29 => - array( + [ 'id' => 31, 'name' => '300Posts', 'description' => 'Wow! You have already made 300 posts!', @@ -356,9 +356,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade300Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 30 => - array( + [ 'id' => 32, 'name' => '400Posts', 'description' => 'Wow! You have already made 400 posts!', @@ -367,9 +367,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade400Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 31 => - array( + [ 'id' => 33, 'name' => '500Posts', 'description' => 'Wow! You have already made 500 posts!', @@ -378,9 +378,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade500Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 32 => - array( + [ 'id' => 34, 'name' => '600Posts', 'description' => 'Wow! You have already made 600 posts!', @@ -389,9 +389,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade600Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 33 => - array( + [ 'id' => 35, 'name' => '700Posts', 'description' => 'Wow! You have already made 700 posts!', @@ -400,9 +400,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade700Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 34 => - array( + [ 'id' => 36, 'name' => '800Posts', 'description' => 'Wow! You have already made 800 posts!', @@ -411,9 +411,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade800Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 35 => - array( + [ 'id' => 37, 'name' => '900Posts', 'description' => 'Wow! You have already made 900 posts!', @@ -422,9 +422,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserMade900Posts', 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', - ), + ], 36 => - array( + [ 'id' => 38, 'name' => 'Filled25Requests', 'description' => 'Congrats! You have already filled 25 requests!', @@ -433,9 +433,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserFilled25Requests', 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', - ), + ], 37 => - array( + [ 'id' => 39, 'name' => 'Filled50Requests', 'description' => 'Wow! You have already filled 50 requests!', @@ -444,9 +444,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserFilled50Requests', 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', - ), + ], 38 => - array( + [ 'id' => 40, 'name' => 'Filled75Requests', 'description' => 'Woot! You have already filled 75 requests!', @@ -455,9 +455,9 @@ public function run() 'class_name' => 'App\\Achievements\\UserFilled75Requests', 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', - ), + ], 39 => - array( + [ 'id' => 41, 'name' => 'Filled100Requests', 'description' => 'DAMN BRO! You have already filled 100 requests!', @@ -466,7 +466,7 @@ public function run() 'class_name' => 'App\\Achievements\\UserFilled100Requests', 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', - ), - )); + ], + ]); } } diff --git a/database/seeds/ArticlesTableSeeder.php b/database/seeds/ArticlesTableSeeder.php index c8a8caee76..5e306287ff 100644 --- a/database/seeds/ArticlesTableSeeder.php +++ b/database/seeds/ArticlesTableSeeder.php @@ -26,9 +26,9 @@ public function run() \DB::table('articles')->delete(); - \DB::table('articles')->insert(array( + \DB::table('articles')->insert([ 0 => - array( + [ 'id' => 1, 'title' => 'Welcome To UNIT3D', 'slug' => 'welcome_to_unit3d', @@ -36,7 +36,7 @@ public function run() 'user_id' => 3, 'created_at' => '2017-02-28 17:22:37', 'updated_at' => '2017-04-21 12:21:06', - ), - )); + ], + ]); } } diff --git a/database/seeds/BonExchangeTableSeeder.php b/database/seeds/BonExchangeTableSeeder.php index 2e48c7ca79..3cf889e395 100644 --- a/database/seeds/BonExchangeTableSeeder.php +++ b/database/seeds/BonExchangeTableSeeder.php @@ -26,9 +26,9 @@ public function run() \DB::table('bon_exchange')->delete(); - \DB::table('bon_exchange')->insert(array( + \DB::table('bon_exchange')->insert([ 0 => - array( + [ 'id' => 1, 'description' => '2 GB Upload', 'value' => 2147483648, @@ -37,9 +37,9 @@ public function run() 'download' => 0, 'personal_freeleech' => 0, 'invite' => 0, - ), + ], 1 => - array( + [ 'id' => 2, 'description' => '10 GB Upload', 'value' => 10737418240, @@ -48,9 +48,9 @@ public function run() 'download' => 0, 'personal_freeleech' => 0, 'invite' => 0, - ), + ], 2 => - array( + [ 'id' => 3, 'description' => '25 GB Upload', 'value' => 26843545600, @@ -59,9 +59,9 @@ public function run() 'download' => 0, 'personal_freeleech' => 0, 'invite' => 0, - ), + ], 3 => - array( + [ 'id' => 4, 'description' => '100 GB Upload', 'value' => 107374182400, @@ -70,9 +70,9 @@ public function run() 'download' => 0, 'personal_freeleech' => 0, 'invite' => 0, - ), + ], 4 => - array( + [ 'id' => 9, 'description' => '1 Invite', 'value' => 1, @@ -81,9 +81,9 @@ public function run() 'download' => 0, 'personal_freeleech' => 0, 'invite' => 1, - ), + ], 5 => - array( + [ 'id' => 10, 'description' => 'Personal 24Hr Freeleech', 'value' => 1, @@ -92,7 +92,7 @@ public function run() 'download' => 0, 'personal_freeleech' => 1, 'invite' => 0, - ), - )); + ], + ]); } } diff --git a/database/seeds/CategoriesTableSeeder.php b/database/seeds/CategoriesTableSeeder.php index b69fdae534..a18b3df006 100644 --- a/database/seeds/CategoriesTableSeeder.php +++ b/database/seeds/CategoriesTableSeeder.php @@ -26,34 +26,34 @@ public function run() \DB::table('categories')->delete(); - \DB::table('categories')->insert(array( + \DB::table('categories')->insert([ 0 => - array( + [ 'id' => 1, 'name' => 'Movies', 'slug' => 'movies', 'icon' => 'fa fa-film', 'num_torrent' => 0, 'meta' => 1, - ), + ], 1 => - array( + [ 'id' => 2, 'name' => 'TV', 'slug' => 'tv', 'icon' => 'fa fa-television', 'num_torrent' => 0, 'meta' => 1, - ), + ], 2 => - array( + [ 'id' => 3, 'name' => 'Music', 'slug' => 'music', 'icon' => 'fa fa-music', 'num_torrent' => 0, 'meta' => 0, - ), - )); + ], + ]); } } diff --git a/database/seeds/GroupsTableSeeder.php b/database/seeds/GroupsTableSeeder.php index 93f293f38b..e77b8d5230 100644 --- a/database/seeds/GroupsTableSeeder.php +++ b/database/seeds/GroupsTableSeeder.php @@ -26,9 +26,9 @@ public function run() \DB::table('groups')->delete(); - \DB::table('groups')->insert(array( + \DB::table('groups')->insert([ 0 => - array( + [ 'id' => 1, 'name' => 'Validating', 'slug' => 'validating', @@ -42,9 +42,9 @@ public function run() 'is_immune' => 0, 'is_freeleech' => 0, 'autogroup' => 0, - ), + ], 1 => - array( + [ 'id' => 2, 'name' => 'Guest', 'slug' => 'guest', @@ -58,9 +58,9 @@ public function run() 'is_immune' => 0, 'is_freeleech' => 0, 'autogroup' => 0, - ), + ], 2 => - array( + [ 'id' => 3, 'name' => 'User', 'slug' => 'user', @@ -74,9 +74,9 @@ public function run() 'is_immune' => 0, 'is_freeleech' => 0, 'autogroup' => 1, - ), + ], 3 => - array( + [ 'id' => 4, 'name' => 'Administrator', 'slug' => 'administrator', @@ -90,9 +90,9 @@ public function run() 'is_immune' => 1, 'is_freeleech' => 0, 'autogroup' => 0, - ), + ], 4 => - array( + [ 'id' => 5, 'name' => 'Banned', 'slug' => 'banned', @@ -106,9 +106,9 @@ public function run() 'is_immune' => 0, 'is_freeleech' => 0, 'autogroup' => 0, - ), + ], 5 => - array( + [ 'id' => 6, 'name' => 'Moderator', 'slug' => 'moderator', @@ -122,9 +122,9 @@ public function run() 'is_immune' => 1, 'is_freeleech' => 0, 'autogroup' => 0, - ), + ], 6 => - array( + [ 'id' => 7, 'name' => 'Uploader', 'slug' => 'uploader', @@ -138,9 +138,9 @@ public function run() 'is_immune' => 1, 'is_freeleech' => 1, 'autogroup' => 0, - ), + ], 7 => - array( + [ 'id' => 8, 'name' => 'Trustee', 'slug' => 'trustee', @@ -154,9 +154,9 @@ public function run() 'is_immune' => 1, 'is_freeleech' => 1, 'autogroup' => 0, - ), + ], 8 => - array( + [ 'id' => 9, 'name' => 'Bot', 'slug' => 'bot', @@ -170,9 +170,9 @@ public function run() 'is_immune' => 1, 'is_freeleech' => 0, 'autogroup' => 0, - ), + ], 9 => - array( + [ 'id' => 10, 'name' => 'Owner', 'slug' => 'owner', @@ -186,9 +186,9 @@ public function run() 'is_immune' => 1, 'is_freeleech' => 0, 'autogroup' => 0, - ), + ], 10 => - array( + [ 'id' => 11, 'name' => 'PowerUser', 'slug' => 'poweruser', @@ -202,9 +202,9 @@ public function run() 'is_immune' => 0, 'is_freeleech' => 0, 'autogroup' => 1, - ), + ], 11 => - array( + [ 'id' => 12, 'name' => 'SuperUser', 'slug' => 'superuser', @@ -218,9 +218,9 @@ public function run() 'is_immune' => 0, 'is_freeleech' => 0, 'autogroup' => 1, - ), + ], 12 => - array( + [ 'id' => 13, 'name' => 'ExtremeUser', 'slug' => 'extremeuser', @@ -234,9 +234,9 @@ public function run() 'is_immune' => 0, 'is_freeleech' => 0, 'autogroup' => 1, - ), + ], 13 => - array( + [ 'id' => 14, 'name' => 'InsaneUser', 'slug' => 'insaneuser', @@ -250,9 +250,9 @@ public function run() 'is_immune' => 0, 'is_freeleech' => 0, 'autogroup' => 1, - ), + ], 14 => - array( + [ 'id' => 15, 'name' => 'Leech', 'slug' => 'leech', @@ -266,9 +266,9 @@ public function run() 'is_immune' => 0, 'is_freeleech' => 0, 'autogroup' => 1, - ), + ], 15 => - array( + [ 'id' => 16, 'name' => 'Veteran', 'slug' => 'veteran', @@ -282,9 +282,9 @@ public function run() 'is_immune' => 1, 'is_freeleech' => 1, 'autogroup' => 1, - ), + ], 16 => - array( + [ 'id' => 17, 'name' => 'Seeder', 'slug' => 'seeder', @@ -298,9 +298,9 @@ public function run() 'is_immune' => 1, 'is_freeleech' => 0, 'autogroup' => 1, - ), + ], 17 => - array( + [ 'id' => 18, 'name' => 'Archivist', 'slug' => 'archivist', @@ -314,7 +314,7 @@ public function run() 'is_immune' => 1, 'is_freeleech' => 1, 'autogroup' => 1, - ), - )); + ], + ]); } } diff --git a/database/seeds/PagesTableSeeder.php b/database/seeds/PagesTableSeeder.php index 9b08265068..58616c35bd 100644 --- a/database/seeds/PagesTableSeeder.php +++ b/database/seeds/PagesTableSeeder.php @@ -27,54 +27,54 @@ public function run() \DB::table('pages')->delete(); $appurl = env('APP_URL', 'http://unit3d.site'); - \DB::table('pages')->insert(array( + \DB::table('pages')->insert([ 0 => - array( + [ 'id' => 1, 'name' => 'Rules', 'slug' => 'rules', 'content' => 'RULES GOES HERE', 'created_at' => '2016-12-20 22:09:45', 'updated_at' => '2017-12-01 13:39:43', - ), + ], 1 => - array( + [ 'id' => 3, 'name' => 'FAQ', 'slug' => 'faq', 'content' => 'FAQ GOES HERE', 'created_at' => '2017-10-28 21:26:15', 'updated_at' => '2017-10-28 21:26:15', - ), + ], 2 => - array( + [ 'id' => 4, 'name' => 'Suggested Clients', 'slug' => 'suggested-clients', 'content' => 'We suggest the following BitTorrent clients.', 'created_at' => '2017-01-27 15:52:01', 'updated_at' => '2017-08-07 17:30:56', - ), + ], 3 => - array( + [ 'id' => 5, 'name' => 'Upload Guide', 'slug' => 'upload-guide', 'content' => 'UPLOAD GUIDE HERE', 'created_at' => '2017-04-24 14:45:03', 'updated_at' => '2017-08-07 17:34:42', - ), + ], 4 => - array( + [ 'id' => 6, 'name' => 'Tracker Codes', 'slug' => 'tracker-codes', 'content' => 'Our Tracker Codes/Responses', 'created_at' => '2017-09-08 14:23:16', 'updated_at' => '2017-09-08 14:27:12', - ), + ], 5 => - array( + [ 'id' => 7, 'name' => 'Terms Of Use', 'slug' => 'terms-of-use', @@ -159,7 +159,7 @@ public function run() (F) ANY ERRORS OR OMISSIONS IN ANY CONTRIBUTIONS, CONTENT AND MATERIALS OR FOR ANY LOSS OR DAMAGE OF ANY KIND INCURRED AS A RESULT OF THE USE OF ANY CONTENT, CONTRIBUTIONS, OR MATERIALS POSTED, TRANSMITTED, OR OTHERWISE MADE AVAILABLE VIA THIS SITE.WE WILL NOT BE LIABLE TO YOU FOR ANY LOSS OF ANY DATA (INCLUDING CONTENT) OR FOR LOSS OF USE OF THIS SITE.SOME STATES OR JURISDICTIONS DO NOT ALLOW THE LIMITATION OR EXCLUSION OF CERTAIN WARRANTIES, OR THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES. IF YOU RESIDE IN ONE OF THESE STATES OR JURISDICTIONS, THE ABOVE LIMITATIONS OR EXCLUSIONS MAY NOT APPLY TO YOU.', 'created_at' => '2017-10-03 14:50:15', 'updated_at' => '2017-10-03 18:31:25', - ), - )); + ], + ]); } } diff --git a/database/seeds/TypesTableSeeder.php b/database/seeds/TypesTableSeeder.php index 490a77a335..9c5ab1a5ce 100644 --- a/database/seeds/TypesTableSeeder.php +++ b/database/seeds/TypesTableSeeder.php @@ -26,98 +26,98 @@ public function run() \DB::table('types')->delete(); - \DB::table('types')->insert(array( + \DB::table('types')->insert([ 0 => - array( + [ 'id' => 1, 'name' => 'UHD-100', 'slug' => 'uhd-100', 'position' => 0, - ), + ], 1 => - array( + [ 'id' => 2, 'name' => 'UHD-66', 'slug' => 'uhd-66', 'position' => 1, - ), + ], 2 => - array( + [ 'id' => 3, 'name' => 'UHD-50', 'slug' => 'uhd-50', 'position' => 2, - ), + ], 3 => - array( + [ 'id' => 4, 'name' => 'BD50', 'slug' => 'bd50', 'position' => 4, - ), + ], 4 => - array( + [ 'id' => 5, 'name' => 'BD25', 'slug' => 'bd25', 'position' => 5, - ), + ], 5 => - array( + [ 'id' => 6, 'name' => 'BD25Encode', 'slug' => 'bd25encode', 'position' => 6, - ), + ], 6 => - array( + [ 'id' => 7, 'name' => 'Remux', 'slug' => 'remux', 'position' => 7, - ), + ], 7 => - array( + [ 'id' => 8, 'name' => '2160p', 'slug' => '2160p', 'position' => 8, - ), + ], 8 => - array( + [ 'id' => 9, 'name' => '1080p', 'slug' => '1080p', 'position' => 9, - ), + ], 9 => - array( + [ 'id' => 10, 'name' => '900p', 'slug' => '900p', 'position' => 10, - ), + ], 10 => - array( + [ 'id' => 11, 'name' => '720p', 'slug' => '720p', 'position' => 11, - ), + ], 11 => - array( + [ 'id' => 12, 'name' => 'UHD-Remux', 'slug' => 'uhd-remux', 'position' => 3, - ), + ], 12 => - array( + [ 'id' => 13, 'name' => 'SD', 'slug' => 'sd', 'position' => 12, - ), - )); + ], + ]); } } From b02e933c19c2445503fdf2dbba834a2947dcc93b Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 18 Jan 2018 01:04:20 +0000 Subject: [PATCH 03/14] Shift Middleware --- app/Http/Kernel.php | 1 + app/Http/Middleware/EncryptCookies.php | 4 ++-- app/Http/Middleware/TrustProxies.php | 29 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 app/Http/Middleware/TrustProxies.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 2459eaa009..fe3a9c3f81 100755 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -19,6 +19,7 @@ class Kernel extends HttpKernel \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, + \App\Http\Middleware\TrustProxies::class, //Secure Headers \Bepsvpt\SecureHeaders\SecureHeadersMiddleware::class, diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index 3aa15f8dd9..033136ad12 100755 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -2,9 +2,9 @@ namespace App\Http\Middleware; -use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter; +use Illuminate\Cookie\Middleware\EncryptCookies as Middleware; -class EncryptCookies extends BaseEncrypter +class EncryptCookies extends Middleware { /** * The names of the cookies that should not be encrypted. diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php new file mode 100644 index 0000000000..ef1c00d10c --- /dev/null +++ b/app/Http/Middleware/TrustProxies.php @@ -0,0 +1,29 @@ + 'FORWARDED', + Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR', + Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST', + Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT', + Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO', + ]; +} From 635db06b15e5827690f0a372a7e757fa7133e8cb Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 18 Jan 2018 01:04:21 +0000 Subject: [PATCH 04/14] Shift console commands --- app/Console/Kernel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 87fe4284c0..0c4f1c82d5 100755 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -59,6 +59,7 @@ protected function schedule(Schedule $schedule) */ protected function commands() { + $this->load(__DIR__.'/Commands'); require base_path('routes/console.php'); } } From 7e2f7cd06e3daab91fbb87bb9572936e3146ec96 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 18 Jan 2018 01:04:21 +0000 Subject: [PATCH 05/14] Shift core files --- artisan | 12 +++++++----- phpunit.xml | 13 +++++++------ public/.htaccess | 3 ++- public/index.php | 11 +++++++---- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/artisan b/artisan index eb5e2bb62d..5c23e2e24f 100755 --- a/artisan +++ b/artisan @@ -1,6 +1,8 @@ #!/usr/bin/env php make('Illuminate\Contracts\Console\Kernel'); +$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class); $status = $kernel->handle( - $input = new Symfony\Component\Console\Input\ArgvInput, - new Symfony\Component\Console\Output\ConsoleOutput + $input = new Symfony\Component\Console\Input\ArgvInput, + new Symfony\Component\Console\Output\ConsoleOutput ); /* @@ -40,7 +42,7 @@ $status = $kernel->handle( | Shutdown The Application |-------------------------------------------------------------------------- | -| Once Artisan has finished running. We will fire off the shutdown events +| Once Artisan has finished running, we will fire off the shutdown events | so that any final work may be done by the application before we shut | down the process. This is the last thing to happen to the request. | diff --git a/phpunit.xml b/phpunit.xml index 3e884d179c..bb9c4a7e1e 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,7 +1,7 @@ - - ./tests + + ./tests/Feature + + + + ./tests/Unit ./app - - ./app/Http/routes.php - diff --git a/public/.htaccess b/public/.htaccess index 903f6392ca..09683488bd 100755 --- a/public/.htaccess +++ b/public/.htaccess @@ -7,7 +7,8 @@ # Redirect Trailing Slashes If Not A Folder... RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^(.*)/$ /$1 [L,R=301] + RewriteCond %{REQUEST_URI} (.+)/$ + RewriteRule ^ %1 [L,R=301] # Handle Front Controller... RewriteCond %{REQUEST_FILENAME} !-d diff --git a/public/index.php b/public/index.php index 6778d8aa14..4584cbcd6a 100755 --- a/public/index.php +++ b/public/index.php @@ -1,11 +1,14 @@ + * @author Taylor Otwell */ +define('LARAVEL_START', microtime(true)); + /* |-------------------------------------------------------------------------- | Register The Auto Loader @@ -14,11 +17,11 @@ | Composer provides a convenient, automatically generated class loader for | our application. We just need to utilize it! We'll simply require it | into the script here so that we don't have to worry about manual -| loading any of our classes later on. It feels nice to relax. +| loading any of our classes later on. It feels great to relax. | */ -require __DIR__.'/../bootstrap/autoload.php'; +require __DIR__.'/../vendor/autoload.php'; /* |-------------------------------------------------------------------------- @@ -46,7 +49,7 @@ | */ -$kernel = $app->make('Illuminate\Contracts\Http\Kernel'); +$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class); $response = $kernel->handle( $request = Illuminate\Http\Request::capture() From 9499808a07004c9c8067d8e10bce0db23527cb22 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 18 Jan 2018 01:04:22 +0000 Subject: [PATCH 06/14] Shift configuration --- config/app.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/app.php b/config/app.php index de8f3bf5a4..05b60097e0 100755 --- a/config/app.php +++ b/config/app.php @@ -177,7 +177,6 @@ /* * Package Service Providers... */ - Laravel\Tinker\TinkerServiceProvider::class, Collective\Html\HtmlServiceProvider::class, Spatie\CookieConsent\CookieConsentServiceProvider::class, Brian2694\Toastr\ToastrServiceProvider::class, From c8097325ebe0d70bc22248f22224b62348c8936c Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 18 Jan 2018 01:04:50 +0000 Subject: [PATCH 07/14] Shift cleanup --- .../seeds/AchievementDetailsTableSeeder.php | 78 +++++++++---------- database/seeds/BonExchangeTableSeeder.php | 10 +-- database/seeds/CategoriesTableSeeder.php | 4 +- database/seeds/GroupsTableSeeder.php | 34 ++++---- database/seeds/PagesTableSeeder.php | 10 +-- database/seeds/TypesTableSeeder.php | 24 +++--- 6 files changed, 80 insertions(+), 80 deletions(-) diff --git a/database/seeds/AchievementDetailsTableSeeder.php b/database/seeds/AchievementDetailsTableSeeder.php index 339b6a0eac..03c649e8ce 100644 --- a/database/seeds/AchievementDetailsTableSeeder.php +++ b/database/seeds/AchievementDetailsTableSeeder.php @@ -38,7 +38,7 @@ public function run() 'created_at' => '2017-02-28 17:22:37', 'updated_at' => '2017-04-21 12:52:01', ], - 1 => + 1 => [ 'id' => 3, 'name' => '10Comments', @@ -49,7 +49,7 @@ public function run() 'created_at' => '2017-02-28 17:22:37', 'updated_at' => '2017-04-21 12:21:06', ], - 2 => + 2 => [ 'id' => 4, 'name' => 'FirstUpload', @@ -60,7 +60,7 @@ public function run() 'created_at' => '2017-03-01 13:31:50', 'updated_at' => '2017-03-22 14:59:32', ], - 3 => + 3 => [ 'id' => 5, 'name' => '25Uploads', @@ -71,7 +71,7 @@ public function run() 'created_at' => '2017-03-02 23:19:34', 'updated_at' => '2017-04-21 12:21:06', ], - 4 => + 4 => [ 'id' => 6, 'name' => '50Comments', @@ -82,7 +82,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 5 => + 5 => [ 'id' => 7, 'name' => '100Comments', @@ -93,7 +93,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 6 => + 6 => [ 'id' => 8, 'name' => '200Comments', @@ -104,7 +104,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 7 => + 7 => [ 'id' => 9, 'name' => '300Comments', @@ -115,7 +115,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 8 => + 8 => [ 'id' => 10, 'name' => '400Comments', @@ -126,7 +126,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 9 => + 9 => [ 'id' => 11, 'name' => '500Comments', @@ -137,7 +137,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 10 => + 10 => [ 'id' => 12, 'name' => '600Comments', @@ -148,7 +148,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 11 => + 11 => [ 'id' => 13, 'name' => '700Comments', @@ -159,7 +159,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 12 => + 12 => [ 'id' => 14, 'name' => '800Comments', @@ -170,7 +170,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 13 => + 13 => [ 'id' => 15, 'name' => '900Comments', @@ -181,7 +181,7 @@ public function run() 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], - 14 => + 14 => [ 'id' => 16, 'name' => '50Uploads', @@ -192,7 +192,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 15 => + 15 => [ 'id' => 17, 'name' => '100Uploads', @@ -203,7 +203,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 16 => + 16 => [ 'id' => 18, 'name' => '200Uploads', @@ -214,7 +214,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 17 => + 17 => [ 'id' => 19, 'name' => '300Uploads', @@ -225,7 +225,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 18 => + 18 => [ 'id' => 20, 'name' => '400Uploads', @@ -236,7 +236,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 19 => + 19 => [ 'id' => 21, 'name' => '500Uploads', @@ -247,7 +247,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 20 => + 20 => [ 'id' => 22, 'name' => '600Uploads', @@ -258,7 +258,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 21 => + 21 => [ 'id' => 23, 'name' => '700Uploads', @@ -269,7 +269,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 22 => + 22 => [ 'id' => 24, 'name' => '800Uploads', @@ -280,7 +280,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 23 => + 23 => [ 'id' => 25, 'name' => '900Uploads', @@ -291,7 +291,7 @@ public function run() 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], - 24 => + 24 => [ 'id' => 26, 'name' => 'FirstPost', @@ -302,7 +302,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:38:48', ], - 25 => + 25 => [ 'id' => 27, 'name' => '25Posts', @@ -313,7 +313,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 26 => + 26 => [ 'id' => 28, 'name' => '50Posts', @@ -324,7 +324,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 27 => + 27 => [ 'id' => 29, 'name' => '100Posts', @@ -335,7 +335,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 28 => + 28 => [ 'id' => 30, 'name' => '200Posts', @@ -346,7 +346,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 29 => + 29 => [ 'id' => 31, 'name' => '300Posts', @@ -357,7 +357,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 30 => + 30 => [ 'id' => 32, 'name' => '400Posts', @@ -368,7 +368,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 31 => + 31 => [ 'id' => 33, 'name' => '500Posts', @@ -379,7 +379,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 32 => + 32 => [ 'id' => 34, 'name' => '600Posts', @@ -390,7 +390,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 33 => + 33 => [ 'id' => 35, 'name' => '700Posts', @@ -401,7 +401,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 34 => + 34 => [ 'id' => 36, 'name' => '800Posts', @@ -412,7 +412,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 35 => + 35 => [ 'id' => 37, 'name' => '900Posts', @@ -423,7 +423,7 @@ public function run() 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], - 36 => + 36 => [ 'id' => 38, 'name' => 'Filled25Requests', @@ -434,7 +434,7 @@ public function run() 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', ], - 37 => + 37 => [ 'id' => 39, 'name' => 'Filled50Requests', @@ -445,7 +445,7 @@ public function run() 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', ], - 38 => + 38 => [ 'id' => 40, 'name' => 'Filled75Requests', @@ -456,7 +456,7 @@ public function run() 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', ], - 39 => + 39 => [ 'id' => 41, 'name' => 'Filled100Requests', diff --git a/database/seeds/BonExchangeTableSeeder.php b/database/seeds/BonExchangeTableSeeder.php index 3cf889e395..dcb89cbc6f 100644 --- a/database/seeds/BonExchangeTableSeeder.php +++ b/database/seeds/BonExchangeTableSeeder.php @@ -38,7 +38,7 @@ public function run() 'personal_freeleech' => 0, 'invite' => 0, ], - 1 => + 1 => [ 'id' => 2, 'description' => '10 GB Upload', @@ -49,7 +49,7 @@ public function run() 'personal_freeleech' => 0, 'invite' => 0, ], - 2 => + 2 => [ 'id' => 3, 'description' => '25 GB Upload', @@ -60,7 +60,7 @@ public function run() 'personal_freeleech' => 0, 'invite' => 0, ], - 3 => + 3 => [ 'id' => 4, 'description' => '100 GB Upload', @@ -71,7 +71,7 @@ public function run() 'personal_freeleech' => 0, 'invite' => 0, ], - 4 => + 4 => [ 'id' => 9, 'description' => '1 Invite', @@ -82,7 +82,7 @@ public function run() 'personal_freeleech' => 0, 'invite' => 1, ], - 5 => + 5 => [ 'id' => 10, 'description' => 'Personal 24Hr Freeleech', diff --git a/database/seeds/CategoriesTableSeeder.php b/database/seeds/CategoriesTableSeeder.php index a18b3df006..627fa32801 100644 --- a/database/seeds/CategoriesTableSeeder.php +++ b/database/seeds/CategoriesTableSeeder.php @@ -36,7 +36,7 @@ public function run() 'num_torrent' => 0, 'meta' => 1, ], - 1 => + 1 => [ 'id' => 2, 'name' => 'TV', @@ -45,7 +45,7 @@ public function run() 'num_torrent' => 0, 'meta' => 1, ], - 2 => + 2 => [ 'id' => 3, 'name' => 'Music', diff --git a/database/seeds/GroupsTableSeeder.php b/database/seeds/GroupsTableSeeder.php index e77b8d5230..7de9b31607 100644 --- a/database/seeds/GroupsTableSeeder.php +++ b/database/seeds/GroupsTableSeeder.php @@ -43,7 +43,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 0, ], - 1 => + 1 => [ 'id' => 2, 'name' => 'Guest', @@ -59,7 +59,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 0, ], - 2 => + 2 => [ 'id' => 3, 'name' => 'User', @@ -75,7 +75,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 1, ], - 3 => + 3 => [ 'id' => 4, 'name' => 'Administrator', @@ -91,7 +91,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 0, ], - 4 => + 4 => [ 'id' => 5, 'name' => 'Banned', @@ -107,7 +107,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 0, ], - 5 => + 5 => [ 'id' => 6, 'name' => 'Moderator', @@ -123,7 +123,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 0, ], - 6 => + 6 => [ 'id' => 7, 'name' => 'Uploader', @@ -139,7 +139,7 @@ public function run() 'is_freeleech' => 1, 'autogroup' => 0, ], - 7 => + 7 => [ 'id' => 8, 'name' => 'Trustee', @@ -155,7 +155,7 @@ public function run() 'is_freeleech' => 1, 'autogroup' => 0, ], - 8 => + 8 => [ 'id' => 9, 'name' => 'Bot', @@ -171,7 +171,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 0, ], - 9 => + 9 => [ 'id' => 10, 'name' => 'Owner', @@ -187,7 +187,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 0, ], - 10 => + 10 => [ 'id' => 11, 'name' => 'PowerUser', @@ -203,7 +203,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 1, ], - 11 => + 11 => [ 'id' => 12, 'name' => 'SuperUser', @@ -219,7 +219,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 1, ], - 12 => + 12 => [ 'id' => 13, 'name' => 'ExtremeUser', @@ -235,7 +235,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 1, ], - 13 => + 13 => [ 'id' => 14, 'name' => 'InsaneUser', @@ -251,7 +251,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 1, ], - 14 => + 14 => [ 'id' => 15, 'name' => 'Leech', @@ -267,7 +267,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 1, ], - 15 => + 15 => [ 'id' => 16, 'name' => 'Veteran', @@ -283,7 +283,7 @@ public function run() 'is_freeleech' => 1, 'autogroup' => 1, ], - 16 => + 16 => [ 'id' => 17, 'name' => 'Seeder', @@ -299,7 +299,7 @@ public function run() 'is_freeleech' => 0, 'autogroup' => 1, ], - 17 => + 17 => [ 'id' => 18, 'name' => 'Archivist', diff --git a/database/seeds/PagesTableSeeder.php b/database/seeds/PagesTableSeeder.php index 58616c35bd..dc1166dd03 100644 --- a/database/seeds/PagesTableSeeder.php +++ b/database/seeds/PagesTableSeeder.php @@ -37,7 +37,7 @@ public function run() 'created_at' => '2016-12-20 22:09:45', 'updated_at' => '2017-12-01 13:39:43', ], - 1 => + 1 => [ 'id' => 3, 'name' => 'FAQ', @@ -46,7 +46,7 @@ public function run() 'created_at' => '2017-10-28 21:26:15', 'updated_at' => '2017-10-28 21:26:15', ], - 2 => + 2 => [ 'id' => 4, 'name' => 'Suggested Clients', @@ -55,7 +55,7 @@ public function run() 'created_at' => '2017-01-27 15:52:01', 'updated_at' => '2017-08-07 17:30:56', ], - 3 => + 3 => [ 'id' => 5, 'name' => 'Upload Guide', @@ -64,7 +64,7 @@ public function run() 'created_at' => '2017-04-24 14:45:03', 'updated_at' => '2017-08-07 17:34:42', ], - 4 => + 4 => [ 'id' => 6, 'name' => 'Tracker Codes', @@ -73,7 +73,7 @@ public function run() 'created_at' => '2017-09-08 14:23:16', 'updated_at' => '2017-09-08 14:27:12', ], - 5 => + 5 => [ 'id' => 7, 'name' => 'Terms Of Use', diff --git a/database/seeds/TypesTableSeeder.php b/database/seeds/TypesTableSeeder.php index 9c5ab1a5ce..83e06d0c9e 100644 --- a/database/seeds/TypesTableSeeder.php +++ b/database/seeds/TypesTableSeeder.php @@ -34,84 +34,84 @@ public function run() 'slug' => 'uhd-100', 'position' => 0, ], - 1 => + 1 => [ 'id' => 2, 'name' => 'UHD-66', 'slug' => 'uhd-66', 'position' => 1, ], - 2 => + 2 => [ 'id' => 3, 'name' => 'UHD-50', 'slug' => 'uhd-50', 'position' => 2, ], - 3 => + 3 => [ 'id' => 4, 'name' => 'BD50', 'slug' => 'bd50', 'position' => 4, ], - 4 => + 4 => [ 'id' => 5, 'name' => 'BD25', 'slug' => 'bd25', 'position' => 5, ], - 5 => + 5 => [ 'id' => 6, 'name' => 'BD25Encode', 'slug' => 'bd25encode', 'position' => 6, ], - 6 => + 6 => [ 'id' => 7, 'name' => 'Remux', 'slug' => 'remux', 'position' => 7, ], - 7 => + 7 => [ 'id' => 8, 'name' => '2160p', 'slug' => '2160p', 'position' => 8, ], - 8 => + 8 => [ 'id' => 9, 'name' => '1080p', 'slug' => '1080p', 'position' => 9, ], - 9 => + 9 => [ 'id' => 10, 'name' => '900p', 'slug' => '900p', 'position' => 10, ], - 10 => + 10 => [ 'id' => 11, 'name' => '720p', 'slug' => '720p', 'position' => 11, ], - 11 => + 11 => [ 'id' => 12, 'name' => 'UHD-Remux', 'slug' => 'uhd-remux', 'position' => 3, ], - 12 => + 12 => [ 'id' => 13, 'name' => 'SD', From 52a9e9b0f9e34a8ddd4c6056cb9e21f53f009ee7 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 18 Jan 2018 01:04:53 +0000 Subject: [PATCH 08/14] Shift bindings Since Laravel 5.1 requires PHP 5.5.9+ using the *new* static `class` property to get the fully qualified name of a class is preferred over using class name strings. --- app/Like.php | 4 +- app/Option.php | 2 +- app/Poll.php | 6 +- app/Post.php | 2 +- app/Providers/EventServiceProvider.php | 6 +- app/Shoutbox.php | 2 +- app/User.php | 4 +- app/Voter.php | 4 +- bootstrap/app.php | 6 +- .../seeds/AchievementDetailsTableSeeder.php | 80 +++++++++---------- 10 files changed, 58 insertions(+), 58 deletions(-) diff --git a/app/Like.php b/app/Like.php index faf7781066..c2128267d9 100644 --- a/app/Like.php +++ b/app/Like.php @@ -18,11 +18,11 @@ class Like extends Model { public function user() { - return $this->belongsTo('App\User'); + return $this->belongsTo(\App\User::class); } public function post() { - return $this->belongsTo('App\Post'); + return $this->belongsTo(\App\Post::class); } } diff --git a/app/Option.php b/app/Option.php index 41c0ed28be..2fcf4b1d8e 100644 --- a/app/Option.php +++ b/app/Option.php @@ -22,6 +22,6 @@ class Option extends Model public function poll() { - return $this->belongsTo('App\Poll'); + return $this->belongsTo(\App\Poll::class); } } diff --git a/app/Poll.php b/app/Poll.php index f4bd525981..fede085c9f 100644 --- a/app/Poll.php +++ b/app/Poll.php @@ -35,17 +35,17 @@ protected static function boot() public function user() { - return $this->belongsTo('App\User'); + return $this->belongsTo(\App\User::class); } public function options() { - return $this->hasMany('App\Option'); + return $this->hasMany(\App\Option::class); } public function voters() { - return $this->hasMany('App\Voter'); + return $this->hasMany(\App\Voter::class); } /** diff --git a/app/Post.php b/app/Post.php index 8962670eac..29095b6f5b 100755 --- a/app/Post.php +++ b/app/Post.php @@ -57,7 +57,7 @@ public function user() */ public function likes() { - return $this->hasMany('App\Like'); + return $this->hasMany(\App\Like::class); } /** diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index f29d2c15e6..9eeac87eb1 100755 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -24,13 +24,13 @@ class EventServiceProvider extends ServiceProvider */ protected $listen = [ 'Gstt\Achievements\Event\Unlocked' => [ - 'App\Listeners\AchievementUnlocked', + \App\Listeners\AchievementUnlocked::class, ], 'Illuminate\Auth\Events\Failed' => [ - 'App\Listeners\RecordFailedLoginAttempt', + \App\Listeners\RecordFailedLoginAttempt::class, ], 'Illuminate\Auth\Events\Login' => [ - 'App\Listeners\UpdateLastLogin', + \App\Listeners\UpdateLastLogin::class, ], ]; diff --git a/app/Shoutbox.php b/app/Shoutbox.php index e37b0f721f..786d4cf470 100644 --- a/app/Shoutbox.php +++ b/app/Shoutbox.php @@ -30,7 +30,7 @@ class Shoutbox extends Model */ public function poster() { - return $this->belongsTo('App\User', 'user'); + return $this->belongsTo(\App\User::class, 'user'); } /** diff --git a/app/User.php b/app/User.php index 2fb99fa38e..c721f64471 100755 --- a/app/User.php +++ b/app/User.php @@ -95,7 +95,7 @@ public function isOnline() */ public function polls() { - return $this->hasMany('App\Poll'); + return $this->hasMany(\App\Poll::class); } /** @@ -339,7 +339,7 @@ public function featuredTorrent() */ public function likes() { - return $this->hasMany('App\Like'); + return $this->hasMany(\App\Like::class); } /** diff --git a/app/Voter.php b/app/Voter.php index f7829f604d..cddaf091b7 100644 --- a/app/Voter.php +++ b/app/Voter.php @@ -25,11 +25,11 @@ class Voter extends Model public function poll() { - return $this->belongsTo('App\Poll'); + return $this->belongsTo(\App\Poll::class); } public function user() { - return $this->belongsTo('App\User'); + return $this->belongsTo(\App\User::class); } } diff --git a/bootstrap/app.php b/bootstrap/app.php index 9675033b98..a026b1c2dc 100755 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -38,17 +38,17 @@ $app->singleton( 'Illuminate\Contracts\Http\Kernel', - 'App\Http\Kernel' + \App\Http\Kernel::class ); $app->singleton( 'Illuminate\Contracts\Console\Kernel', - 'App\Console\Kernel' + \App\Console\Kernel::class ); $app->singleton( 'Illuminate\Contracts\Debug\ExceptionHandler', - 'App\Exceptions\Handler' + \App\Exceptions\Handler::class ); /* diff --git a/database/seeds/AchievementDetailsTableSeeder.php b/database/seeds/AchievementDetailsTableSeeder.php index 03c649e8ce..6a838824b9 100644 --- a/database/seeds/AchievementDetailsTableSeeder.php +++ b/database/seeds/AchievementDetailsTableSeeder.php @@ -34,7 +34,7 @@ public function run() 'description' => 'Congratulations! You have made your first comment!', 'points' => 1, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMadeComment', + 'class_name' => \App\Achievements\UserMadeComment::class, 'created_at' => '2017-02-28 17:22:37', 'updated_at' => '2017-04-21 12:52:01', ], @@ -45,7 +45,7 @@ public function run() 'description' => 'Wow! You have already made 10 comments!', 'points' => 10, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMadeTenComments', + 'class_name' => \App\Achievements\UserMadeTenComments::class, 'created_at' => '2017-02-28 17:22:37', 'updated_at' => '2017-04-21 12:21:06', ], @@ -56,7 +56,7 @@ public function run() 'description' => 'Congratulations! You have made your first torrent upload!', 'points' => 1, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMadeUpload', + 'class_name' => \App\Achievements\UserMadeUpload::class, 'created_at' => '2017-03-01 13:31:50', 'updated_at' => '2017-03-22 14:59:32', ], @@ -67,7 +67,7 @@ public function run() 'description' => 'You have made 25 torrent uploads!', 'points' => 25, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade25Uploads', + 'class_name' => \App\Achievements\UserMade25Uploads::class, 'created_at' => '2017-03-02 23:19:34', 'updated_at' => '2017-04-21 12:21:06', ], @@ -78,7 +78,7 @@ public function run() 'description' => 'Wow! You have already made 50 comments!', 'points' => 50, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade50Comments', + 'class_name' => \App\Achievements\UserMade50Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -89,7 +89,7 @@ public function run() 'description' => 'Wow! You have already made 100 comments!', 'points' => 100, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade100Comments', + 'class_name' => \App\Achievements\UserMade100Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -100,7 +100,7 @@ public function run() 'description' => 'Wow! You have already made 200 comments!', 'points' => 200, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade200Comments', + 'class_name' => \App\Achievements\UserMade200Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -111,7 +111,7 @@ public function run() 'description' => 'Wow! You have already made 300 comments!', 'points' => 300, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade300Comments', + 'class_name' => \App\Achievements\UserMade300Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -122,7 +122,7 @@ public function run() 'description' => 'Wow! You have already made 400 comments!', 'points' => 400, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade400Comments', + 'class_name' => \App\Achievements\UserMade400Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -133,7 +133,7 @@ public function run() 'description' => 'Wow! You have already made 500 comments!', 'points' => 500, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade500Comments', + 'class_name' => \App\Achievements\UserMade500Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -144,7 +144,7 @@ public function run() 'description' => 'Wow! You have already made 600 comments!', 'points' => 600, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade600Comments', + 'class_name' => \App\Achievements\UserMade600Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -155,7 +155,7 @@ public function run() 'description' => 'Wow! You have already made 700 comments!', 'points' => 700, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade700Comments', + 'class_name' => \App\Achievements\UserMade700Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -166,7 +166,7 @@ public function run() 'description' => 'Wow! You have already made 800 comments!', 'points' => 800, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade800Comments', + 'class_name' => \App\Achievements\UserMade800Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -177,7 +177,7 @@ public function run() 'description' => 'DAMN BRO! You have made 900 comments!', 'points' => 900, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade900Comments', + 'class_name' => \App\Achievements\UserMade900Comments::class, 'created_at' => '2017-04-21 13:04:26', 'updated_at' => '2017-04-21 13:04:26', ], @@ -188,7 +188,7 @@ public function run() 'description' => 'You have made 50 torrent uploads!', 'points' => 50, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade50Uploads', + 'class_name' => \App\Achievements\UserMade50Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -199,7 +199,7 @@ public function run() 'description' => 'You have made 100 torrent uploads!', 'points' => 100, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade100Uploads', + 'class_name' => \App\Achievements\UserMade100Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -210,7 +210,7 @@ public function run() 'description' => 'You have made 200 torrent uploads!', 'points' => 200, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade200Uploads', + 'class_name' => \App\Achievements\UserMade200Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -221,7 +221,7 @@ public function run() 'description' => 'You have made 300 torrent uploads!', 'points' => 300, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade300Uploads', + 'class_name' => \App\Achievements\UserMade300Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -232,7 +232,7 @@ public function run() 'description' => 'You have made 400 torrent uploads!', 'points' => 400, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade400Uploads', + 'class_name' => \App\Achievements\UserMade400Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -243,7 +243,7 @@ public function run() 'description' => 'You have made 500 torrent uploads!', 'points' => 500, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade500Uploads', + 'class_name' => \App\Achievements\UserMade500Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -254,7 +254,7 @@ public function run() 'description' => 'You have made 600 torrent uploads!', 'points' => 600, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade600Uploads', + 'class_name' => \App\Achievements\UserMade600Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -265,7 +265,7 @@ public function run() 'description' => 'You have made 700 torrent uploads!', 'points' => 700, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade700Uploads', + 'class_name' => \App\Achievements\UserMade700Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -276,7 +276,7 @@ public function run() 'description' => 'You have made 800 torrent uploads!', 'points' => 800, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade800Uploads', + 'class_name' => \App\Achievements\UserMade800Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -287,7 +287,7 @@ public function run() 'description' => 'DAMN BRO, you have made 900 torrent uploads!', 'points' => 900, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade900Uploads', + 'class_name' => \App\Achievements\UserMade900Uploads::class, 'created_at' => '2017-04-21 13:29:51', 'updated_at' => '2017-04-21 13:29:51', ], @@ -298,7 +298,7 @@ public function run() 'description' => 'Congratulations! You have made your first post!', 'points' => 1, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMadeFirstPost', + 'class_name' => \App\Achievements\UserMadeFirstPost::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:38:48', ], @@ -309,7 +309,7 @@ public function run() 'description' => 'Wow! You have already made 25 posts!', 'points' => 25, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade25Posts', + 'class_name' => \App\Achievements\UserMade25Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -320,7 +320,7 @@ public function run() 'description' => 'Wow! You have already made 50 posts!', 'points' => 50, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade50Posts', + 'class_name' => \App\Achievements\UserMade50Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -331,7 +331,7 @@ public function run() 'description' => 'Wow! You have already made 100 posts!', 'points' => 100, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade100Posts', + 'class_name' => \App\Achievements\UserMade100Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -342,7 +342,7 @@ public function run() 'description' => 'Wow! You have already made 200 posts!', 'points' => 200, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade200Posts', + 'class_name' => \App\Achievements\UserMade200Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -353,7 +353,7 @@ public function run() 'description' => 'Wow! You have already made 300 posts!', 'points' => 300, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade300Posts', + 'class_name' => \App\Achievements\UserMade300Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -364,7 +364,7 @@ public function run() 'description' => 'Wow! You have already made 400 posts!', 'points' => 400, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade400Posts', + 'class_name' => \App\Achievements\UserMade400Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -375,7 +375,7 @@ public function run() 'description' => 'Wow! You have already made 500 posts!', 'points' => 500, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade500Posts', + 'class_name' => \App\Achievements\UserMade500Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -386,7 +386,7 @@ public function run() 'description' => 'Wow! You have already made 600 posts!', 'points' => 600, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade600Posts', + 'class_name' => \App\Achievements\UserMade600Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -397,7 +397,7 @@ public function run() 'description' => 'Wow! You have already made 700 posts!', 'points' => 700, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade700Posts', + 'class_name' => \App\Achievements\UserMade700Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -408,7 +408,7 @@ public function run() 'description' => 'Wow! You have already made 800 posts!', 'points' => 800, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade800Posts', + 'class_name' => \App\Achievements\UserMade800Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -419,7 +419,7 @@ public function run() 'description' => 'Wow! You have already made 900 posts!', 'points' => 900, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserMade900Posts', + 'class_name' => \App\Achievements\UserMade900Posts::class, 'created_at' => '2017-04-21 18:37:09', 'updated_at' => '2017-04-21 18:37:09', ], @@ -430,7 +430,7 @@ public function run() 'description' => 'Congrats! You have already filled 25 requests!', 'points' => 25, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserFilled25Requests', + 'class_name' => \App\Achievements\UserFilled25Requests::class, 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', ], @@ -441,7 +441,7 @@ public function run() 'description' => 'Wow! You have already filled 50 requests!', 'points' => 50, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserFilled50Requests', + 'class_name' => \App\Achievements\UserFilled50Requests::class, 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', ], @@ -452,7 +452,7 @@ public function run() 'description' => 'Woot! You have already filled 75 requests!', 'points' => 75, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserFilled75Requests', + 'class_name' => \App\Achievements\UserFilled75Requests::class, 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', ], @@ -463,7 +463,7 @@ public function run() 'description' => 'DAMN BRO! You have already filled 100 requests!', 'points' => 100, 'secret' => 0, - 'class_name' => 'App\\Achievements\\UserFilled100Requests', + 'class_name' => \App\Achievements\UserFilled100Requests::class, 'created_at' => '2017-08-28 23:55:56', 'updated_at' => '2017-08-28 23:55:56', ], From e2cff2379eb227186227382a8329e34f06570629 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 18 Jan 2018 01:04:53 +0000 Subject: [PATCH 09/14] Shift Laravel dependencies --- composer.json | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index e0df966e19..3053680ac8 100755 --- a/composer.json +++ b/composer.json @@ -18,9 +18,9 @@ "hootlex/laravel-moderation": "^1.0", "infinety-es/config-manager": "^1.1", "kyslik/column-sortable": "5.4.*", - "laravel/framework": "5.4.*", + "laravel/framework": "5.5.*", "laravel/tinker": "~1.0", - "laravelcollective/html": "5.4.*", + "laravelcollective/html": "5.5.*", "mjohnson/decoda": "6.*", "moinax/tvdb": "1.*", "paragonie/constant_time_encoding": "^2.0", @@ -30,14 +30,15 @@ "spatie/laravel-image-optimizer": "^1.1", "theodorejb/polycast": "^1.0", "intervention/image": "dev-master", - "symfony/dom-crawler": "^2.7|^3.0" - + "symfony/dom-crawler": "^2.7|^3.0", + "fideloper/proxy": "~3.3" }, "require-dev": { "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~5.7", - "xethron/migrations-generator": "^2.0" + "phpunit/phpunit": "~6.0", + "xethron/migrations-generator": "^2.0", + "filp/whoops": "~2.0" }, "autoload": { "classmap": [ @@ -59,17 +60,18 @@ "post-create-project-cmd": [ "php artisan key:generate" ], - "post-install-cmd": [ - "Illuminate\\Foundation\\ComposerScripts::postInstall", - "php artisan optimize" - ], - "post-update-cmd": [ - "Illuminate\\Foundation\\ComposerScripts::postUpdate", - "php artisan optimize" + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover" ] }, "config": { "preferred-install": "dist", "sort-packages": true + }, + "extra": { + "laravel": { + "dont-discover": [] + } } -} +} \ No newline at end of file From f4536fe384ea512a00b56f16ff7128e5f4e8aee3 Mon Sep 17 00:00:00 2001 From: HDVinnie Date: Wed, 17 Jan 2018 20:25:09 -0500 Subject: [PATCH 10/14] Update Handler.php --- app/Exceptions/Handler.php | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index fa3eafe6d6..2740f9df5e 100755 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -46,43 +46,23 @@ class Handler extends ExceptionHandler * * This is a great spot to send exceptions to Sentry, Bugsnag, etc. * - * @param \Exception $e + * @param \Exception $exception * @return void */ - public function report(Exception $e) + public function report(Exception $exception) { - if ($e instanceof \Illuminate\Session\TokenMismatchException) { - return; - } - - return parent::report($e); + parent::report($exception); } - + /** * Render an exception into an HTTP response. * - * @param \Illuminate\Http\Request $request - * @param \Exception $e - * @return \Illuminate\Http\Response - */ - public function render($request, Exception $e) - { - return parent::render($request, $e); - } - - /** - * Convert an authentication exception into an unauthenticated response. - * - * @param \Illuminate\Http\Request $request - * @param \Illuminate\Auth\AuthenticationException $e + * @param \Illuminate\Http\Request $request + * @param \Exception $exception * @return \Illuminate\Http\Response */ - protected function unauthenticated($request, AuthenticationException $e) + public function render($request, Exception $exception) { - if ($request->expectsJson()) { - return response()->json(['error' => 'Unauthenticated.'], 401); - } else { - return redirect()->guest('login'); - } + return parent::render($request, $exception); } } From 5955748a366cfdf39f0a1744fe0fe6830bf59a44 Mon Sep 17 00:00:00 2001 From: HDVinnie Date: Wed, 17 Jan 2018 20:31:06 -0500 Subject: [PATCH 11/14] Update composer.json Update Package For Laravel 5.5 Support --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3053680ac8..bf1ac207b1 100755 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "guzzlehttp/guzzle": "6.*", "hootlex/laravel-moderation": "^1.0", "infinety-es/config-manager": "^1.1", - "kyslik/column-sortable": "5.4.*", + "kyslik/column-sortable": "5.5.*", "laravel/framework": "5.5.*", "laravel/tinker": "~1.0", "laravelcollective/html": "5.5.*", @@ -74,4 +74,4 @@ "dont-discover": [] } } -} \ No newline at end of file +} From c7bb2644ce63c42479229377598f2ac4283d855f Mon Sep 17 00:00:00 2001 From: HDVinnie Date: Wed, 17 Jan 2018 20:35:59 -0500 Subject: [PATCH 12/14] Update composer.json Update cookie consent for laravel 5.5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bf1ac207b1..e17e9ac88f 100755 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "paragonie/constant_time_encoding": "^2.0", "predis/predis": "1.1.1", "renatomarinho/laravel-page-speed": "^1.8", - "spatie/laravel-cookie-consent": "^1.8", + "spatie/laravel-cookie-consent": "^2.2.0", "spatie/laravel-image-optimizer": "^1.1", "theodorejb/polycast": "^1.0", "intervention/image": "dev-master", From 8ea4279d1c9633defe3aa251867491194d936317 Mon Sep 17 00:00:00 2001 From: HDVinnie Date: Wed, 17 Jan 2018 20:40:57 -0500 Subject: [PATCH 13/14] Whoops --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e17e9ac88f..79de00981c 100755 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "paragonie/constant_time_encoding": "^2.0", "predis/predis": "1.1.1", "renatomarinho/laravel-page-speed": "^1.8", - "spatie/laravel-cookie-consent": "^2.2.0", + "spatie/laravel-cookie-consent": "^2.1.0", "spatie/laravel-image-optimizer": "^1.1", "theodorejb/polycast": "^1.0", "intervention/image": "dev-master", From 5f1fe24ee4e429877d329df7c76ac4b94e27307f Mon Sep 17 00:00:00 2001 From: HDVinnie Date: Wed, 17 Jan 2018 20:43:45 -0500 Subject: [PATCH 14/14] Update composer.lock --- composer.lock | 1167 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 798 insertions(+), 369 deletions(-) diff --git a/composer.lock b/composer.lock index a61c20b59e..203943437f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "152ee4a491762d9b13af6772429d6174", + "hash": "2cf441d5511f1cc53ef78bbefbd905f8", + "content-hash": "05b81f5e5a26fc32a3857af6728ca347", "packages": [ { "name": "arcanedev/log-viewer", @@ -70,38 +71,33 @@ "log-viewer", "logviewer" ], - "time": "2017-10-28T10:32:04+00:00" + "time": "2017-10-28 10:32:04" }, { "name": "arcanedev/support", - "version": "4.1.9", + "version": "4.2.1", "source": { "type": "git", "url": "https://github.com/ARCANEDEV/Support.git", - "reference": "50bf6c1e6aabf7c5c4e1cea0d6028b0622d5ce2d" + "reference": "255b58905e9744d8bbf9d135f7ff5c4538f9ebc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ARCANEDEV/Support/zipball/50bf6c1e6aabf7c5c4e1cea0d6028b0622d5ce2d", - "reference": "50bf6c1e6aabf7c5c4e1cea0d6028b0622d5ce2d", + "url": "https://api.github.com/repos/ARCANEDEV/Support/zipball/255b58905e9744d8bbf9d135f7ff5c4538f9ebc8", + "reference": "255b58905e9744d8bbf9d135f7ff5c4538f9ebc8", "shasum": "" }, "require": { - "illuminate/filesystem": "~5.4.0", - "illuminate/support": "~5.4.0", - "php": ">=5.6.4" + "illuminate/filesystem": "~5.5.0", + "illuminate/support": "~5.5.0", + "php": ">=7.0" }, "require-dev": { - "orchestra/testbench-browser-kit": "~3.4.0", - "phpunit/phpcov": "~3.0", - "phpunit/phpunit": "~5.0" + "orchestra/testbench": "~3.5.0", + "phpunit/phpcov": "~4.0", + "phpunit/phpunit": "~6.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, "autoload": { "psr-4": { "Arcanedev\\Support\\": "src/" @@ -130,7 +126,7 @@ "laravel", "support" ], - "time": "2017-05-08T12:18:25+00:00" + "time": "2017-09-07 16:25:53" }, { "name": "bepsvpt/secure-headers", @@ -183,7 +179,7 @@ "https", "laravel" ], - "time": "2017-07-18T08:37:05+00:00" + "time": "2017-07-18 08:37:05" }, { "name": "brian2694/laravel-toastr", @@ -231,7 +227,7 @@ "php", "toastr" ], - "time": "2017-01-28T19:35:27+00:00" + "time": "2017-01-28 19:35:27" }, { "name": "christofferok/laravel-emojione", @@ -299,7 +295,7 @@ "emojione", "laravel" ], - "time": "2017-07-22T12:30:16+00:00" + "time": "2017-07-22 12:30:16" }, { "name": "dnoegel/php-xdg-base-dir", @@ -332,7 +328,7 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24T07:27:01+00:00" + "time": "2014-10-24 07:27:01" }, { "name": "doctrine/inflector", @@ -399,7 +395,118 @@ "singularize", "string" ], - "time": "2018-01-09T20:05:19+00:00" + "time": "2018-01-09 20:05:19" + }, + { + "name": "doctrine/lexer", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/lexer.git", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "lexer", + "parser" + ], + "time": "2014-09-09 13:34:57" + }, + { + "name": "egulias/email-validator", + "version": "2.1.3", + "source": { + "type": "git", + "url": "https://github.com/egulias/EmailValidator.git", + "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/1bec00a10039b823cc94eef4eddd47dcd3b2ca04", + "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04", + "shasum": "" + }, + "require": { + "doctrine/lexer": "^1.0.1", + "php": ">= 5.5" + }, + "require-dev": { + "dominicsayers/isemail": "dev-master", + "phpunit/phpunit": "^4.8.35", + "satooshi/php-coveralls": "^1.0.1" + }, + "suggest": { + "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Egulias\\EmailValidator\\": "EmailValidator" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eduardo Gulias Davis" + } + ], + "description": "A library for validating emails against several RFCs", + "homepage": "https://github.com/egulias/EmailValidator", + "keywords": [ + "email", + "emailvalidation", + "emailvalidator", + "validation", + "validator" + ], + "time": "2017-11-15 23:40:40" }, { "name": "emojione/emojione", @@ -442,7 +549,7 @@ "smilies", "unicode" ], - "time": "2017-08-08T16:33:10+00:00" + "time": "2017-08-08 16:33:10" }, { "name": "erusev/parsedown", @@ -487,7 +594,64 @@ "markdown", "parser" ], - "time": "2017-11-14T20:44:03+00:00" + "time": "2017-11-14 20:44:03" + }, + { + "name": "fideloper/proxy", + "version": "3.3.4", + "source": { + "type": "git", + "url": "https://github.com/fideloper/TrustedProxy.git", + "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9cdf6f118af58d89764249bbcc7bb260c132924f", + "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f", + "shasum": "" + }, + "require": { + "illuminate/contracts": "~5.0", + "php": ">=5.4.0" + }, + "require-dev": { + "illuminate/http": "~5.0", + "mockery/mockery": "~0.9.3", + "phpunit/phpunit": "^5.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.3-dev" + }, + "laravel": { + "providers": [ + "Fideloper\\Proxy\\TrustedProxyServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Fideloper\\Proxy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Chris Fidao", + "email": "fideloper@gmail.com" + } + ], + "description": "Set trusted proxies for Laravel", + "keywords": [ + "load balancing", + "proxy", + "trusted proxy" + ], + "time": "2017-06-15 17:19:42" }, { "name": "gstt/laravel-achievements", @@ -531,7 +695,7 @@ } ], "description": "Achievements for Laravel 5.3+", - "time": "2017-03-08T03:42:08+00:00" + "time": "2017-03-08 03:42:08" }, { "name": "guzzlehttp/guzzle", @@ -596,7 +760,7 @@ "rest", "web service" ], - "time": "2017-06-22T18:50:49+00:00" + "time": "2017-06-22 18:50:49" }, { "name": "guzzlehttp/promises", @@ -647,7 +811,7 @@ "keywords": [ "promise" ], - "time": "2016-12-20T10:07:11+00:00" + "time": "2016-12-20 10:07:11" }, { "name": "guzzlehttp/psr7", @@ -712,7 +876,7 @@ "uri", "url" ], - "time": "2017-03-20T17:10:46+00:00" + "time": "2017-03-20 17:10:46" }, { "name": "hootlex/laravel-moderation", @@ -758,7 +922,7 @@ "moderation", "moderation-system" ], - "time": "2017-07-16T07:42:32+00:00" + "time": "2017-07-16 07:42:32" }, { "name": "infinety-es/config", @@ -811,7 +975,7 @@ "laravel", "write" ], - "time": "2017-03-13T08:06:22+00:00" + "time": "2017-03-13 08:06:22" }, { "name": "infinety-es/config-manager", @@ -855,7 +1019,7 @@ "laravel", "write" ], - "time": "2017-05-15T11:33:08+00:00" + "time": "2017-05-15 11:33:08" }, { "name": "intervention/image", @@ -925,7 +1089,7 @@ "thumbnail", "watermark" ], - "time": "2017-09-21T16:33:42+00:00" + "time": "2017-09-21 16:33:42" }, { "name": "jakub-onderka/php-console-color", @@ -968,7 +1132,7 @@ "homepage": "http://www.acci.cz" } ], - "time": "2014-04-08T15:00:19+00:00" + "time": "2014-04-08 15:00:19" }, { "name": "jakub-onderka/php-console-highlighter", @@ -1012,32 +1176,39 @@ "homepage": "http://www.acci.cz/" } ], - "time": "2015-04-20T18:58:01+00:00" + "time": "2015-04-20 18:58:01" }, { "name": "kyslik/column-sortable", - "version": "5.4.10", + "version": "5.5.4", "source": { "type": "git", "url": "https://github.com/Kyslik/column-sortable.git", - "reference": "fa7635d2ce28faf2599bf752428acc64437acf7c" + "reference": "36c5698bd53139d0de59a1621635cd278700e2ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Kyslik/column-sortable/zipball/fa7635d2ce28faf2599bf752428acc64437acf7c", - "reference": "fa7635d2ce28faf2599bf752428acc64437acf7c", + "url": "https://api.github.com/repos/Kyslik/column-sortable/zipball/36c5698bd53139d0de59a1621635cd278700e2ec", + "reference": "36c5698bd53139d0de59a1621635cd278700e2ec", "shasum": "" }, "require": { - "illuminate/database": "5.4.*", - "illuminate/support": "5.4.*", - "php": ">=5.6.4" + "illuminate/database": "5.5.*", + "illuminate/support": "5.5.*", + "php": ">=7.0" }, "require-dev": { - "orchestra/testbench": "3.4.*", - "phpunit/phpunit": "~5.0" + "orchestra/testbench": "3.5.*", + "phpunit/phpunit": "^6.0" }, "type": "package", + "extra": { + "laravel": { + "providers": [ + "Kyslik\\ColumnSortable\\ColumnSortableServiceProvider" + ] + } + }, "autoload": { "psr-4": { "Kyslik\\ColumnSortable\\": "src/ColumnSortable/" @@ -1051,32 +1222,31 @@ { "name": "Martin Kiesel", "email": "martin.kiesel@gmail.com", - "role": "Developer" + "role": "Developer and maintainer" } ], - "description": "Package for handling column sorting in Laravel 5.4", + "description": "Package for handling column sorting in Laravel 5.x", "keywords": [ "column", "laravel", - "one-to-one", "sort", "sortable", "sorting" ], - "time": "2017-11-29T12:29:06+00:00" + "time": "2017-11-29 12:30:09" }, { "name": "laravel/framework", - "version": "v5.4.36", + "version": "v5.5.31", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9" + "reference": "a47b50a5981c0cf0139939dfaea4191784b65acb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9", - "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9", + "url": "https://api.github.com/repos/laravel/framework/zipball/a47b50a5981c0cf0139939dfaea4191784b65acb", + "reference": "a47b50a5981c0cf0139939dfaea4191784b65acb", "shasum": "" }, "require": { @@ -1085,21 +1255,22 @@ "ext-mbstring": "*", "ext-openssl": "*", "league/flysystem": "~1.0", - "monolog/monolog": "~1.11", + "monolog/monolog": "~1.12", "mtdowling/cron-expression": "~1.0", "nesbot/carbon": "~1.20", - "paragonie/random_compat": "~1.4|~2.0", - "php": ">=5.6.4", + "php": ">=7.0", + "psr/container": "~1.0", + "psr/simple-cache": "^1.0", "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", + "swiftmailer/swiftmailer": "~6.0", + "symfony/console": "~3.3", + "symfony/debug": "~3.3", + "symfony/finder": "~3.3", + "symfony/http-foundation": "~3.3", + "symfony/http-kernel": "~3.3", + "symfony/process": "~3.3", + "symfony/routing": "~3.3", + "symfony/var-dumper": "~3.3", "tijsverkoyen/css-to-inline-styles": "~2.2", "vlucas/phpdotenv": "~2.2" }, @@ -1116,7 +1287,6 @@ "illuminate/database": "self.version", "illuminate/encryption": "self.version", "illuminate/events": "self.version", - "illuminate/exception": "self.version", "illuminate/filesystem": "self.version", "illuminate/hashing": "self.version", "illuminate/http": "self.version", @@ -1138,33 +1308,38 @@ "require-dev": { "aws/aws-sdk-php": "~3.0", "doctrine/dbal": "~2.5", - "mockery/mockery": "~0.9.4", + "filp/whoops": "^2.1.4", + "mockery/mockery": "~1.0", + "orchestra/testbench-core": "3.5.*", "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~5.7", - "predis/predis": "~1.0", - "symfony/css-selector": "~3.2", - "symfony/dom-crawler": "~3.2" + "phpunit/phpunit": "~6.0", + "predis/predis": "^1.1.1", + "symfony/css-selector": "~3.3", + "symfony/dom-crawler": "~3.3" }, "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.5).", + "ext-pcntl": "Required to use all features of the queue worker.", + "ext-posix": "Required to use all features of the queue worker.", "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", "laravel/tinker": "Required to use the tinker console command (~1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", + "league/flysystem-cached-adapter": "Required to use Flysystem caching (~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 (~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.*)." + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).", + "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.3).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.3).", + "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.5-dev" } }, "autoload": { @@ -1192,7 +1367,7 @@ "framework", "laravel" ], - "time": "2017-08-30T09:26:16+00:00" + "time": "2018-01-16 15:39:45" }, { "name": "laravel/tinker", @@ -1255,36 +1430,47 @@ "laravel", "psysh" ], - "time": "2017-12-18T16:25:11+00:00" + "time": "2017-12-18 16:25:11" }, { "name": "laravelcollective/html", - "version": "v5.4.9", + "version": "v5.5.1", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "f04965dc688254f4c77f684ab0b42264f9eb9634" + "reference": "2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/f04965dc688254f4c77f684ab0b42264f9eb9634", - "reference": "f04965dc688254f4c77f684ab0b42264f9eb9634", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6", + "reference": "2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6", "shasum": "" }, "require": { - "illuminate/http": "5.4.*", - "illuminate/routing": "5.4.*", - "illuminate/session": "5.4.*", - "illuminate/support": "5.4.*", - "illuminate/view": "5.4.*", - "php": ">=5.6.4" + "illuminate/http": "5.5.*", + "illuminate/routing": "5.5.*", + "illuminate/session": "5.5.*", + "illuminate/support": "5.5.*", + "illuminate/view": "5.5.*", + "php": ">=7.0.0" }, "require-dev": { - "illuminate/database": "5.4.*", + "illuminate/database": "5.5.*", "mockery/mockery": "~0.9.4", "phpunit/phpunit": "~5.4" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Collective\\Html\\HtmlServiceProvider" + ], + "aliases": { + "Form": "Collective\\Html\\FormFacade", + "Html": "Collective\\Html\\HtmlFacade" + } + } + }, "autoload": { "psr-4": { "Collective\\Html\\": "src/" @@ -1309,7 +1495,7 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "http://laravelcollective.com", - "time": "2017-08-12T15:52:38+00:00" + "time": "2017-08-31 14:46:03" }, { "name": "league/flysystem", @@ -1392,7 +1578,7 @@ "sftp", "storage" ], - "time": "2017-08-06T17:41:04+00:00" + "time": "2017-08-06 17:41:04" }, { "name": "mjohnson/decoda", @@ -1446,7 +1632,7 @@ "markup", "parser" ], - "time": "2017-08-15T05:09:38+00:00" + "time": "2017-08-15 05:09:38" }, { "name": "moinax/tvdb", @@ -1486,7 +1672,7 @@ "keywords": [ "api" ], - "time": "2016-10-25T08:14:27+00:00" + "time": "2016-10-25 08:14:27" }, { "name": "monolog/monolog", @@ -1564,7 +1750,7 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2017-06-19 01:22:40" }, { "name": "mtdowling/cron-expression", @@ -1608,7 +1794,7 @@ "cron", "schedule" ], - "time": "2017-01-23T04:29:33+00:00" + "time": "2017-01-23 04:29:33" }, { "name": "nesbot/carbon", @@ -1661,7 +1847,7 @@ "datetime", "time" ], - "time": "2017-01-16T07:55:07+00:00" + "time": "2017-01-16 07:55:07" }, { "name": "nikic/php-parser", @@ -1712,7 +1898,7 @@ "parser", "php" ], - "time": "2017-12-26T14:43:21+00:00" + "time": "2017-12-26 14:43:21" }, { "name": "paragonie/constant_time_encoding", @@ -1774,7 +1960,7 @@ "hex2bin", "rfc4648" ], - "time": "2017-09-22T14:55:37+00:00" + "time": "2017-09-22 14:55:37" }, { "name": "paragonie/csp-builder", @@ -1830,7 +2016,7 @@ "security", "xss" ], - "time": "2017-11-20T16:18:59+00:00" + "time": "2017-11-20 16:18:59" }, { "name": "paragonie/hpkp-builder", @@ -1884,7 +2070,7 @@ "security", "security headers" ], - "time": "2016-06-19T16:02:40+00:00" + "time": "2016-06-19 16:02:40" }, { "name": "paragonie/random_compat", @@ -1932,7 +2118,7 @@ "pseudorandom", "random" ], - "time": "2017-09-27T21:40:39+00:00" + "time": "2017-09-27 21:40:39" }, { "name": "predis/predis", @@ -1982,7 +2168,56 @@ "predis", "redis" ], - "time": "2016-06-16T16:22:20+00:00" + "time": "2016-06-16 16:22:20" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14 16:28:37" }, { "name": "psr/http-message", @@ -2032,7 +2267,7 @@ "request", "response" ], - "time": "2016-08-06T14:39:51+00:00" + "time": "2016-08-06 14:39:51" }, { "name": "psr/log", @@ -2079,7 +2314,55 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2016-10-10 12:19:37" + }, + { + "name": "psr/simple-cache", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/753fa598e8f3b9966c886fe13f370baa45ef0e24", + "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-01-02 13:31:39" }, { "name": "psy/psysh", @@ -2151,20 +2434,20 @@ "interactive", "shell" ], - "time": "2017-12-28T16:14:16+00:00" + "time": "2017-12-28 16:14:16" }, { "name": "ramsey/uuid", - "version": "3.7.1", + "version": "3.7.2", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "45cffe822057a09e05f7bd09ec5fb88eeecd2334" + "reference": "bba83ad77bb9deb6d3c352a7361b818e415b221d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/45cffe822057a09e05f7bd09ec5fb88eeecd2334", - "reference": "45cffe822057a09e05f7bd09ec5fb88eeecd2334", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/bba83ad77bb9deb6d3c352a7361b818e415b221d", + "reference": "bba83ad77bb9deb6d3c352a7361b818e415b221d", "shasum": "" }, "require": { @@ -2176,7 +2459,7 @@ }, "require-dev": { "apigen/apigen": "^4.1", - "codeception/aspect-mock": "^1.0 | ^2.0", + "codeception/aspect-mock": "^1.0 | ~2.0.0", "doctrine/annotations": "~1.2.0", "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1", "ircmaxell/random-lib": "^1.1", @@ -2184,7 +2467,7 @@ "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", + "phpunit/phpunit": "^4.7|^5.0", "satooshi/php-coveralls": "^0.6.1", "squizlabs/php_codesniffer": "^2.3" }, @@ -2233,7 +2516,7 @@ "identifier", "uuid" ], - "time": "2017-09-22T20:46:04+00:00" + "time": "2018-01-13 22:22:03" }, { "name": "renatomarinho/laravel-page-speed", @@ -2290,7 +2573,7 @@ "optmize", "page speed" ], - "time": "2017-12-02T14:38:46+00:00" + "time": "2017-12-02 14:38:46" }, { "name": "spatie/image-optimizer", @@ -2339,35 +2622,41 @@ "image-optimizer", "spatie" ], - "time": "2017-11-03T09:47:05+00:00" + "time": "2017-11-03 09:47:05" }, { "name": "spatie/laravel-cookie-consent", - "version": "1.8.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-cookie-consent.git", - "reference": "82593c91b5851ec444f507482206905677e8599f" + "reference": "9c7f57ebe297e7d0d640fb70b00eb1b846aa50ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-cookie-consent/zipball/82593c91b5851ec444f507482206905677e8599f", - "reference": "82593c91b5851ec444f507482206905677e8599f", + "url": "https://api.github.com/repos/spatie/laravel-cookie-consent/zipball/9c7f57ebe297e7d0d640fb70b00eb1b846aa50ae", + "reference": "9c7f57ebe297e7d0d640fb70b00eb1b846aa50ae", "shasum": "" }, "require": { - "illuminate/cookie": "~5.1.0|~5.2.0|~5.3.0|~5.4.0", - "illuminate/support": "~5.1.0|~5.2.0|~5.3.0|~5.4.0", - "illuminate/view": "~5.1.0|~5.2.0|~5.3.0|~5.4.0", - "php": "^5.6|^7.0" + "illuminate/cookie": "~5.5.0", + "illuminate/support": "~5.5.0", + "illuminate/view": "~5.5.0", + "php": "^7.0" }, "require-dev": { "fzaninotto/faker": "~1.4", - "orchestra/database": "~3.1.0|~3.2.0|~3.3.0|~3.4.0@dev", - "orchestra/testbench": "~3.1.0|~3.2.0|~3.3.0|~3.4.0@dev", - "phpunit/phpunit": "4.*" + "orchestra/testbench": "~3.5.0", + "phpunit/phpunit": "^6.3" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Spatie\\CookieConsent\\CookieConsentServiceProvider" + ] + } + }, "autoload": { "psr-4": { "Spatie\\CookieConsent\\": "src" @@ -2392,16 +2681,16 @@ } ], "description": "Make your Laravel app comply with the crazy EU cookie law", - "homepage": "https://github.com/spatie/laravel-cookie-consent", + "homepage": "https://github.com/spatie/cookie-consent", "keywords": [ "comply", "cookie", + "cookie-consent", "eu", - "laravel-cookie-consent", "law", "spatie" ], - "time": "2017-01-24T21:08:15+00:00" + "time": "2017-10-24 15:09:27" }, { "name": "spatie/laravel-image-optimizer", @@ -2460,33 +2749,34 @@ "laravel-image-optimizer", "spatie" ], - "time": "2017-12-11T21:45:27+00:00" + "time": "2017-12-11 21:45:27" }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.8", + "version": "v6.0.2", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517" + "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/9a06dc570a0367850280eefd3f1dc2da45aef517", - "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/412333372fb6c8ffb65496a2bbd7321af75733fc", + "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc", "shasum": "" }, "require": { - "php": ">=5.3.3" + "egulias/email-validator": "~2.0", + "php": ">=7.0.0" }, "require-dev": { "mockery/mockery": "~0.9.1", - "symfony/phpunit-bridge": "~3.2" + "symfony/phpunit-bridge": "~3.3@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "6.0-dev" } }, "autoload": { @@ -2508,13 +2798,13 @@ } ], "description": "Swiftmailer, free feature-rich PHP mailer", - "homepage": "http://swiftmailer.org", + "homepage": "http://swiftmailer.symfony.com", "keywords": [ "email", "mail", "mailer" ], - "time": "2017-05-01T15:54:03+00:00" + "time": "2017-09-30 22:39:41" }, { "name": "symfony/console", @@ -2583,29 +2873,29 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/css-selector", - "version": "v3.4.3", + "version": "v4.0.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556" + "reference": "f97600434e3141ef3cbb9ea42cf500fba88022b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/e66394bc7610e69279bfdb3ab11b4fe65403f556", - "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/f97600434e3141ef3cbb9ea42cf500fba88022b7", + "reference": "f97600434e3141ef3cbb9ea42cf500fba88022b7", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2636,7 +2926,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:38:00" }, { "name": "symfony/debug", @@ -2692,7 +2982,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-01-03T17:14:19+00:00" + "time": "2018-01-03 17:14:19" }, { "name": "symfony/dom-crawler", @@ -2748,7 +3038,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/event-dispatcher", @@ -2811,7 +3101,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:38:00+00:00" + "time": "2018-01-03 07:38:00" }, { "name": "symfony/finder", @@ -2860,7 +3150,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/http-foundation", @@ -2914,7 +3204,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-01-03T17:14:19+00:00" + "time": "2018-01-03 17:14:19" }, { "name": "symfony/http-kernel", @@ -3002,7 +3292,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-01-05T08:33:00+00:00" + "time": "2018-01-05 08:33:00" }, { "name": "symfony/polyfill-mbstring", @@ -3061,7 +3351,7 @@ "portable", "shim" ], - "time": "2017-10-11T12:05:26+00:00" + "time": "2017-10-11 12:05:26" }, { "name": "symfony/polyfill-php70", @@ -3120,7 +3410,7 @@ "portable", "shim" ], - "time": "2017-10-11T12:05:26+00:00" + "time": "2017-10-11 12:05:26" }, { "name": "symfony/process", @@ -3169,7 +3459,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/routing", @@ -3247,7 +3537,7 @@ "uri", "url" ], - "time": "2018-01-04T15:09:34+00:00" + "time": "2018-01-04 15:09:34" }, { "name": "symfony/translation", @@ -3315,7 +3605,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/var-dumper", @@ -3384,7 +3674,7 @@ "debug", "dump" ], - "time": "2018-01-03T17:14:19+00:00" + "time": "2018-01-03 17:14:19" }, { "name": "theodorejb/polycast", @@ -3421,33 +3711,33 @@ } ], "description": "Safely cast values to int, float, or string", - "time": "2015-10-25T19:36:42+00:00" + "time": "2015-10-25 19:36:42" }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "2.2.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b" + "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b", - "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", + "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", "shasum": "" }, "require": { - "php": "^5.5 || ^7", - "symfony/css-selector": "^2.7|~3.0" + "php": "^5.5 || ^7.0", + "symfony/css-selector": "^2.7 || ^3.0 || ^4.0" }, "require-dev": { - "phpunit/phpunit": "~4.8|5.1.*" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { @@ -3468,7 +3758,7 @@ ], "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" + "time": "2017-11-27 11:13:29" }, { "name": "vlucas/phpdotenv", @@ -3518,7 +3808,7 @@ "env", "environment" ], - "time": "2016-09-01T10:05:43+00:00" + "time": "2016-09-01 10:05:43" } ], "packages-dev": [ @@ -3588,7 +3878,7 @@ "docblock", "parser" ], - "time": "2017-12-06T07:11:42+00:00" + "time": "2017-12-06 07:11:42" }, { "name": "doctrine/cache", @@ -3662,7 +3952,7 @@ "cache", "caching" ], - "time": "2017-08-25T07:02:50+00:00" + "time": "2017-08-25 07:02:50" }, { "name": "doctrine/collections", @@ -3729,7 +4019,7 @@ "collections", "iterator" ], - "time": "2017-07-22T10:37:32+00:00" + "time": "2017-07-22 10:37:32" }, { "name": "doctrine/common", @@ -3802,7 +4092,7 @@ "persistence", "spl" ], - "time": "2017-08-31T08:43:38+00:00" + "time": "2017-08-31 08:43:38" }, { "name": "doctrine/dbal", @@ -3875,7 +4165,7 @@ "persistence", "queryobject" ], - "time": "2017-11-19T13:38:54+00:00" + "time": "2017-11-19 13:38:54" }, { "name": "doctrine/instantiator", @@ -3929,34 +4219,44 @@ "constructor", "instantiate" ], - "time": "2017-07-22T11:58:36+00:00" + "time": "2017-07-22 11:58:36" }, { - "name": "doctrine/lexer", - "version": "v1.0.1", + "name": "filp/whoops", + "version": "2.1.14", "source": { "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + "url": "https://github.com/filp/whoops.git", + "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "url": "https://api.github.com/repos/filp/whoops/zipball/c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", + "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^5.5.9 || ^7.0", + "psr/log": "^1.0.1" + }, + "require-dev": { + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "^4.8.35 || ^5.7", + "symfony/var-dumper": "^2.6 || ^3.0" + }, + "suggest": { + "symfony/var-dumper": "Pretty print complex values better with var-dumper available", + "whoops/soap": "Formats errors as SOAP responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" + "psr-4": { + "Whoops\\": "src/Whoops/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3965,25 +4265,22 @@ ], "authors": [ { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" + "name": "Filipe Dobreira", + "homepage": "https://github.com/filp", + "role": "Developer" } ], - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "http://www.doctrine-project.org", + "description": "php error handling for cool kids", + "homepage": "https://filp.github.io/whoops/", "keywords": [ - "lexer", - "parser" + "error", + "exception", + "handling", + "library", + "throwable", + "whoops" ], - "time": "2014-09-09T13:34:57+00:00" + "time": "2017-11-23 18:22:44" }, { "name": "fzaninotto/faker", @@ -4033,7 +4330,7 @@ "faker", "fixtures" ], - "time": "2017-08-15T16:48:10+00:00" + "time": "2017-08-15 16:48:10" }, { "name": "hamcrest/hamcrest-php", @@ -4078,7 +4375,7 @@ "keywords": [ "test" ], - "time": "2015-05-11T14:41:42+00:00" + "time": "2015-05-11 14:41:42" }, { "name": "mockery/mockery", @@ -4143,7 +4440,7 @@ "test double", "testing" ], - "time": "2017-02-28T12:52:32+00:00" + "time": "2017-02-28 12:52:32" }, { "name": "myclabs/deep-copy", @@ -4188,7 +4485,109 @@ "object", "object graph" ], - "time": "2017-10-19T19:58:43+00:00" + "time": "2017-10-19 19:58:43" + }, + { + "name": "phar-io/manifest", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^1.0.1", + "php": "^5.6 || ^7.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": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2017-03-05 18:14:27" + }, + { + "name": "phar-io/version", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2017-03-05 17:38:23" }, { "name": "phpdocumentor/reflection-common", @@ -4242,7 +4641,7 @@ "reflection", "static analysis" ], - "time": "2017-09-11T18:02:19+00:00" + "time": "2017-09-11 18:02:19" }, { "name": "phpdocumentor/reflection-docblock", @@ -4293,7 +4692,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-27T17:38:31+00:00" + "time": "2017-11-27 17:38:31" }, { "name": "phpdocumentor/type-resolver", @@ -4340,7 +4739,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14T14:27:02+00:00" + "time": "2017-07-14 14:27:02" }, { "name": "phpspec/prophecy", @@ -4403,44 +4802,44 @@ "spy", "stub" ], - "time": "2017-11-24T13:59:53+00:00" + "time": "2017-11-24 13:59:53" }, { "name": "phpunit/php-code-coverage", - "version": "4.0.8", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "^1.3", - "phpunit/php-text-template": "^1.2", - "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" + "php": "^7.0", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^2.0.1", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^3.0", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": "^2.1.4", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^6.0" }, "suggest": { - "ext-xdebug": "^2.5.1" + "ext-xdebug": "^2.5.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.3.x-dev" } }, "autoload": { @@ -4455,7 +4854,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -4466,7 +4865,7 @@ "testing", "xunit" ], - "time": "2017-04-02T07:44:40+00:00" + "time": "2017-12-06 09:29:45" }, { "name": "phpunit/php-file-iterator", @@ -4513,7 +4912,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2017-11-27 13:52:08" }, { "name": "phpunit/php-text-template", @@ -4554,7 +4953,7 @@ "keywords": [ "template" ], - "time": "2015-06-21T13:50:34+00:00" + "time": "2015-06-21 13:50:34" }, { "name": "phpunit/php-timer", @@ -4603,7 +5002,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2017-02-26 11:10:40" }, { "name": "phpunit/php-token-stream", @@ -4652,20 +5051,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-11-27T05:48:46+00:00" + "time": "2017-11-27 05:48:46" }, { "name": "phpunit/phpunit", - "version": "5.7.26", + "version": "6.5.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "7fbc25c13309de0c4c9bb48b7361f1eca34c7fbd" + "reference": "83d27937a310f2984fd575686138597147bdc7df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7fbc25c13309de0c4c9bb48b7361f1eca34c7fbd", - "reference": "7fbc25c13309de0c4c9bb48b7361f1eca34c7fbd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83d27937a310f2984fd575686138597147bdc7df", + "reference": "83d27937a310f2984fd575686138597147bdc7df", "shasum": "" }, "require": { @@ -4674,33 +5073,35 @@ "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": "^3.2", - "sebastian/comparator": "^1.2.4", - "sebastian/diff": "^1.4.3", - "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|~4.0" + "myclabs/deep-copy": "^1.6.1", + "phar-io/manifest": "^1.0.1", + "phar-io/version": "^1.0", + "php": "^7.0", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^5.3", + "phpunit/php-file-iterator": "^1.4.3", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^1.0.9", + "phpunit/phpunit-mock-objects": "^5.0.5", + "sebastian/comparator": "^2.1", + "sebastian/diff": "^2.0", + "sebastian/environment": "^3.1", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^1.0", + "sebastian/version": "^2.0.1" }, "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" + "phpdocumentor/reflection-docblock": "3.0.2", + "phpunit/dbunit": "<3.0" }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-xdebug": "*", - "phpunit/php-invoker": "~1.1" + "phpunit/php-invoker": "^1.1" }, "bin": [ "phpunit" @@ -4708,7 +5109,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7.x-dev" + "dev-master": "6.5.x-dev" } }, "autoload": { @@ -4734,33 +5135,33 @@ "testing", "xunit" ], - "time": "2017-12-17T06:14:38+00:00" + "time": "2017-12-17 06:31:19" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.4.4", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" + "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", - "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf", + "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", - "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" + "doctrine/instantiator": "^1.0.5", + "php": "^7.0", + "phpunit/php-text-template": "^1.2.1", + "sebastian/exporter": "^3.1" }, "conflict": { - "phpunit/phpunit": "<5.4.0" + "phpunit/phpunit": "<6.0" }, "require-dev": { - "phpunit/phpunit": "^5.4" + "phpunit/phpunit": "^6.5" }, "suggest": { "ext-soap": "*" @@ -4768,7 +5169,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { @@ -4783,7 +5184,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -4793,7 +5194,7 @@ "mock", "xunit" ], - "time": "2017-06-30T09:13:00+00:00" + "time": "2018-01-06 05:45:45" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4838,34 +5239,34 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04T06:30:41+00:00" + "time": "2017-03-04 06:30:41" }, { "name": "sebastian/comparator", - "version": "1.2.4", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + "reference": "11c07feade1d65453e06df3b3b90171d6d982087" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/11c07feade1d65453e06df3b3b90171d6d982087", + "reference": "11c07feade1d65453e06df3b3b90171d6d982087", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2 || ~2.0" + "php": "^7.0", + "sebastian/diff": "^2.0", + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -4896,38 +5297,38 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-01-29T09:50:25+00:00" + "time": "2018-01-12 06:34:42" }, { "name": "sebastian/diff", - "version": "1.4.3", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -4954,32 +5355,32 @@ "keywords": [ "diff" ], - "time": "2017-05-22T07:24:03+00:00" + "time": "2017-08-03 08:09:46" }, { "name": "sebastian/environment", - "version": "2.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^5.0" + "phpunit/phpunit": "^6.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -5004,34 +5405,34 @@ "environment", "hhvm" ], - "time": "2016-11-26T07:53:53+00:00" + "time": "2017-07-01 08:51:00" }, { "name": "sebastian/exporter", - "version": "2.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/recursion-context": "^3.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -5071,27 +5472,27 @@ "export", "exporter" ], - "time": "2016-11-19T08:54:04+00:00" + "time": "2017-04-03 13:19:02" }, { "name": "sebastian/global-state", - "version": "1.1.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -5099,7 +5500,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -5122,33 +5523,34 @@ "keywords": [ "global state" ], - "time": "2015-10-12T03:26:01+00:00" + "time": "2017-04-27 15:39:26" }, { "name": "sebastian/object-enumerator", - "version": "2.0.1", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", "shasum": "" }, "require": { - "php": ">=5.6", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -5168,32 +5570,77 @@ ], "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" + "time": "2017-08-03 12:35:26" + }, + { + "name": "sebastian/object-reflector", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29 09:07:27" }, { "name": "sebastian/recursion-context", - "version": "2.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -5221,7 +5668,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19T07:33:16+00:00" + "time": "2017-03-03 06:23:57" }, { "name": "sebastian/resource-operations", @@ -5263,7 +5710,7 @@ ], "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" + "time": "2015-07-28 20:34:47" }, { "name": "sebastian/version", @@ -5306,65 +5753,47 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" + "time": "2016-10-03 07:35:21" }, { - "name": "symfony/yaml", - "version": "v4.0.3", + "name": "theseer/tokenizer", + "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "b84f646b9490d2101e2c25ddeec77ceefbda2eee" + "url": "https://github.com/theseer/tokenizer.git", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/b84f646b9490d2101e2c25ddeec77ceefbda2eee", - "reference": "b84f646b9490d2101e2c25ddeec77ceefbda2eee", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", "shasum": "" }, "require": { - "php": "^7.1.3" - }, - "conflict": { - "symfony/console": "<3.4" - }, - "require-dev": { - "symfony/console": "~3.4|~4.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" } ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:38:00+00:00" + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2017-04-07 12:08:54" }, { "name": "webmozart/assert", @@ -5414,7 +5843,7 @@ "check", "validate" ], - "time": "2016-11-23T20:04:58+00:00" + "time": "2016-11-23 20:04:58" }, { "name": "xethron/laravel-4-generators", @@ -5460,7 +5889,7 @@ } ], "description": "Rapidly generate resources, migrations, models, and much more.", - "time": "2017-02-23T11:20:49+00:00" + "time": "2017-02-23 11:20:49" }, { "name": "xethron/migrations-generator", @@ -5520,7 +5949,7 @@ "migration", "migrations" ], - "time": "2017-09-19T17:31:57+00:00" + "time": "2017-09-19 17:31:57" } ], "aliases": [],