Commit d094341a authored by Karl's avatar Karl
Browse files

Merge with Development

parents 75a83950 ecadc412
......@@ -3,7 +3,7 @@
namespace App\Console\Commands;
use Illuminate\Console\Command;
use Redis;
use Illuminate\Support\Facades\Redis;
class LogRotate extends Command
{
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Redis;
use Illuminate\Support\Facades\Redis;
class AdminInterface extends Controller
{
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Redis;
use Illuminate\Support\Facades\Redis;
class LogController extends Controller
{
......
......@@ -6,7 +6,7 @@ use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Redis;
use Illuminate\Support\Facades\Redis;
class Search implements ShouldQueue
{
......@@ -309,7 +309,7 @@ class Search implements ShouldQueue
try
{
$fp = pfsockopen($this->getHost() . ":" . $this->port . "/$counter", $this->port, $errstr, $errno, 1);
$fp = pfsockopen($this->getHost(), $this->port, $errstr, $errno, 1);
} catch (\ErrorException $e) {
break;
}
......
......@@ -8,7 +8,7 @@ use Jenssegers\Agent\Agent;
use LaravelLocalization;
use Log;
use Predis\Connection\ConnectionException;
use Redis;
use Illuminate\Support\Facades\Redis;
class MetaGer
{
......
......@@ -7,7 +7,7 @@ use App\MetaGer;
use Cache;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Log;
use Redis;
use Illuminate\Support\Facades\Redis;
abstract class Searchengine
{
......
......@@ -6,7 +6,7 @@ use Illuminate\Queue\Events\JobProcessed;
use Illuminate\Queue\Events\JobProcessing;
use Illuminate\Support\ServiceProvider;
use Queue;
use Redis;
use Illuminate\Support\Facades\Redis;
class AppServiceProvider extends ServiceProvider
{
......
......@@ -6,7 +6,7 @@
"type": "project",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.3.*",
"laravel/framework": "5.4.*",
"predis/predis": "^1.1",
"mcamara/laravel-localization": "^1.1",
"jenssegers/agent": "^2.3",
......@@ -17,7 +17,7 @@
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.0",
"phpunit/phpunit": "~5.7",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*"
},
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{
"js/editLanguage.js": "js/editLanguage-7a1cbfb2ba.js",
"js/kontakt.js": "js/kontakt-de49d68db3.js",
"js/scriptResultPage.js": "js/scriptResultPage-357d27fe23.js",
"js/scriptStartPage.js": "js/scriptStartPage-030737555a.js",
"js/settings.js": "js/settings-6ff0eab621.js",
"js/widgets.js": "js/widgets-866379dd63.js"
}
\ No newline at end of file
......@@ -7021,7 +7021,7 @@ Mixed
li#info {
white-space: pre-line;
}
main fieldset#foki {
main div#foki {
margin: 5px 0;
text-align: center;
}
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment