Commit bd7f232b authored by Dominik Hebeler's avatar Dominik Hebeler

Update auf Laravel 5.5

Achtung damit funktioniert gulp nicht mehr über einen direkten Aufruf.
Stattdessen bitte "npm run dev" bzw. "npm run production" verwenden.
parent 7e12de35
......@@ -28,7 +28,7 @@ update(144.76.113.134):
- chmod -R 777 storage
- chmod -R 777 bootstrap/cache
- npm install
- ./gulpbuild.sh
- npm run prodution
- if [ -f ~/MetaGer/artisan ]; then php ~/MetaGer/artisan down;fi
- cd ~/
- while [ -d ~/MetaGer ]; do rm -rf ~/MetaGer;done
......@@ -67,7 +67,7 @@ update(metager2):
- chmod -R 777 storage
- chmod -R 777 bootstrap/cache
- npm install
- ./gulpbuild.sh
- npm run prodution
- if [ -f ~/MetaGer/artisan ]; then php ~/MetaGer/artisan down;fi
- cd ~/
- while [ -d ~/MetaGer ]; do rm -rf ~/MetaGer;done
......
......@@ -35,5 +35,6 @@ class Kernel extends ConsoleKernel
protected function commands()
{
require base_path('routes/console.php');
$this->load(__DIR__.'/Commands');
}
}
......@@ -49,7 +49,7 @@ class MailController extends Controller
$replyTo = $request->input('email');
}
if (!$request->has('message') || !$request->has('subject')) {
if (!$request->filled('message') || !$request->filled('subject')) {
$messageType = "error";
$returnMessage = "Tut uns leid, aber leider haben wir mit Ihrer Kontaktanfrage keine Daten erhalten. Die Nachricht wurde nicht versandt.";
} else {
......@@ -95,7 +95,7 @@ class MailController extends Controller
# Kontonummer ( IBAN )
# Bankleitzahl ( BIC )
# Nachricht
if (!$request->has('Kontonummer') || !$request->has('Bankleitzahl') || !$request->has('Betrag')) {
if (!$request->filled('Kontonummer') || !$request->filled('Bankleitzahl') || !$request->filled('Betrag')) {
$messageToUser = "Sie haben eins der folgenden Felder nicht ausgefüllt: IBAN, BIC, Nachricht. Bitte korrigieren Sie Ihre Eingabe und versuchen es erneut.\n";
$messageType = "error";
} else {
......
......@@ -10,7 +10,7 @@ class Pictureproxy extends Controller
{
public function get(Request $request)
{
if ($request->has('url')) {
if ($request->filled('url')) {
try {
$arrContextOptions = array(
"ssl" => array(
......
......@@ -145,7 +145,7 @@ class StartpageController extends Controller
{
$link = "";
$password = "";
if ($request->has('eingabe')) {
if ($request->filled('eingabe')) {
$password = getenv('berlin');
$password = md5($request->input('eingabe') . " -host:userpage.fu-berlin.de" . $password);
$link = "/meta/meta.ger3?eingabe=" . $request->input('eingabe') . " -host:userpage.fu-berlin.de&focus=web&password=" . $password . "&encoding=utf8&lang=all&site=fu-berlin.de&quicktips=off&out=results-with-style";
......
......@@ -9,7 +9,7 @@ class ZitatController extends Controller
public function zitatSuche(Request $request)
{
$validResults = [];
if ($request->has("q")) {
if ($request->filled("q")) {
# The user searched for something
$fileName = storage_path() . "/app/public/zitate.txt";
$fileContent = file_get_contents($fileName);
......
......@@ -482,7 +482,7 @@ class MetaGer
public function createSearchEngines(Request $request)
{
# Wenn es kein Suchwort gibt
if (!$request->has("eingabe") || $this->q === "") {
if (!$request->filled("eingabe") || $this->q === "") {
return;
}
......@@ -607,7 +607,7 @@ class MetaGer
public function sumaIsSelected($suma, $request, $custom)
{
if ($custom) {
if ($request->has("engine_" . $suma["name"])) {
if ($request->filled("engine_" . $suma["name"])) {
return true;
}
} else {
......@@ -707,7 +707,7 @@ class MetaGer
public function requestIsCached($request)
{
return
$request->has('next')
$request->filled('next')
&& Cache::has($request->input('next'))
&& unserialize(Cache::get($request->input('next')))['page'] > 1;
}
......@@ -972,14 +972,14 @@ class MetaGer
# Ergebnisse pro Seite:
$this->resultCount = $request->input('resultCount', '20');
# Manchmal müssen wir Parameter anpassen um den Sucheinstellungen gerecht zu werden:
if ($request->has('dart')) {
if ($request->filled('dart')) {
$this->time = 10000;
$this->warnings[] = trans('metaGer.formdata.dartEurope');
}
if ($this->time <= 500 || $this->time > 20000) {
$this->time = 1000;
}
if ($request->has('minism') && ($request->has('fportal') || $request->has('harvest'))) {
if ($request->filled('minism') && ($request->filled('fportal') || $request->filled('harvest'))) {
$input = $request->all();
$newInput = [];
foreach ($input as $key => $value) {
......@@ -995,14 +995,14 @@ class MetaGer
if ($this->resultCount <= 0 || $this->resultCount > 200) {
$this->resultCount = 1000;
}
if ($request->has('onenewspageAll') || $request->has('onenewspageGermanyAll')) {
if ($request->filled('onenewspageAll') || $request->filled('onenewspageGermanyAll')) {
$this->time = 5000;
$this->cache = "cache";
}
if ($request->has('password')) {
if ($request->filled('password')) {
$this->password = $request->input('password');
}
if ($request->has('quicktips')) {
if ($request->filled('quicktips')) {
$this->quicktips = false;
} else {
$this->quicktips = true;
......@@ -1045,7 +1045,7 @@ class MetaGer
public function checkSpecialSearches(Request $request)
{
if ($request->has('site')) {
if ($request->filled('site')) {
$site = $request->input('site');
} else {
$site = "";
......
......@@ -6,7 +6,7 @@
"type": "project",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.4.*",
"laravel/framework": "5.5.*",
"predis/predis": "^1.1",
"mcamara/laravel-localization": "^1.1",
"jenssegers/agent": "^2.3",
......@@ -16,41 +16,47 @@
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.7",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~6.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*"
"symfony/dom-crawler": "3.1.*",
"filp/whoops": "~2.0"
},
"autoload": {
"classmap": [
"database"
"database/seeds",
"database/factories"
],
"psr-4": {
"App\\": "app/"
}
},
"autoload-dev": {
"classmap": [
"tests/TestCase.php"
]
"psr-4": {
"Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"dont-discover": [
]
}
},
"scripts": {
"post-root-package-install": [
"php -r \"file_exists('.env') || copy('.env.example', '.env');\""
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"php artisan key:generate"
],
"post-install-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postInstall",
"php artisan optimize"
"@php artisan key:generate"
],
"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"
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
}
}
......@@ -4,25 +4,24 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "2d365039b51b8b38781d3176aa2627fd",
"content-hash": "75e2db96a94e8c9439f5fc071e380fd6",
"content-hash": "27d7554c4cf4ca03f97a076d1628bd02",
"packages": [
{
"name": "doctrine/inflector",
"version": "v1.2.0",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "e11d84c6e018beedd929cff5220969a3c6d1d462"
"reference": "5527a48b7313d15261292c149e55e26eae771b0a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462",
"reference": "e11d84c6e018beedd929cff5220969a3c6d1d462",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
"reference": "5527a48b7313d15261292c149e55e26eae771b0a",
"shasum": ""
},
"require": {
"php": "^7.0"
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "^6.2"
......@@ -30,7 +29,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
"dev-master": "1.3.x-dev"
}
},
"autoload": {
......@@ -72,7 +71,118 @@
"singularize",
"string"
],
"time": "2017-07-22 12:18:28"
"time": "2018-01-09T20:05:19+00:00"
},
{
"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-09T13:34:57+00:00"
},
{
"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-15T23:40:40+00:00"
},
{
"name": "erusev/parsedown",
......@@ -117,7 +227,7 @@
"markdown",
"parser"
],
"time": "2017-11-14 20:44:03"
"time": "2017-11-14T20:44:03+00:00"
},
{
"name": "fideloper/proxy",
......@@ -174,7 +284,7 @@
"proxy",
"trusted proxy"
],
"time": "2017-06-15 17:19:42"
"time": "2017-06-15T17:19:42+00:00"
},
{
"name": "guzzlehttp/guzzle",
......@@ -239,7 +349,7 @@
"rest",
"web service"
],
"time": "2017-06-22 18:50:49"
"time": "2017-06-22T18:50:49+00:00"
},
{
"name": "guzzlehttp/promises",
......@@ -290,7 +400,7 @@
"keywords": [
"promise"
],
"time": "2016-12-20 10:07:11"
"time": "2016-12-20T10:07:11+00:00"
},
{
"name": "guzzlehttp/psr7",
......@@ -355,20 +465,20 @@
"uri",
"url"
],
"time": "2017-03-20 17:10:46"
"time": "2017-03-20T17:10:46+00:00"
},
{
"name": "jaybizzle/crawler-detect",
"version": "v1.2.54",
"version": "v1.2.57",
"source": {
"type": "git",
"url": "https://github.com/JayBizzle/Crawler-Detect.git",
"reference": "9af25770d9382917b680009a88497162405bbe48"
"reference": "2f1502a434baad1da0fa43c3f3e2b09504fa6b81"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/9af25770d9382917b680009a88497162405bbe48",
"reference": "9af25770d9382917b680009a88497162405bbe48",
"url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/2f1502a434baad1da0fa43c3f3e2b09504fa6b81",
"reference": "2f1502a434baad1da0fa43c3f3e2b09504fa6b81",
"shasum": ""
},
"require": {
......@@ -404,7 +514,7 @@
"crawlerdetect",
"php crawler detect"
],
"time": "2017-10-28 13:05:55"
"time": "2018-02-03T12:01:03+00:00"
},
{
"name": "jenssegers/agent",
......@@ -470,20 +580,20 @@
"user agent",
"useragent"
],
"time": "2017-11-10 10:35:35"
"time": "2017-11-10T10:35:35+00:00"
},
{
"name": "laravel/framework",
"version": "v5.4.36",
"version": "v5.5.33",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "1062a22232071c3e8636487c86ec1ae75681bbf9"
"reference": "ef7880e665390f999f4def7c9f78133636f973cf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9",
"reference": "1062a22232071c3e8636487c86ec1ae75681bbf9",
"url": "https://api.github.com/repos/laravel/framework/zipball/ef7880e665390f999f4def7c9f78133636f973cf",
"reference": "ef7880e665390f999f4def7c9f78133636f973cf",
"shasum": ""
},
"require": {
......@@ -492,21 +602,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"
},
......@@ -523,7 +634,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",
......@@ -545,33 +655,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": {
......@@ -599,20 +714,20 @@
"framework",
"laravel"
],
"time": "2017-08-30 09:26:16"
"time": "2018-01-30T15:06:13+00:00"
},
{
"name": "league/flysystem",
"version": "1.0.41",
"version": "1.0.42",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "f400aa98912c561ba625ea4065031b7a41e5a155"
"reference": "09eabc54e199950041aef258a85847676496fe8e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f400aa98912c561ba625ea4065031b7a41e5a155",
"reference": "f400aa98912c561ba625ea4065031b7a41e5a155",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/09eabc54e199950041aef258a85847676496fe8e",
"reference": "09eabc54e199950041aef258a85847676496fe8e",
"shasum": ""
},
"require": {
......@@ -623,12 +738,13 @@
},
"require-dev": {
"ext-fileinfo": "*",
"mockery/mockery": "~0.9",
"phpspec/phpspec": "^2.2",
"phpunit/phpunit": "~4.8"
"phpspec/phpspec": "^3.4",
"phpunit/phpunit": "^5.7"
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
"ext-ftp": "Allows you to use FTP server storage",
"ext-openssl": "Allows you to use FTPS server storage",
"league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
"league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
"league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
......@@ -682,20 +798,20 @@
"sftp",
"storage"
],
"time": "2017-08-06 17:41:04"
"time": "2018-01-27T16:03:56+00:00"
},
{
"name": "mcamara/laravel-localization",
"version": "1.3.3",
"version": "v1.3.4",
"source": {
"type": "git",
"url": "https://github.com/mcamara/laravel-localization.git",
"reference": "e9842855939ffb4dde9ecbb8839a08fd6d6bc42f"
"reference": "fc2188a82611507f85f2219664b0d789f3d38212"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/e9842855939ffb4dde9ecbb8839a08fd6d6bc42f",
"reference": "e9842855939ffb4dde9ecbb8839a08fd6d6bc42f",
"url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/fc2188a82611507f85f2219664b0d789f3d38212",
"reference": "fc2188a82611507f85f2219664b0d789f3d38212",
"shasum": ""
},
"require": {
......@@ -744,27 +860,27 @@
"localization",
"php"
],
"time": "2017-11-11 13:24:49"
"time": "2018-01-23T15:10:21+00:00"
},
{
"name": "mobiledetect/mobiledetectlib",
"version": "2.8.27",
"version": "2.8.30",
"source": {
"type": "git",
"url": "https://github.com/serbanghita/Mobile-Detect.git",
"reference": "fd3aa7a352608cbb2d899a61e35530bd1c9004bc"
"reference": "5500bbbf312fe77ef0c7223858dad84fe49ee0c3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/fd3aa7a352608cbb2d899a61e35530bd1c9004bc",
"reference": "fd3aa7a352608cbb2d899a61e35530bd1c9004bc",
"url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/5500bbbf312fe77ef0c7223858dad84fe49ee0c3",
"reference": "5500bbbf312fe77ef0c7223858dad84fe49ee0c3",
"shasum": ""
},
"require": {
"php": ">=5.0.0"
},
"require-dev": {
"phpunit/phpunit": "*"
"phpunit/phpunit": "~4.8.35||~5.7"
},
"type": "library",
"autoload": {
......@@ -796,7 +912,7 @@
"mobile detector",
"php mobile detect"
],
"time": "2017-12-03 15:42:01"
"time": "2017-12-18T10:38:51+00:00"
},
{
"name": "monolog/monolog",
......@@ -874,7 +990,7 @@
"logging",
"psr-3"