diff --git a/app/Console/Commands/DownloadImageAirlinersNet.php b/app/Console/Commands/DownloadImageAirlinersNet.php index 8e1e41d..c9d5a52 100755 --- a/app/Console/Commands/DownloadImageAirlinersNet.php +++ b/app/Console/Commands/DownloadImageAirlinersNet.php @@ -5,77 +5,80 @@ use GuzzleHttp\Client; use Illuminate\Console\Command; -class DownloadImageAirlinersNet extends Command { - /** - * The name and signature of the console command. - * - * @var string - */ - protected $signature = 'bizjets:downloadImageAirlinersNet {reg?}'; - - /** - * The console command description. - * - * @var string - */ - protected $description = 'Download an image from airliners.net for a plane registration'; - - /** - * Create a new command instance. - * - * @return void - */ - public function __construct() { - parent::__construct(); - } - - /** - * Execute the console command. - * - * @return mixed - */ - public function handle() { - $reg = $this->argument('reg'); - - echo "command called to download :" . $reg . PHP_EOL; - - $url = "http://www.airliners.net/search?registrationActual=" . $reg; - // echo $url; - $client = new Client([ - 'timeout' => 60.0, - ]); - $response = $client->request('GET', $url); - $html = $response->getBody()->getContents(); - - $doc = new \DOMDocument(); - $tidy_config = array( - 'clean' => true, - 'output-xhtml' => true, - 'show-body-only' => false, - 'wrap' => 0, - ); - $tidy = tidy_parse_string($html, $tidy_config, 'UTF8'); - $tidy->cleanRepair(); - - $html = $tidy->html(); - - libxml_use_internal_errors(true); - $doc->loadHTML(mb_convert_encoding($html, "UTF-8")); - libxml_clear_errors(); - - $xpath = new \DOMXpath($doc); - - $src = $xpath->evaluate("string(//img[@class='lazy-load']/@src)"); - - if ($src) { - $imgSrc = $src; - $contents = file_get_contents($imgSrc); - $save_path = public_path() . "/planeImages/airlinersNet/" . $reg . ".jpg"; - file_put_contents($save_path, $contents); - - $operator = $xpath->evaluate('string(//div[@class="ps-v2-results-display-detail-no-wrapping"] )'); - - echo "AirlinerNet: " . $operator . PHP_EOL; - } - } +class DownloadImageAirlinersNet extends Command +{ + /** + * The name and signature of the console command. + * + * @var string + */ + protected $signature = 'bizjets:downloadImageAirlinersNet {reg?}'; + + /** + * The console command description. + * + * @var string + */ + protected $description = 'Download an image from airliners.net for a plane registration'; + + /** + * Create a new command instance. + * + * @return void + */ + public function __construct() + { + parent::__construct(); + } + + /** + * Execute the console command. + * + * @return mixed + */ + public function handle() + { + $reg = $this->argument('reg'); + + echo 'command called to download :'.$reg.PHP_EOL; + + $url = 'http://www.airliners.net/search?registrationActual='.$reg; + // echo $url; + $client = new Client([ + 'timeout' => 60.0, + ]); + $response = $client->request('GET', $url); + $html = $response->getBody()->getContents(); + + $doc = new \DOMDocument(); + $tidy_config = [ + 'clean' => true, + 'output-xhtml' => true, + 'show-body-only' => false, + 'wrap' => 0, + ]; + $tidy = tidy_parse_string($html, $tidy_config, 'UTF8'); + $tidy->cleanRepair(); + + $html = $tidy->html(); + + libxml_use_internal_errors(true); + $doc->loadHTML(mb_convert_encoding($html, 'UTF-8')); + libxml_clear_errors(); + + $xpath = new \DOMXpath($doc); + + $src = $xpath->evaluate("string(//img[@class='lazy-load']/@src)"); + + if ($src) { + $imgSrc = $src; + $contents = file_get_contents($imgSrc); + $save_path = public_path().'/planeImages/airlinersNet/'.$reg.'.jpg'; + file_put_contents($save_path, $contents); + + $operator = $xpath->evaluate('string(//div[@class="ps-v2-results-display-detail-no-wrapping"] )'); + + echo 'AirlinerNet: '.$operator.PHP_EOL; + } + } } diff --git a/app/Console/Commands/DownloadImageJetPhoto.php b/app/Console/Commands/DownloadImageJetPhoto.php index 59ecf96..b0fb237 100755 --- a/app/Console/Commands/DownloadImageJetPhoto.php +++ b/app/Console/Commands/DownloadImageJetPhoto.php @@ -5,76 +5,79 @@ use GuzzleHttp\Client; use Illuminate\Console\Command; -class DownloadImageJetPhoto extends Command { - /** - * The name and signature of the console command. - * - * @var string - */ - protected $signature = 'bizjets:downloadImageJetPhoto {reg?}'; - - /** - * The console command description. - * - * @var string - */ - protected $description = 'Download an image from jet photo for a plane registration'; - - /** - * Create a new command instance. - * - * @return void - */ - public function __construct() { - parent::__construct(); - } - - /** - * Execute the console command. - * - * @return mixed - */ - public function handle() { - $reg = $this->argument('reg'); - - sleep(5); // to delay each download to jetphotos - 429 too many requests! - - echo "command called to download :" . $reg . PHP_EOL; - - $url = "https://www.jetphotos.com/registration/" . $reg; - //echo $url; - - $client = new Client([ - 'timeout' => 60.0, - ]); - $response = $client->request('GET', $url); - $html = $response->getBody()->getContents(); - - $doc = new \DOMDocument(); - - $tidy = tidy_parse_string($html); - $tidy->cleanRepair(); - - $html = $tidy->html(); - - libxml_use_internal_errors(true); - $doc->loadHTML(mb_convert_encoding($html, "UTF-8")); - libxml_clear_errors(); - - $xpath = new \DOMXpath($doc); - - // jetphotos - - $src = $xpath->evaluate("string(//img[@class='result__photo']/@src)"); - if ($src) { - $imgSrc = "https:" . $src; - $contents = file_get_contents($imgSrc); - $save_path = public_path() . "/planeImages/jetPhotos/" . $reg . ".jpg"; - file_put_contents($save_path, $contents); - - $alt = $xpath->evaluate("string(//img[@class='result__photo']/@alt)"); - echo "jetphoto " . $alt; - echo PHP_EOL; - } - } +class DownloadImageJetPhoto extends Command +{ + /** + * The name and signature of the console command. + * + * @var string + */ + protected $signature = 'bizjets:downloadImageJetPhoto {reg?}'; + + /** + * The console command description. + * + * @var string + */ + protected $description = 'Download an image from jet photo for a plane registration'; + + /** + * Create a new command instance. + * + * @return void + */ + public function __construct() + { + parent::__construct(); + } + + /** + * Execute the console command. + * + * @return mixed + */ + public function handle() + { + $reg = $this->argument('reg'); + + sleep(5); // to delay each download to jetphotos - 429 too many requests! + + echo 'command called to download :'.$reg.PHP_EOL; + + $url = 'https://www.jetphotos.com/registration/'.$reg; + //echo $url; + + $client = new Client([ + 'timeout' => 60.0, + ]); + $response = $client->request('GET', $url); + $html = $response->getBody()->getContents(); + + $doc = new \DOMDocument(); + + $tidy = tidy_parse_string($html); + $tidy->cleanRepair(); + + $html = $tidy->html(); + + libxml_use_internal_errors(true); + $doc->loadHTML(mb_convert_encoding($html, 'UTF-8')); + libxml_clear_errors(); + + $xpath = new \DOMXpath($doc); + + // jetphotos + + $src = $xpath->evaluate("string(//img[@class='result__photo']/@src)"); + if ($src) { + $imgSrc = 'https:'.$src; + $contents = file_get_contents($imgSrc); + $save_path = public_path().'/planeImages/jetPhotos/'.$reg.'.jpg'; + file_put_contents($save_path, $contents); + + $alt = $xpath->evaluate("string(//img[@class='result__photo']/@alt)"); + echo 'jetphoto '.$alt; + echo PHP_EOL; + } + } } diff --git a/app/Console/Commands/ImportDeletedAircraftToLive.php b/app/Console/Commands/ImportDeletedAircraftToLive.php index 31c9542..54e9d67 100644 --- a/app/Console/Commands/ImportDeletedAircraftToLive.php +++ b/app/Console/Commands/ImportDeletedAircraftToLive.php @@ -2,11 +2,11 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; -use DB; +use App\Countries; use App\Planes; use App\PlanesNew; -use App\Countries; +use DB; +use Illuminate\Console\Command; class ImportDeletedAircraftToLive extends Command { @@ -41,7 +41,7 @@ public function __construct() */ public function handle() { - $this->comment("STARTING " . time()); + $this->comment('STARTING '.time()); // first loop - get the results from planes (the original list) @@ -50,15 +50,10 @@ public function handle() $planesNew = PlanesNew::select('type', 'conNumber')->where('type', '=', $row->type)->where('conNumber', '=', $row->conNumber)->first(); if (isset($planesNew)) { - } else { - - echo "DELETED ". $row->reg . " ". $row->type ." " . $row->conNumber .PHP_EOL; - - } + echo 'DELETED '.$row->reg.' '.$row->type.' '.$row->conNumber.PHP_EOL; } - + } }); - } } diff --git a/app/Console/Commands/ImportNewAircraftToLive.php b/app/Console/Commands/ImportNewAircraftToLive.php index f8a4aa3..dce856e 100755 --- a/app/Console/Commands/ImportNewAircraftToLive.php +++ b/app/Console/Commands/ImportNewAircraftToLive.php @@ -2,13 +2,13 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; -use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Input\InputArgument; -use DB; +use App\Countries; use App\Planes; use App\PlanesNew; -use App\Countries; +use DB; +use Illuminate\Console\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputOption; class ImportNewAircraftToLive extends Command { @@ -43,7 +43,7 @@ public function __construct() */ public function handle() { - $this->comment("STARTING " . time()); + $this->comment('STARTING '.time()); // first loop - get the results from planesNew @@ -53,20 +53,18 @@ public function handle() //does it already exist as this row? $planes = Planes::select('reg', 'type', 'conNumber', 'notes')->where('reg', '=', $row->reg)->where('type', '=', $row->type)->where('conNumber', '=', $row->conNumber)->first(); - if (!isset($planes->reg)) { - echo "NEW " . $row->reg . " " . $row->type ." " . $row->conNumber . " " .$row->notes . PHP_EOL; - - $plane = new Planes; - $plane->reg = $row->reg; - $plane->type = $row->type; - $plane->conNumber = $row->conNumber; - $plane->notes = $row->notes; - $plane->countryCode = $row->countryCode; - $plane->save(); + if (! isset($planes->reg)) { + echo 'NEW '.$row->reg.' '.$row->type.' '.$row->conNumber.' '.$row->notes.PHP_EOL; - } - + $plane = new Planes; + $plane->reg = $row->reg; + $plane->type = $row->type; + $plane->conNumber = $row->conNumber; + $plane->notes = $row->notes; + $plane->countryCode = $row->countryCode; + $plane->save(); } + } }); } } diff --git a/app/Console/Commands/ImportPlanes.php b/app/Console/Commands/ImportPlanes.php index f4368c6..6819efb 100755 --- a/app/Console/Commands/ImportPlanes.php +++ b/app/Console/Commands/ImportPlanes.php @@ -2,16 +2,15 @@ namespace App\Console\Commands; +use App\Countries; +use App\PlanesNew; +use DB; use Illuminate\Console\Command; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputArgument; -use DB; -use App\PlanesNew; -use App\Countries; +use Symfony\Component\Console\Input\InputOption; class ImportPlanes extends Command { - /** * The console command name. * @@ -43,39 +42,37 @@ public function __construct() */ public function handle() { - $this->comment("STARTING " . time()); + $this->comment('STARTING '.time()); $counter = 0; //path to directory to scan - $directory = env("BIZJETS_DIRECTORY") . "*.php"; - echo $directory . PHP_EOL; + $directory = env('BIZJETS_DIRECTORY').'*.php'; + echo $directory.PHP_EOL; - if (env("BIZJETS_DIRECTORY") == "") { - echo "you need to run php artisan config:clear" . PHP_EOL; + if (env('BIZJETS_DIRECTORY') == '') { + echo 'you need to run php artisan config:clear'.PHP_EOL; exit; } - echo "Importing files into database". PHP_EOL; - + echo 'Importing files into database'.PHP_EOL; $run = $this->ask('Do you want to run this import and CLEAR THE planesNew table? Type YES'); - if ($run != "YES") { - echo "You need to type YES to run it, ABORTING"; + if ($run != 'YES') { + echo 'You need to type YES to run it, ABORTING'; exit; } PlanesNew::truncate(); - $files= glob($directory); + $files = glob($directory); usort($files, function ($a, $b) { return filemtime($a) - filemtime($b); }); - - $filesArray = array(); + $filesArray = []; //print each file name foreach ($files as $file) { @@ -83,44 +80,43 @@ public function handle() $filesArray[] = $file; } - foreach ($filesArray as $file) { $doc = new \DOMDocument(); - $myfile = fopen($file, "r") or die("Unable to open file!"); + $myfile = fopen($file, 'r') or die('Unable to open file!'); $fileContents = fread($myfile, filesize($file)); $tidy = tidy_parse_string($fileContents); $html = $tidy->html(); - + libxml_use_internal_errors(true); - $doc->loadHTML(mb_convert_encoding($html, "UTF-8")); + $doc->loadHTML(mb_convert_encoding($html, 'UTF-8')); libxml_use_internal_errors(false); - + $xpath = new \DOMXpath($doc); // get counrty code from the filename - $bits = explode("-icao-", $file); + $bits = explode('-icao-', $file); $code = strtoupper(substr($bits[1], 0, -4)); - echo $code . " " . $file . PHP_EOL; + echo $code.' '.$file.PHP_EOL; // collect header names - $headerNames = array(); + $headerNames = []; foreach ($xpath->query('//table[@class="tablesorter"]//th') as $node) { $headerNames[] = $node->nodeValue; } // collect data foreach ($xpath->query('//tbody/tr') as $node) { - $lines = array(); + $lines = []; foreach ($xpath->query('td', $node) as $cell) { $lines[] = $cell->nodeValue; } $notes = strtoupper($lines[3]); - $aReplace = array('(', ')'); + $aReplace = ['(', ')']; $notes = str_replace($aReplace, ' ', $notes); - $aReplace = array(' EX ', ',' , '/', ' '); + $aReplace = [' EX ', ',', '/', ' ']; $notes = str_replace($aReplace, ' ', $notes); $type = $this->cleanType($lines[1]); @@ -133,71 +129,68 @@ public function handle() } } } - $this->question("FINISHED " . time() . " completed " . $counter . " lines"); + $this->question('FINISHED '.time().' completed '.$counter.' lines'); } /** correct typos in the original data and standardize types * see this link for the 4 letter codes - * http://www.flugzeuginfo.net/table_accodes_en.php?sort=manuasc + * http://www.flugzeuginfo.net/table_accodes_en.php?sort=manuasc. * * @return string */ protected function cleanType($type) { - if ($type == "A318 Elite") { - return "Airbus A318 Elite"; - } elseif ($type == "Dasasult Falcon 2000") { - return "Dassault Falcon 2000"; - } elseif ($type == "Cessna F550 Citation II") { - return "Cessna 550 Citation II"; - } elseif ($type == "Eclipse 500") { - return "Eclipse EA500"; - } elseif ($type == "125-700A") { - return "BAe 125-700A"; - } elseif ($type == "BAe125-700A") { - return "BAe 125-700A"; - } elseif ($type == "BAe125-800A") { - return "BAe 125-800A"; - } elseif ($type == "BAe125-800SP") { - return "BAe 125-800SP"; - } elseif ($type == "Cessna 525A Citation Cj2") { - return "Cessna 525A CitationJet Cj2"; - } elseif ($type == "Falcon 20") { - return "Dassault Falcon 20"; - } elseif ($type == "Falcon 2000") { - return "Dassault Falcon 2000"; - } elseif ($type == "FALCON 20C") { - return "Dassault Falcon 20C"; - } elseif ($type == "Falcon 20D") { - return "Dassault Falcon 20D"; - } elseif ($type == "Falcon 20E") { - return "Dassault Falcon 20E"; - } elseif ($type == "Falcon 20F") { - return "Dassault Falcon 20F"; - } elseif ($type == "Gulfstream 2SP") { - return "Gulfstream IISP"; - } elseif ($type == "Gulfstream 450") { - return "Gulfstream G450"; - } elseif ($type == "Lear Jet 24") { - return "Learjet 24"; - } elseif ($type == "Lear Jet 24D") { - return "Learjet 24D"; - } elseif ($type == "Lear Jet 25B") { - return "Learjet 25B"; - } elseif ($type == "Lear Jet 25C") { - return "Learjet 25C"; - } elseif ($type == "Lear Jet 25D") { - return "Learjet 25D"; - } elseif ($type == "Lear Jet 25G") { - return "Learjet 25G"; + if ($type == 'A318 Elite') { + return 'Airbus A318 Elite'; + } elseif ($type == 'Dasasult Falcon 2000') { + return 'Dassault Falcon 2000'; + } elseif ($type == 'Cessna F550 Citation II') { + return 'Cessna 550 Citation II'; + } elseif ($type == 'Eclipse 500') { + return 'Eclipse EA500'; + } elseif ($type == '125-700A') { + return 'BAe 125-700A'; + } elseif ($type == 'BAe125-700A') { + return 'BAe 125-700A'; + } elseif ($type == 'BAe125-800A') { + return 'BAe 125-800A'; + } elseif ($type == 'BAe125-800SP') { + return 'BAe 125-800SP'; + } elseif ($type == 'Cessna 525A Citation Cj2') { + return 'Cessna 525A CitationJet Cj2'; + } elseif ($type == 'Falcon 20') { + return 'Dassault Falcon 20'; + } elseif ($type == 'Falcon 2000') { + return 'Dassault Falcon 2000'; + } elseif ($type == 'FALCON 20C') { + return 'Dassault Falcon 20C'; + } elseif ($type == 'Falcon 20D') { + return 'Dassault Falcon 20D'; + } elseif ($type == 'Falcon 20E') { + return 'Dassault Falcon 20E'; + } elseif ($type == 'Falcon 20F') { + return 'Dassault Falcon 20F'; + } elseif ($type == 'Gulfstream 2SP') { + return 'Gulfstream IISP'; + } elseif ($type == 'Gulfstream 450') { + return 'Gulfstream G450'; + } elseif ($type == 'Lear Jet 24') { + return 'Learjet 24'; + } elseif ($type == 'Lear Jet 24D') { + return 'Learjet 24D'; + } elseif ($type == 'Lear Jet 25B') { + return 'Learjet 25B'; + } elseif ($type == 'Lear Jet 25C') { + return 'Learjet 25C'; + } elseif ($type == 'Lear Jet 25D') { + return 'Learjet 25D'; + } elseif ($type == 'Lear Jet 25G') { + return 'Learjet 25G'; } else { return $type; } } - - - /** * Get the console command arguments. * @@ -205,9 +198,9 @@ protected function cleanType($type) */ protected function getArguments() { - return array( - array('example', InputArgument::OPTIONAL, 'An example argument.'), - ); + return [ + ['example', InputArgument::OPTIONAL, 'An example argument.'], + ]; } /** @@ -217,8 +210,8 @@ protected function getArguments() */ protected function getOptions() { - return array( - array('example', null, InputOption::VALUE_OPTIONAL, 'An example option.', null), - ); + return [ + ['example', null, InputOption::VALUE_OPTIONAL, 'An example option.', null], + ]; } } diff --git a/app/Console/Commands/downloadCorpjet.php b/app/Console/Commands/downloadCorpjet.php index cd61573..4aadb9a 100755 --- a/app/Console/Commands/downloadCorpjet.php +++ b/app/Console/Commands/downloadCorpjet.php @@ -2,11 +2,11 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; -use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Client; +use GuzzleHttp\Exception\GuzzleException; +use Illuminate\Console\Command; -class DownloadCorpjet extends Command +class downloadCorpjet extends Command { /** * The name and signature of the console command. @@ -39,29 +39,29 @@ public function __construct() */ public function handle() { - $files = file("/var/www/laravel54/corpjet.txt", FILE_IGNORE_NEW_LINES); + $files = file('/var/www/laravel54/corpjet.txt', FILE_IGNORE_NEW_LINES); foreach ($files as $file) { - // echo $file . PHP_EOL; - - $client = new Client([ + // echo $file . PHP_EOL; + + $client = new Client([ // You can set any number of default request options. 'timeout' => 200.0, ]); - $response = $client->request('GET', $file); - $html = $response->getBody()->getContents(); + $response = $client->request('GET', $file); + $html = $response->getBody()->getContents(); - // remove http://www.laasdata.com/corpjet/ - $file = substr($file, 32); + // remove http://www.laasdata.com/corpjet/ + $file = substr($file, 32); - if (file_put_contents('/var/www/laravel54/bizjets/' . $file, $html)) { - echo $file . ' DOWNLOADED'; - } else { - echo 'failed'; - } + if (file_put_contents('/var/www/laravel54/bizjets/'.$file, $html)) { + echo $file.' DOWNLOADED'; + } else { + echo 'failed'; + } - echo PHP_EOL; + echo PHP_EOL; - sleep(10); + sleep(10); } } } diff --git a/app/Console/Commands/rss.php b/app/Console/Commands/rss.php index f01625d..8f7462e 100755 --- a/app/Console/Commands/rss.php +++ b/app/Console/Commands/rss.php @@ -2,9 +2,9 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; -use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Client; +use GuzzleHttp\Exception\GuzzleException; +use Illuminate\Console\Command; class rss extends Command { @@ -39,29 +39,28 @@ public function __construct() */ public function handle() { - - $files = file("/var/www/laravel54/rss/feeds.txt", FILE_IGNORE_NEW_LINES); - foreach ($files as $file) { - // echo $file . PHP_EOL; - - $client = new Client([ + $files = file('/var/www/laravel54/rss/feeds.txt', FILE_IGNORE_NEW_LINES); + foreach ($files as $file) { + // echo $file . PHP_EOL; + + $client = new Client([ // You can set any number of default request options. 'timeout' => 200.0, ]); - $response = $client->request('GET', $file); - $html = $response->getBody()->getContents(); + $response = $client->request('GET', $file); + $html = $response->getBody()->getContents(); - $file = $name = str_replace(array('-','/'), "-", $file); + $file = $name = str_replace(['-', '/'], '-', $file); - if (file_put_contents('/var/www/laravel54/rss/' . $file.".rss", $html)) { - echo $file . ' DOWNLOADED'; - } else { - echo 'failed'; - } + if (file_put_contents('/var/www/laravel54/rss/'.$file.'.rss', $html)) { + echo $file.' DOWNLOADED'; + } else { + echo 'failed'; + } - echo PHP_EOL; + echo PHP_EOL; - sleep(4); - } + sleep(4); + } } } diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index b8feb6f..7673fdf 100755 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -20,7 +20,7 @@ class Kernel extends ConsoleKernel Commands\downloadCorpjet::class, Commands\DownloadImageJetPhoto::class, Commands\DownloadImageAirlinersNet::class, - + ]; /** diff --git a/app/Countries.php b/app/Countries.php index 6529826..c04e4eb 100755 --- a/app/Countries.php +++ b/app/Countries.php @@ -6,22 +6,19 @@ class Countries extends Model { + protected $connection = 'mysql2'; - protected $connection = 'mysql2'; - - /** + /** * The table associated with the model. * * @var string */ - protected $table = 'countries'; - + /** * Indicates if the model should be timestamped. * * @var bool */ - public $timestamps = false; } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index c5c83e5..774ac1a 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Auth; -use App\User; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Validator; +use App\User; use Illuminate\Foundation\Auth\RegistersUsers; +use Illuminate\Support\Facades\Validator; class RegisterController extends Controller { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 03e02a2..a0a2a8a 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; +use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Routing\Controller as BaseController; use Illuminate\Foundation\Validation\ValidatesRequests; -use Illuminate\Foundation\Auth\Access\AuthorizesRequests; +use Illuminate\Routing\Controller as BaseController; class Controller extends BaseController { diff --git a/app/Http/Controllers/CssController.php b/app/Http/Controllers/CssController.php index 2d84274..0a18d75 100644 --- a/app/Http/Controllers/CssController.php +++ b/app/Http/Controllers/CssController.php @@ -8,7 +8,7 @@ class CssController extends Controller { public function index() { - echo "index of css"; + echo 'index of css'; echo '

Buttons

Already Taken? diff --git a/app/Http/Controllers/EmbedController.php b/app/Http/Controllers/EmbedController.php index e2d6cdc..8c1528b 100644 --- a/app/Http/Controllers/EmbedController.php +++ b/app/Http/Controllers/EmbedController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; use Embed\Embed; +use Illuminate\Http\Request; class EmbedController extends Controller { @@ -25,17 +25,14 @@ public function __construct() public function index() { - - - //Load any url: -$info = Embed::create('https://www.youtube.com/watch?v=gF3xGzssFso'); -//$info = Embed::create('https:github.com/allotmentandy/laravel54/'); -//$info = Embed::create(''); + $info = Embed::create('https://www.youtube.com/watch?v=gF3xGzssFso'); + //$info = Embed::create('https:github.com/allotmentandy/laravel54/'); + //$info = Embed::create(''); -//Get content info + //Get content info -$info->title; //The page title + $info->title; //The page title $info->description; //The page description $info->url; //The canonical url $info->type; //The page type (link, video, image, rich) @@ -66,12 +63,12 @@ public function index() //print_r($info->title); -$info->title; //The page title + $info->title; //The page title $info->description; //The page description $info->url; //The canonical url $info->type; //The page type (link, video, image, rich) $info->tags; //The page keywords (tags) - return view('embed', compact('info') ); + return view('embed', compact('info')); } } diff --git a/app/Http/Controllers/JqueryController.php b/app/Http/Controllers/JqueryController.php index d26d244..861b370 100755 --- a/app/Http/Controllers/JqueryController.php +++ b/app/Http/Controllers/JqueryController.php @@ -6,21 +6,23 @@ class JqueryController extends Controller { - - function index(){ - return view('jquery'); + public function index() + { + return view('jquery'); } - function jquery_smsMessage(){ - return view('jquery_smsMessage'); + public function jquery_smsMessage() + { + return view('jquery_smsMessage'); } - function jquery_togglePanels(){ - return view('jquery_togglePanels'); + public function jquery_togglePanels() + { + return view('jquery_togglePanels'); } - function jquery_emailRecipients(){ - return view('jquery_emailRecipients'); + public function jquery_emailRecipients() + { + return view('jquery_emailRecipients'); } - } diff --git a/app/Http/Controllers/LondiniumController.php b/app/Http/Controllers/LondiniumController.php index 5f9d600..7010611 100755 --- a/app/Http/Controllers/LondiniumController.php +++ b/app/Http/Controllers/LondiniumController.php @@ -15,6 +15,7 @@ class LondiniumController extends Controller public function index() { $data['site'] = Londinium::where('saved', '=', 'saved')->orderByRaw('RAND()')->take(1)->get(); + return view('londinium', $data); } @@ -23,6 +24,7 @@ public function sites() $data['sites'] = Londinium::orderBy('id')->where('active', '=', 1)->paginate(1500); $data['countSaved'] = Londinium::where('saved', '=', 'saved')->count(); $data['highestSavedId'] = Londinium::select('id')->where('saved', '=', 'saved')->orderBy('id', 'DESC')->take(1)->get(); + return view('londiniumSites', $data); } @@ -93,10 +95,10 @@ public function addAsSaved(Request $request) { $url = $request->input('url'); $subcat = $request->input('subcategory'); - $values = array('url' => $url, 'saved' => 'saved', 'active' => 1, 'subcategory_id' => $subcat); + $values = ['url' => $url, 'saved' => 'saved', 'active' => 1, 'subcategory_id' => $subcat]; DB::table('londinium.sites')->insert($values); - return redirect('/londinium/site/' . DB::getPdo()->lastInsertId()); + return redirect('/londinium/site/'.DB::getPdo()->lastInsertId()); } public function subcategories() @@ -120,6 +122,7 @@ public function save($id) $Londinium = Londinium::where('id', '=', $id)->first(); $Londinium->saved = 'saved'; $Londinium->save(); + return back()->with('message', 'Operation Successful !'); } @@ -128,6 +131,7 @@ public function unsave($id) $Londinium = Londinium::where('id', '=', $id)->first(); $Londinium->saved = ''; $Londinium->save(); + return back()->with('message', 'Operation Successful !'); } @@ -183,7 +187,7 @@ public function outputHtml() { // \Debugbar::disable(); - $data['adsense'] = env("LONDINIUM_ADSENSE"); + $data['adsense'] = env('LONDINIUM_ADSENSE'); $subcategories = []; $result = Subcategories::orderBy('name')->get(); @@ -233,34 +237,34 @@ public function outputHtml() $Info = [327, 144, 147, 149, 1147, 940, 1066, 1138, 344, 431, 1517]; $Events = [158, 172, 562, 355, 520, 335]; - $TravelString = implode(", ", $Travel); + $TravelString = implode(', ', $Travel); $data['Travel'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Travel)->orderByRaw("FIELD(subcategory_id, $TravelString )")->paginate(1000); - $TourismString = implode(", ", $Tourism); + $TourismString = implode(', ', $Tourism); $data['Tourism'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Tourism)->orderByRaw("FIELD(subcategory_id, $TourismString )")->paginate(1000); - $FoodString = implode(", ", $Food); + $FoodString = implode(', ', $Food); $data['Food'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Food)->orderByRaw("FIELD(subcategory_id, $FoodString )")->paginate(1000); - $ShoppingString = implode(", ", $Shopping); + $ShoppingString = implode(', ', $Shopping); $data['Shopping'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Shopping)->orderByRaw("FIELD(subcategory_id, $ShoppingString )")->paginate(1000); - $FinanceString = implode(", ", $Finance); + $FinanceString = implode(', ', $Finance); $data['Finance'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Finance)->orderByRaw("FIELD(subcategory_id, $FinanceString )")->paginate(1000); - $SportString = implode(", ", $Sport); + $SportString = implode(', ', $Sport); $data['Sport'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Sport)->orderByRaw("FIELD(subcategory_id, $SportString )")->paginate(1000); - $PropertyString = implode(", ", $Property); + $PropertyString = implode(', ', $Property); $data['Property'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Property)->orderByRaw("FIELD(subcategory_id, $PropertyString )")->paginate(1000); - $MediaString = implode(", ", $Media); + $MediaString = implode(', ', $Media); $data['Media'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Media)->orderByRaw("FIELD(subcategory_id, $MediaString )")->paginate(1000); - $InfoString = implode(", ", $Info); + $InfoString = implode(', ', $Info); $data['Info'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Info)->orderByRaw("FIELD(subcategory_id, $InfoString )")->paginate(1000); - $EventsString = implode(", ", $Events); + $EventsString = implode(', ', $Events); $data['Events'] = Londinium::where('saved', '=', 'saved')->whereIn('subcategory_id', $Events)->orderByRaw("FIELD(subcategory_id, $EventsString )")->paginate(1000); $data['date'] = date('Y-m-d H:i:s'); @@ -273,18 +277,18 @@ public function outputJson() // return '{"4": 5,"6": 7}'; $data['sites'] = Londinium::select()->get(); - return $data; + return $data; } public function screenshot($id) { $data['url'] = Londinium::where('id', '=', $id)->take(1)->first(); - echo "screenshot called
"; + echo 'screenshot called
'; - if (!$data['url']) { - echo "no id/url. finished"; + if (! $data['url']) { + echo 'no id/url. finished'; exit; } @@ -297,7 +301,7 @@ public function screenshot($id) ->setWidth(640) ->setHeightToRenderWholePage() ->setTimeout(5000) - ->save('/var/www/laravel54/public/screenshots/' . $id . '.jpg'); + ->save('/var/www/laravel54/public/screenshots/'.$id.'.jpg'); } public function spider() @@ -310,8 +314,8 @@ public function spider() ->take(1) ->first(); - if (!$data['url']) { - echo "all spidering and screendumps complete for today :)"; + if (! $data['url']) { + echo 'all spidering and screendumps complete for today :)'; exit; } $url = $data['url']->url; @@ -336,14 +340,14 @@ public function spider() $exception = (string) $e->getResponse()->getBody(); $exception = json_decode($exception); echo $e->getCode(); - echo "request exception" . $response->getStatusCode() . " " . $id; + echo 'request exception'.$response->getStatusCode().' '.$id; exit; } else { - echo "request exception else " . $url . $id; + echo 'request exception else '.$url.$id; exit; } } catch (\GuzzleHttp\Exception\ConnectException $e) { - echo "connection exception"; + echo 'connection exception'; // var_dump($e); exit(); } @@ -354,37 +358,37 @@ public function spider() '; - echo $id . " -> " . $url . "
"; + echo $id.' -> '.$url.'
'; - echo "Status Code: " . $response->getStatusCode(); + echo 'Status Code: '.$response->getStatusCode(); $html = $response->getBody()->getContents(); $doc = new \DOMDocument(); - $tidy_config = array( + $tidy_config = [ 'clean' => true, 'output-xhtml' => true, 'show-body-only' => false, 'wrap' => 0, - ); + ]; $tidy = tidy_parse_string($html, $tidy_config, 'UTF8'); $tidy->cleanRepair(); $html = $tidy->html(); libxml_use_internal_errors(true); - $doc->loadHTML(mb_convert_encoding($html, "UTF-8")); + $doc->loadHTML(mb_convert_encoding($html, 'UTF-8')); libxml_clear_errors(); $xpath = new \DOMXpath($doc); - $spiderTitle = $xpath->evaluate("string(//html/head/title[1])"); - echo "

" . $spiderTitle . "

"; + $spiderTitle = $xpath->evaluate('string(//html/head/title[1])'); + echo '

'.$spiderTitle.'

'; Londinium::find($id)->touch(); $makeScreenshots = config('LONDINIUM_SPIDER_SCREENSHOTS_MAKE'); - echo $makeScreenshots . "
"; + echo $makeScreenshots.'
'; if ($makeScreenshots) { $this->screenshot($id); @@ -392,18 +396,18 @@ public function spider() $desc = $xpath->query('/html/head/meta[@name="description"]/@content'); foreach ($desc as $content) { - echo $content->value . PHP_EOL; + echo $content->value.PHP_EOL; } - echo "
"; + echo '
'; $desc = $xpath->query('/html/head/meta[@name="keywords"]/@content'); foreach ($desc as $content) { - echo $content->value . PHP_EOL; + echo $content->value.PHP_EOL; } - echo "
"; + echo '
'; // extract links $linkArray = []; - $hrefs = $xpath->evaluate("/html/body//a"); + $hrefs = $xpath->evaluate('/html/body//a'); for ($i = 0; $i < $hrefs->length; $i++) { $href = $hrefs->item($i); @@ -413,22 +417,22 @@ public function spider() array_push($linkArray, $url); } $smle = new \allotmentandy\socialmedialinkextractor\SocialMediaLinkExtractorController; - echo "

Social Media

"; - echo $smle->getTwitter($linkArray) . "
"; - echo $smle->getFacebook($linkArray) . "
"; - echo $smle->getYoutube($linkArray) . "
"; - echo $smle->getInstagram($linkArray) . "
"; - echo $smle->getLinkedin($linkArray) . "
"; - echo $smle->getGoogle($linkArray) . "
"; - echo $smle->getPinterest($linkArray) . "
"; - echo $smle->getGithub($linkArray) . "
"; - echo $smle->getFlickr($linkArray) . "
"; - echo $smle->getTumblr($linkArray) . "
"; - echo $smle->getRss($linkArray) . "
"; + echo '

Social Media

'; + echo $smle->getTwitter($linkArray).'
'; + echo $smle->getFacebook($linkArray).'
'; + echo $smle->getYoutube($linkArray).'
'; + echo $smle->getInstagram($linkArray).'
'; + echo $smle->getLinkedin($linkArray).'
'; + echo $smle->getGoogle($linkArray).'
'; + echo $smle->getPinterest($linkArray).'
'; + echo $smle->getGithub($linkArray).'
'; + echo $smle->getFlickr($linkArray).'
'; + echo $smle->getTumblr($linkArray).'
'; + echo $smle->getRss($linkArray).'
'; // store title in spider table with id and status - $s = Spider::firstOrNew(array('id' => $id)); + $s = Spider::firstOrNew(['id' => $id]); $s->status = $response->getStatusCode(); $s->title = $spiderTitle; $s->twitter_url = $smle->getTwitter($linkArray); @@ -447,12 +451,12 @@ public function spider() public function socialMedia() { - echo "socialmedia links to check for rubbish
"; + echo 'socialmedia links to check for rubbish
'; $sm = Spider::get(); foreach ($sm as $row) { // echo $row->twitter_url . "
"; - echo $row->id . " " . $row->instagram_url . "
"; + echo $row->id.' '.$row->instagram_url.'
'; // echo $row->id . " " . $row->tumblr_url . "
"; // echo $row->id . " " . $row->flickr_url . "
"; // echo $row->id . " " . $row->facebook_url . "
"; @@ -464,34 +468,34 @@ public function londiniumErrors() { $idArray = []; - echo "

errors

"; - echo "sites with http status NOT 200
"; + echo '

errors

'; + echo 'sites with http status NOT 200
'; - $blanks = Spider::where('status', '<>', "200")->get(); + $blanks = Spider::where('status', '<>', '200')->get(); foreach ($blanks as $row) { - echo "" . $row['id'] . " (" . $row['status'] . ") " . $row['title'] . "
"; + echo "".$row['id'].' ('.$row['status'].') '.$row['title'].'
'; $idArray[] = $row['id']; } - echo "
"; - echo "sites with blank title tags
"; - $blanks = Spider::where('title', '=', "")->get(); + echo '
'; + echo 'sites with blank title tags
'; + $blanks = Spider::where('title', '=', '')->get(); foreach ($blanks as $row) { - echo "" . $row['id'] . "
"; + echo "".$row['id'].'
'; $idArray[] = $row['id']; } - echo "
"; - echo "sites with missing screenshots or screenshots < 10kb"; - echo "
"; - echo "title like site not found"; - - if (sizeof($idArray) > 0) { - $comma_separated = implode(",", $idArray); - echo "
"; - echo "all ids to reset the sql
";
-            echo "UPDATE sites set updated_at = '0000-00-00 00:00:00' and screenshot_at = '0000-00-00 00:00:00' where id in (" . $comma_separated . ");\n";
-
-            echo "DELETE FROM spider WHERE id in (" . $comma_separated . ")";
+        echo '
'; + echo 'sites with missing screenshots or screenshots < 10kb'; + echo '
'; + echo 'title like site not found'; + + if (count($idArray) > 0) { + $comma_separated = implode(',', $idArray); + echo '
'; + echo 'all ids to reset the sql
';
+            echo "UPDATE sites set updated_at = '0000-00-00 00:00:00' and screenshot_at = '0000-00-00 00:00:00' where id in (".$comma_separated.");\n";
+
+            echo 'DELETE FROM spider WHERE id in ('.$comma_separated.')';
         }
     }
 }
diff --git a/app/Http/Controllers/MapsController.php b/app/Http/Controllers/MapsController.php
index dfe4a0a..1ae8917 100755
--- a/app/Http/Controllers/MapsController.php
+++ b/app/Http/Controllers/MapsController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use Cornford\Googlmapper\Facades\MapperFacade as Mapper;
+use Illuminate\Http\Request;
 
 class MapsController extends Controller
 {
diff --git a/app/Http/Controllers/PlanesApiController.php b/app/Http/Controllers/PlanesApiController.php
index c90a0f5..b61f0ce 100755
--- a/app/Http/Controllers/PlanesApiController.php
+++ b/app/Http/Controllers/PlanesApiController.php
@@ -2,14 +2,14 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Database\Eloquent\Model;
-use DB;
-use App\Planes;
 use App\Countries;
 use App\Jobs\downloadSeenAircraftImage;
-use Illuminate\Support\Facades\Log;
+use App\Planes;
+use DB;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Log;
 
 class PlanesApiController extends Controller
 {
@@ -21,6 +21,7 @@ public function index()
     public function getTypes()
     {
         $data['types'] = Planes::select('type')->groupBy('type')->get();
+
         return $data;
     }
 }
diff --git a/app/Http/Controllers/PlanesController.php b/app/Http/Controllers/PlanesController.php
index e02f416..ee7b094 100755
--- a/app/Http/Controllers/PlanesController.php
+++ b/app/Http/Controllers/PlanesController.php
@@ -6,214 +6,238 @@
 use App\Jobs\downloadSeenAircraftImage;
 use App\Planes;
 use DB;
+use File;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Log;
-use File;
 
 //use PDF; // removed as too intense.
 
-class PlanesController extends Controller {
-	public $output;
+class PlanesController extends Controller
+{
+    public $output;
 
-	public function index() {
+    public function index()
+    {
 //        $data['details'] = Planes::orderByRaw('RAND()')->where('type', '=', 'Dassault Falcon 900EX')->take(1)->get();
-		// $data['details'] = Planes::orderByRaw('RAND()')->where('type', '=', 'Dassault Falcon 900')->take(1)->get();
-		// $data['details'] = Planes::orderByRaw('RAND()')->where('type', '=', 'Gulfstream IV')->take(1)->get();
+        // $data['details'] = Planes::orderByRaw('RAND()')->where('type', '=', 'Dassault Falcon 900')->take(1)->get();
+        // $data['details'] = Planes::orderByRaw('RAND()')->where('type', '=', 'Gulfstream IV')->take(1)->get();
 
 //        $data['details'] = Planes::orderByRaw('RAND()')->where('type', '=', 'Airbus A319CJ')->take(1)->get();
-		// $data['details'] = Planes::orderByRaw('RAND()')->where('countryCode', '=' , 'G')->take(1)->get();
-       $data['details'] = Planes::orderByRaw('RAND()')->where('type', '=', 'Gulfstream G650ER')->take(1)->get();
-
-		return view('planes', $data);
-	}
-
-	public function txtview() {
-		echo ("");
-		echo "";
-		echo ("
-			");
-		echo ("");
-
-		$countryCodeArray = [];
-
-		$result = Countries::select('A', 'B')->get();
-		foreach ($result as $row) {
-			$countryCodeArray[$row['A']] = $row['B'];
-		}
-
-		Planes::select('reg', 'type', 'conNumber', 'countryCode', 'seenScrape')
-			->orderBy('countryCode', 'asc')
-			->orderBy('id', 'asc')
-			->chunk(
-				25000,
-				function ($items) use ($countryCodeArray) {
-					if (!isset($countryCode)) {
-						$countryCode = "";
-					}
-
-					foreach ($items as $item) {
-						if ($item['countryCode'] != $countryCode) {
-							//$name = Countries::select('B')->where('A', '=', $item['countryCode'] )->first();
-							echo "" . PHP_EOL;
-							$countryCode = $item['countryCode'];
-						}
-
-						$underline = ">";
-						if ($item['seenScrape'] == "seen") {
-							$underline = " style='border-bottom: 2px solid red;'>";
-						} elseif ($item['seenScrape'] == "scrape") {
-							$underline = " style='border-bottom: 2px solid green;'>";
-						}
-
-						echo "" . PHP_EOL;
-					}
-				}
-			);
-		echo ("
" . $item['countryCode'] . " " . $countryCodeArray[$item['countryCode']] . "
☑ "; - echo "
"); - } - - public function planesList() { - $data['planes'] = Planes::orderBy('countryCode')->orderBy('id')->paginate(30); - return view('planesList', $data); - } - - public function details($id) { - $data['details'] = Planes::where("id", "=", $id)->get(); - return view('planeDetails', $data); - } - - public function countries() { - $data['planes'] = Countries::orderBy('B')->orderBy('A')->paginate(300); - return view('planeCountriesList', $data); - } - - public function country($countryCode) { - $data['planes'] = Planes::where("countryCode", "=", $countryCode)->orderBy('id')->orderBy('reg')->paginate(15); - return view('planesList', $data); - } - - public function countryPhotoJob($countryCode) { - $data['planes'] = Planes::where("countryCode", "=", $countryCode)->get(); - - foreach ($data['planes'] as $plane) { - $this->dispatch(new downloadSeenAircraftImage($plane->id)); - } - } - - public function types() { - $data['types'] = Planes::select('type', DB::raw("COUNT(*) as count_row"))->groupBy('type')->get(); - return view('typesList', $data); - } - - public function type($type) { - $data['planes'] = Planes::where("type", "=", $type)->orderBy('countryCode')->orderBy('id')->paginate(15); - return view('planesList', $data); - } - - public function typePhotoJob($type) { - $data['planes'] = Planes::where("type", "=", $type)->get(); - - foreach ($data['planes'] as $plane) { - $this->dispatch(new downloadSeenAircraftImage($plane->id)); - } - } - - // public function seen($id) - // { - // Planes::where('id', $id)->update(['seenScrape' => 'seen']); - // // now set the job to download an image of this - // $this->downloadImage($id); - // return back()->with('message', 'Operation Successful ' . $id . ''); - // } - - // public function scrape($id) - // { - // Planes::where('id', $id)->update(['seenScrape' => 'scrape']); - // return back()->with('message', 'Operation Successful ' . $id); - // } - - public function json(){ - - $aides = Planes::all(); -$aides->toJson(JSON_PRETTY_PRINT); -return response()->json( $aides, 200); - } - - public function ajax() { - $id = Input::get('id'); - $seenScrape = Input::get('seenScrape'); - - Planes::where('id', $id)->update(['seenScrape' => $seenScrape]); - - // now set the job to download an image of this - $this->downloadImage($id); - - $response = "." . $id; - return $response; - } - - private function downloadImage($id) { - Log::info('downloadImageFunction called with : ' . $id); - $this->dispatch(new downloadSeenAircraftImage($id)); - } - - public function search(Request $request) { - $this->validate($request, [ - 'q' => 'required|min:3', - ]); + // $data['details'] = Planes::orderByRaw('RAND()')->where('countryCode', '=' , 'G')->take(1)->get(); + $data['details'] = Planes::orderByRaw('RAND()')->where('type', '=', 'Gulfstream G650ER')->take(1)->get(); + + return view('planes', $data); + } + + public function txtview() + { + echo ''; + echo ''; + echo ' + '; + echo ""; + + $countryCodeArray = []; + + $result = Countries::select('A', 'B')->get(); + foreach ($result as $row) { + $countryCodeArray[$row['A']] = $row['B']; + } + + Planes::select('reg', 'type', 'conNumber', 'countryCode', 'seenScrape') + ->orderBy('countryCode', 'asc') + ->orderBy('id', 'asc') + ->chunk( + 25000, + function ($items) use ($countryCodeArray) { + if (! isset($countryCode)) { + $countryCode = ''; + } + + foreach ($items as $item) { + if ($item['countryCode'] != $countryCode) { + //$name = Countries::select('B')->where('A', '=', $item['countryCode'] )->first(); + echo "'.PHP_EOL; + $countryCode = $item['countryCode']; + } + + $underline = '>'; + if ($item['seenScrape'] == 'seen') { + $underline = " style='border-bottom: 2px solid red;'>"; + } elseif ($item['seenScrape'] == 'scrape') { + $underline = " style='border-bottom: 2px solid green;'>"; + } + + echo ''.PHP_EOL; + } + } + ); + echo '
".$item['countryCode'].' '.$countryCodeArray[$item['countryCode']].'
☑ '; + echo '
'; + } + + public function planesList() + { + $data['planes'] = Planes::orderBy('countryCode')->orderBy('id')->paginate(30); + + return view('planesList', $data); + } + + public function details($id) + { + $data['details'] = Planes::where('id', '=', $id)->get(); + + return view('planeDetails', $data); + } + + public function countries() + { + $data['planes'] = Countries::orderBy('B')->orderBy('A')->paginate(300); + + return view('planeCountriesList', $data); + } + + public function country($countryCode) + { + $data['planes'] = Planes::where('countryCode', '=', $countryCode)->orderBy('id')->orderBy('reg')->paginate(15); + + return view('planesList', $data); + } + + public function countryPhotoJob($countryCode) + { + $data['planes'] = Planes::where('countryCode', '=', $countryCode)->get(); + + foreach ($data['planes'] as $plane) { + $this->dispatch(new downloadSeenAircraftImage($plane->id)); + } + } + + public function types() + { + $data['types'] = Planes::select('type', DB::raw('COUNT(*) as count_row'))->groupBy('type')->get(); + + return view('typesList', $data); + } + + public function type($type) + { + $data['planes'] = Planes::where('type', '=', $type)->orderBy('countryCode')->orderBy('id')->paginate(15); + + return view('planesList', $data); + } + + public function typePhotoJob($type) + { + $data['planes'] = Planes::where('type', '=', $type)->get(); + + foreach ($data['planes'] as $plane) { + $this->dispatch(new downloadSeenAircraftImage($plane->id)); + } + } + + // public function seen($id) + // { + // Planes::where('id', $id)->update(['seenScrape' => 'seen']); + // // now set the job to download an image of this + // $this->downloadImage($id); + // return back()->with('message', 'Operation Successful ' . $id . ''); + // } + + // public function scrape($id) + // { + // Planes::where('id', $id)->update(['seenScrape' => 'scrape']); + // return back()->with('message', 'Operation Successful ' . $id); + // } + + public function json() + { + $aides = Planes::all(); + $aides->toJson(JSON_PRETTY_PRINT); + + return response()->json($aides, 200); + } + + public function ajax() + { + $id = Input::get('id'); + $seenScrape = Input::get('seenScrape'); + + Planes::where('id', $id)->update(['seenScrape' => $seenScrape]); + + // now set the job to download an image of this + $this->downloadImage($id); + + $response = '.'.$id; + + return $response; + } + + private function downloadImage($id) + { + Log::info('downloadImageFunction called with : '.$id); + $this->dispatch(new downloadSeenAircraftImage($id)); + } + + public function search(Request $request) + { + $this->validate($request, [ + 'q' => 'required|min:3', + ]); - $data['title'] = Input::get('q'); + $data['title'] = Input::get('q'); - $data['planes'] = Planes::where('reg', Input::get('q'))->orWhere('reg', 'like', '%' . Input::get('q') . '%')->orWhere('notes', 'like', '%' . Input::get('q') . '%')->get(); + $data['planes'] = Planes::where('reg', Input::get('q'))->orWhere('reg', 'like', '%'.Input::get('q').'%')->orWhere('notes', 'like', '%'.Input::get('q').'%')->get(); - return view('planeSearch', $data); - } + return view('planeSearch', $data); + } - public function todo() { - return view('planesTodo'); - } + public function todo() + { + return view('planesTodo'); + } - public function help() { - return view('planesHelp'); - } + public function help() + { + return view('planesHelp'); + } - // pdf view is too much for the server, use browser? - // function pdfview(){ + // pdf view is too much for the server, use browser? + // function pdfview(){ - // set_time_limit(5000); - // ini_set('memory_limit','1200M'); + // set_time_limit(5000); + // ini_set('memory_limit','1200M'); - // $output = (""); + // $output = (""); - // Planes::select('reg', 'type', 'conNumber', 'countryCode')->orderBy('countryCode', 'asc')->chunk(5000, function($items) use (&$output) { - // $countryCode = ""; + // Planes::select('reg', 'type', 'conNumber', 'countryCode')->orderBy('countryCode', 'asc')->chunk(5000, function($items) use (&$output) { + // $countryCode = ""; - // $output .= ""; + // $output .= "
"; - // foreach ($items as $item){ + // foreach ($items as $item){ - // if ($item['countryCode'] != $countryCode){ - // $output .= ""; - // $countryCode = $item['countryCode']; - // } - // $output .= ""; - // } + // if ($item['countryCode'] != $countryCode){ + // $output .= ""; + // $countryCode = $item['countryCode']; + // } + // $output .= ""; + // } - // $output .= "
" . $item['countryCode'] ."
" . $item['reg'] . ""; - // $output .= $item['type'] . ""; - // $output .= $item['conNumber'] . "
" . $item['countryCode'] ."
" . $item['reg'] . ""; + // $output .= $item['type'] . ""; + // $output .= $item['conNumber'] . "
"; + // $output .= ""; - // } - // ); + // } + // ); - // $pdf = PDF::loadHTML($output); + // $pdf = PDF::loadHTML($output); - // return $pdf->download('planes.pdf'); + // return $pdf->download('planes.pdf'); // } } diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 831f16c..274cca6 100755 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -8,11 +8,12 @@ class RssController extends Controller { public function index() { - $data = array( - 'title' => "welcome to my feed reader, this isnt a real feed, it is just an example", - 'permalink' => "http://www.londinium.com/", - 'items' => array(), - ); + $data = [ + 'title' => 'welcome to my feed reader, this isnt a real feed, it is just an example', + 'permalink' => 'http://www.londinium.com/', + 'items' => [], + ]; + return View('feed', $data); } @@ -26,11 +27,11 @@ public function jobs() 'http://uk.dice.com/rss/laravel/all-locations/en/jobs-feed.xml?JobTypeFilter=2&xc=247', 'https://larajobs.com/feed', ], 20); - $data = array( + $data = [ 'title' => $feed->get_title(), 'permalink' => $feed->get_permalink(), 'items' => $feed->get_items(), - ); + ]; return View('feed', $data); } @@ -42,11 +43,11 @@ public function news() 'https://www.reddit.com/r/laravel/.rss', 'http://laraveldaily.com/feed/', ], 20); - $data = array( + $data = [ 'title' => $feed->get_title(), 'permalink' => $feed->get_permalink(), 'items' => $feed->get_items(), - ); + ]; return View('feed', $data); } diff --git a/app/Http/Controllers/VueController.php b/app/Http/Controllers/VueController.php index dcf3efa..53f02b1 100755 --- a/app/Http/Controllers/VueController.php +++ b/app/Http/Controllers/VueController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; +use App\Londinium; use App\Subcategories; use Illuminate\Http\Request; -use App\Londinium; class VueController extends Controller { diff --git a/app/Http/Controllers/VueItemController.php b/app/Http/Controllers/VueItemController.php index 7d630e9..36da7e9 100755 --- a/app/Http/Controllers/VueItemController.php +++ b/app/Http/Controllers/VueItemController.php @@ -1,13 +1,13 @@ $items->currentPage(), 'last_page' => $items->lastPage(), 'from' => $items->firstItem(), - 'to' => $items->lastItem() + 'to' => $items->lastItem(), ], - 'data' => $items + 'data' => $items, ]; return response()->json($response); @@ -83,6 +83,7 @@ public function update(Request $request, $id) public function destroy($id) { Item::find($id)->delete(); + return response()->json(['done']); } } diff --git a/app/Item.php b/app/Item.php index 9c6034a..25eb00b 100755 --- a/app/Item.php +++ b/app/Item.php @@ -1,18 +1,17 @@ id; - echo "job arrived -> " . $this->reg . PHP_EOL; + echo 'job arrived -> '.$this->reg.PHP_EOL; Artisan::queue('bizjets:downloadImageAirlinersNet', ['reg' => $this->reg]); Artisan::queue('bizjets:downloadImageJetPhoto', ['reg' => $this->reg]); diff --git a/app/Londinium.php b/app/Londinium.php index 7fe7678..02fc102 100755 --- a/app/Londinium.php +++ b/app/Londinium.php @@ -7,30 +7,28 @@ class Londinium extends Model { protected $connection = 'mysql3'; - + /** * The table associated with the model. * * @var string */ - protected $table = 'sites'; - + /** * Indicates if the model should be timestamped. * * @var bool */ - public $timestamps = true; /** - * Indicates what can be updated or edited + * Indicates what can be updated or edited. * * @var bool */ protected $fillable = [ - 'saved', 'subcategory_id' + 'saved', 'subcategory_id', ]; // join cat/subcat diff --git a/app/Planes.php b/app/Planes.php index 004eaa6..f0924a3 100755 --- a/app/Planes.php +++ b/app/Planes.php @@ -6,27 +6,24 @@ class Planes extends Model { + protected $connection = 'mysql2'; - protected $connection = 'mysql2'; - - /** + /** * The table associated with the model. * * @var string */ - protected $table = 'planes'; - + /** * Indicates if the model should be timestamped. * * @var bool */ - public $timestamps = false; /** - * Indicates what can be updated or edited + * Indicates what can be updated or edited. * * @var bool */ @@ -34,8 +31,6 @@ class Planes extends Model 'reg', 'type', 'conNumber', - 'seenScrape' - ]; - - + 'seenScrape', + ]; } diff --git a/app/PlanesNew.php b/app/PlanesNew.php index bebe90c..3640df7 100755 --- a/app/PlanesNew.php +++ b/app/PlanesNew.php @@ -6,22 +6,19 @@ class PlanesNew extends Model { + protected $connection = 'mysql2'; - protected $connection = 'mysql2'; - - /** + /** * The table associated with the model. * * @var string */ - protected $table = 'planesNew'; - + /** * Indicates if the model should be timestamped. * * @var bool */ - public $timestamps = false; } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index aa2606c..c981090 100755 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Schema; +use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 9784b1a..e12ff88 100755 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Gate; class AuthServiceProvider extends ServiceProvider { diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 352cce4..395c518 100755 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Broadcast; +use Illuminate\Support\ServiceProvider; class BroadcastServiceProvider extends ServiceProvider { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index a182657..f5d8b87 100755 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Event; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Event; class EventServiceProvider extends ServiceProvider { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 5ea48d3..548e4be 100755 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Route; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider { diff --git a/app/Spider.php b/app/Spider.php index 0df0134..25c4a03 100755 --- a/app/Spider.php +++ b/app/Spider.php @@ -7,33 +7,31 @@ class Spider extends Model { protected $connection = 'mysql3'; - + /** * The table associated with the model. * * @var string */ - protected $table = 'spider'; - + /** * Indicates if the model should be timestamped. * * @var bool */ - public $timestamps = false; /** - * Indicates what can be updated or edited + * Indicates what can be updated or edited. * * @var bool */ protected $fillable = [ - 'id' , - 'title' , + 'id', + 'title', 'status', - 'updated_at' + 'updated_at', ]; // join cat/subcat diff --git a/app/Subcategories.php b/app/Subcategories.php index fd8bfa0..2475262 100755 --- a/app/Subcategories.php +++ b/app/Subcategories.php @@ -6,7 +6,6 @@ class Subcategories extends Model { - protected $connection = 'mysql3'; /** @@ -14,7 +13,6 @@ class Subcategories extends Model * * @var string */ - protected $table = 'subcategories'; /** @@ -22,19 +20,17 @@ class Subcategories extends Model * * @var bool */ - public $timestamps = false; /** - * Indicates what can be updated or edited + * Indicates what can be updated or edited. * * @var bool */ protected $fillable = [ - 'saved' + 'saved', ]; - public function sites() { return $this->hasMany(Londinium::class, 'subcategory_id', 'id'); diff --git a/app/User.php b/app/User.php index bfd96a6..abafe7c 100755 --- a/app/User.php +++ b/app/User.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Notifications\Notifiable; use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\Notifiable; class User extends Authenticatable { diff --git a/config/app.php b/config/app.php index 66f60bb..e3c610f 100755 --- a/config/app.php +++ b/config/app.php @@ -12,7 +12,7 @@ | any other location as required by the application or its packages. */ - 'name' => 'Andy`s', + 'name' => 'Andy`s', /* |-------------------------------------------------------------------------- @@ -25,7 +25,7 @@ | */ - 'env' => env('APP_ENV', 'local'), + 'env' => env('APP_ENV', 'local'), /* |-------------------------------------------------------------------------- @@ -38,7 +38,7 @@ | */ - 'debug' => env('APP_DEBUG', false), + 'debug' => env('APP_DEBUG', false), /* |-------------------------------------------------------------------------- @@ -51,7 +51,7 @@ | */ - 'url' => env('APP_URL', 'http://localhost'), + 'url' => env('APP_URL', 'http://localhost'), /* |-------------------------------------------------------------------------- @@ -64,7 +64,7 @@ | */ - 'timezone' => 'UTC', + 'timezone' => 'UTC', /* |-------------------------------------------------------------------------- @@ -77,7 +77,7 @@ | */ - 'locale' => 'en', + 'locale' => 'en', /* |-------------------------------------------------------------------------- @@ -90,7 +90,7 @@ | */ - 'fallback_locale' => 'en', + 'fallback_locale' => 'en', /* |-------------------------------------------------------------------------- @@ -103,9 +103,9 @@ | */ - 'key' => env('APP_KEY'), + 'key' => env('APP_KEY'), - 'cipher' => 'AES-256-CBC', + 'cipher' => 'AES-256-CBC', /* |-------------------------------------------------------------------------- @@ -120,9 +120,9 @@ | */ - 'log' => env('APP_LOG', 'single'), + 'log' => env('APP_LOG', 'single'), - 'log_level' => env('APP_LOG_LEVEL', 'debug'), + 'log_level' => env('APP_LOG_LEVEL', 'debug'), /* |-------------------------------------------------------------------------- @@ -135,61 +135,61 @@ | */ - 'providers' => [ + 'providers' => [ /* * Laravel Framework Service Providers... */ - Illuminate\Auth\AuthServiceProvider::class, - Illuminate\Broadcasting\BroadcastServiceProvider::class, - Illuminate\Bus\BusServiceProvider::class, - Illuminate\Cache\CacheServiceProvider::class, - Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, - Illuminate\Cookie\CookieServiceProvider::class, - Illuminate\Database\DatabaseServiceProvider::class, - Illuminate\Encryption\EncryptionServiceProvider::class, - Illuminate\Filesystem\FilesystemServiceProvider::class, - Illuminate\Foundation\Providers\FoundationServiceProvider::class, - Illuminate\Hashing\HashServiceProvider::class, - Illuminate\Mail\MailServiceProvider::class, - Illuminate\Notifications\NotificationServiceProvider::class, - Illuminate\Pagination\PaginationServiceProvider::class, - Illuminate\Pipeline\PipelineServiceProvider::class, - Illuminate\Queue\QueueServiceProvider::class, - Illuminate\Redis\RedisServiceProvider::class, - Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, - Illuminate\Session\SessionServiceProvider::class, - Illuminate\Translation\TranslationServiceProvider::class, - Illuminate\Validation\ValidationServiceProvider::class, - Illuminate\View\ViewServiceProvider::class, + Illuminate\Auth\AuthServiceProvider::class, + Illuminate\Broadcasting\BroadcastServiceProvider::class, + Illuminate\Bus\BusServiceProvider::class, + Illuminate\Cache\CacheServiceProvider::class, + Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, + Illuminate\Cookie\CookieServiceProvider::class, + Illuminate\Database\DatabaseServiceProvider::class, + Illuminate\Encryption\EncryptionServiceProvider::class, + Illuminate\Filesystem\FilesystemServiceProvider::class, + Illuminate\Foundation\Providers\FoundationServiceProvider::class, + Illuminate\Hashing\HashServiceProvider::class, + Illuminate\Mail\MailServiceProvider::class, + Illuminate\Notifications\NotificationServiceProvider::class, + Illuminate\Pagination\PaginationServiceProvider::class, + Illuminate\Pipeline\PipelineServiceProvider::class, + Illuminate\Queue\QueueServiceProvider::class, + Illuminate\Redis\RedisServiceProvider::class, + Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, + Illuminate\Session\SessionServiceProvider::class, + Illuminate\Translation\TranslationServiceProvider::class, + Illuminate\Validation\ValidationServiceProvider::class, + Illuminate\View\ViewServiceProvider::class, /* * Package Service Providers... */ - Laravel\Tinker\TinkerServiceProvider::class, + Laravel\Tinker\TinkerServiceProvider::class, /* * Application Service Providers... */ - App\Providers\AppServiceProvider::class, - App\Providers\AuthServiceProvider::class, + App\Providers\AppServiceProvider::class, + App\Providers\AuthServiceProvider::class, // App\Providers\BroadcastServiceProvider::class, - App\Providers\EventServiceProvider::class, - App\Providers\RouteServiceProvider::class, + App\Providers\EventServiceProvider::class, + App\Providers\RouteServiceProvider::class, /* * Andy added providers */ - Thujohn\Twitter\TwitterServiceProvider::class, - Barryvdh\Debugbar\ServiceProvider::class, - willvincent\Feeds\FeedsServiceProvider::class, - Barryvdh\DomPDF\ServiceProvider::class, + Thujohn\Twitter\TwitterServiceProvider::class, + Barryvdh\Debugbar\ServiceProvider::class, + willvincent\Feeds\FeedsServiceProvider::class, + Barryvdh\DomPDF\ServiceProvider::class, - Spatie\Browsershot\BrowsershotServiceProvider::class, - allotmentandy\socialmedialinkextractor\SocialMediaLinkExtractorServiceProvider::class, - Cornford\Googlmapper\MapperServiceProvider::class, - - ], + Spatie\Browsershot\BrowsershotServiceProvider::class, + allotmentandy\socialmedialinkextractor\SocialMediaLinkExtractorServiceProvider::class, + Cornford\Googlmapper\MapperServiceProvider::class, + + ], /* |-------------------------------------------------------------------------- @@ -202,47 +202,47 @@ | */ - 'aliases' => [ - - 'App' => Illuminate\Support\Facades\App::class, - 'Artisan' => Illuminate\Support\Facades\Artisan::class, - 'Auth' => Illuminate\Support\Facades\Auth::class, - 'Blade' => Illuminate\Support\Facades\Blade::class, - 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, - 'Bus' => Illuminate\Support\Facades\Bus::class, - 'Cache' => Illuminate\Support\Facades\Cache::class, - 'Config' => Illuminate\Support\Facades\Config::class, - 'Cookie' => Illuminate\Support\Facades\Cookie::class, - 'Crypt' => Illuminate\Support\Facades\Crypt::class, - 'DB' => Illuminate\Support\Facades\DB::class, - 'Eloquent' => Illuminate\Database\Eloquent\Model::class, - 'Event' => Illuminate\Support\Facades\Event::class, - 'File' => Illuminate\Support\Facades\File::class, - 'Gate' => Illuminate\Support\Facades\Gate::class, - 'Hash' => Illuminate\Support\Facades\Hash::class, - 'Lang' => Illuminate\Support\Facades\Lang::class, - 'Log' => Illuminate\Support\Facades\Log::class, - 'Mail' => Illuminate\Support\Facades\Mail::class, - 'Notification' => Illuminate\Support\Facades\Notification::class, - 'Password' => Illuminate\Support\Facades\Password::class, - 'Queue' => Illuminate\Support\Facades\Queue::class, - 'Redirect' => Illuminate\Support\Facades\Redirect::class, - 'Redis' => Illuminate\Support\Facades\Redis::class, - 'Request' => Illuminate\Support\Facades\Request::class, - 'Response' => Illuminate\Support\Facades\Response::class, - 'Route' => Illuminate\Support\Facades\Route::class, - 'Schema' => Illuminate\Support\Facades\Schema::class, - 'Session' => Illuminate\Support\Facades\Session::class, - 'Storage' => Illuminate\Support\Facades\Storage::class, - 'URL' => Illuminate\Support\Facades\URL::class, - 'Validator' => Illuminate\Support\Facades\Validator::class, - 'View' => Illuminate\Support\Facades\View::class, - - 'Twitter' => Thujohn\Twitter\Facades\Twitter::class, - 'Feeds' => willvincent\Feeds\Facades\FeedsFacade::class, - 'PDF' => Barryvdh\DomPDF\Facade::class, - 'Debugbar' => Barryvdh\Debugbar\Facade::class, - 'Mapper' => Cornford\Googlmapper\Facades\MapperFacade::class, - ], + 'aliases' => [ + + 'App' => Illuminate\Support\Facades\App::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Auth' => Illuminate\Support\Facades\Auth::class, + 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Config' => Illuminate\Support\Facades\Config::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'DB' => Illuminate\Support\Facades\DB::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'File' => Illuminate\Support\Facades\File::class, + 'Gate' => Illuminate\Support\Facades\Gate::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, + 'Notification' => Illuminate\Support\Facades\Notification::class, + 'Password' => Illuminate\Support\Facades\Password::class, + 'Queue' => Illuminate\Support\Facades\Queue::class, + 'Redirect' => Illuminate\Support\Facades\Redirect::class, + 'Redis' => Illuminate\Support\Facades\Redis::class, + 'Request' => Illuminate\Support\Facades\Request::class, + 'Response' => Illuminate\Support\Facades\Response::class, + 'Route' => Illuminate\Support\Facades\Route::class, + 'Schema' => Illuminate\Support\Facades\Schema::class, + 'Session' => Illuminate\Support\Facades\Session::class, + 'Storage' => Illuminate\Support\Facades\Storage::class, + 'URL' => Illuminate\Support\Facades\URL::class, + 'Validator' => Illuminate\Support\Facades\Validator::class, + 'View' => Illuminate\Support\Facades\View::class, + + 'Twitter' => Thujohn\Twitter\Facades\Twitter::class, + 'Feeds' => willvincent\Feeds\Facades\FeedsFacade::class, + 'PDF' => Barryvdh\DomPDF\Facade::class, + 'Debugbar' => Barryvdh\Debugbar\Facade::class, + 'Mapper' => Cornford\Googlmapper\Facades\MapperFacade::class, + ], ]; diff --git a/config/feeds.php b/config/feeds.php index 3ec7436..1f52471 100755 --- a/config/feeds.php +++ b/config/feeds.php @@ -11,7 +11,7 @@ | most cases. | */ - 'cache.location' => storage_path() . '/framework/cache', + 'cache.location' => storage_path().'/framework/cache', /* |-------------------------------------------------------------------------- @@ -63,7 +63,7 @@ | */ // 'base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style' - 'strip_html_tags.tags'=> [ 'base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'], + 'strip_html_tags.tags'=> ['base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'], /* |-------------------------------------------------------------------------- @@ -84,6 +84,6 @@ | */ // 'bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc' - 'strip_attributes.tags'=> [ 'bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'], + 'strip_attributes.tags'=> ['bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'], ]; diff --git a/config/googlmapper.php b/config/googlmapper.php index 53605e5..18f3414 100755 --- a/config/googlmapper.php +++ b/config/googlmapper.php @@ -297,7 +297,7 @@ | hidden and a count is shown. | */ - 'size' => 2 + 'size' => 2, ], diff --git a/config/ttwitter.php b/config/ttwitter.php index 62a38dd..2e58820 100755 --- a/config/ttwitter.php +++ b/config/ttwitter.php @@ -3,19 +3,19 @@ // You can find the keys here : https://apps.twitter.com/ return [ - 'debug' => function_exists('env') ? env('APP_DEBUG', false) : false, + 'debug' => function_exists('env') ? env('APP_DEBUG', false) : false, - 'API_URL' => 'api.twitter.com', - 'UPLOAD_URL' => 'upload.twitter.com', - 'API_VERSION' => '1.1', - 'AUTHENTICATE_URL' => 'https://api.twitter.com/oauth/authenticate', - 'AUTHORIZE_URL' => 'https://api.twitter.com/oauth/authorize', - 'ACCESS_TOKEN_URL' => 'https://api.twitter.com/oauth/access_token', - 'REQUEST_TOKEN_URL' => 'https://api.twitter.com/oauth/request_token', - 'USE_SSL' => true, + 'API_URL' => 'api.twitter.com', + 'UPLOAD_URL' => 'upload.twitter.com', + 'API_VERSION' => '1.1', + 'AUTHENTICATE_URL' => 'https://api.twitter.com/oauth/authenticate', + 'AUTHORIZE_URL' => 'https://api.twitter.com/oauth/authorize', + 'ACCESS_TOKEN_URL' => 'https://api.twitter.com/oauth/access_token', + 'REQUEST_TOKEN_URL' => 'https://api.twitter.com/oauth/request_token', + 'USE_SSL' => true, - 'CONSUMER_KEY' => function_exists('env') ? env('TWITTER_CONSUMER_KEY', '') : '', - 'CONSUMER_SECRET' => function_exists('env') ? env('TWITTER_CONSUMER_SECRET', '') : '', - 'ACCESS_TOKEN' => function_exists('env') ? env('TWITTER_ACCESS_TOKEN', '') : '', - 'ACCESS_TOKEN_SECRET' => function_exists('env') ? env('TWITTER_ACCESS_TOKEN_SECRET', '') : '', + 'CONSUMER_KEY' => function_exists('env') ? env('TWITTER_CONSUMER_KEY', '') : '', + 'CONSUMER_SECRET' => function_exists('env') ? env('TWITTER_CONSUMER_SECRET', '') : '', + 'ACCESS_TOKEN' => function_exists('env') ? env('TWITTER_ACCESS_TOKEN', '') : '', + 'ACCESS_TOKEN_SECRET' => function_exists('env') ? env('TWITTER_ACCESS_TOKEN_SECRET', '') : '', ]; diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 7926c79..d20dd46 100755 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -11,7 +11,7 @@ | */ -/** @var \Illuminate\Database\Eloquent\Factory $factory */ +/* @var \Illuminate\Database\Eloquent\Factory $factory */ $factory->define(App\User::class, function (Faker\Generator $faker) { static $password; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 689cbee..056ed1c 100755 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,8 +1,8 @@ name('planes'); -Route::get('/planes/pdf', array('as' => 'pdfview', 'uses' => 'PlanesController@pdfview')); -Route::get('/planes/txt', array('as' => 'txtView', 'uses' => 'PlanesController@txtview')); +Route::get('/planes/pdf', ['as' => 'pdfview', 'uses' => 'PlanesController@pdfview']); +Route::get('/planes/txt', ['as' => 'txtView', 'uses' => 'PlanesController@txtview']); Route::get('/planes/types', 'PlanesController@types')->name('planeTypes'); Route::get('/planes/type/{type}', 'PlanesController@type')->name('planeType'); Route::get('/planes/type/job/{type}', 'PlanesController@typePhotoJob'); @@ -87,10 +87,9 @@ Route::get('/embed', 'EmbedController@index')->name('embed'); - //twitter Route::get('/userTimeline', function () { - $tweets = Twitter::getUserTimeline(['screen_name' => 'londiniumcom', 'count' => 10, 'format' => 'array']); - echo ("
");
-	var_dump($tweets);
+    $tweets = Twitter::getUserTimeline(['screen_name' => 'londiniumcom', 'count' => 10, 'format' => 'array']);
+    echo '
';
+    var_dump($tweets);
 });
diff --git a/tests/Browser/AndyPullDownTest.php b/tests/Browser/AndyPullDownTest.php
index 84e2c3c..8dfba2e 100644
--- a/tests/Browser/AndyPullDownTest.php
+++ b/tests/Browser/AndyPullDownTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Browser;
 
-use Tests\DuskTestCase;
-use Laravel\Dusk\Chrome;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Laravel\Dusk\Chrome;
+use Tests\DuskTestCase;
 
 class AndyPullDownTest extends DuskTestCase
 {
@@ -26,7 +26,6 @@ public function testBasicExample()
                     ->assertSee('About Andy');
         });
 
-
         // read https://github.com/laravel/dusk/blob/master/src/Browser.php
     }
 }
diff --git a/tests/Browser/ExampleTest.php b/tests/Browser/ExampleTest.php
index 46bfdf9..b42ccff 100755
--- a/tests/Browser/ExampleTest.php
+++ b/tests/Browser/ExampleTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Browser;
 
-use Tests\DuskTestCase;
-use Laravel\Dusk\Chrome;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Laravel\Dusk\Chrome;
+use Tests\DuskTestCase;
 
 class ExampleTest extends DuskTestCase
 {
@@ -27,11 +27,6 @@ public function testBasicExample()
                     ->assertSee('Private');
         });
 
-
-
-
-
-
         // read https://github.com/laravel/dusk/blob/master/src/Browser.php
     }
 }
diff --git a/tests/Browser/KeyboardRssTest.php b/tests/Browser/KeyboardRssTest.php
index cf43351..4a787c5 100755
--- a/tests/Browser/KeyboardRssTest.php
+++ b/tests/Browser/KeyboardRssTest.php
@@ -4,7 +4,7 @@
 
 use Tests\DuskTestCase;
 
-class KeyboardTest extends DuskTestCase
+class KeyboardRssTest extends DuskTestCase
 {
     /**
      * @group rss
@@ -16,7 +16,7 @@ public function testBasicExample()
     {
         $this->browse(function ($browser) {
             $browser->visit('http://localhost/rss/')
-                    ->assertSee("Job");
+                    ->assertSee('Job');
         });
 
         // $this->browse(function ($browser) {
diff --git a/tests/Browser/SearchTest.php b/tests/Browser/SearchTest.php
index 95a947c..855c551 100755
--- a/tests/Browser/SearchTest.php
+++ b/tests/Browser/SearchTest.php
@@ -18,7 +18,7 @@ public function testExample()
             $browser->visit('http://localhost/planes');
             $browser->maximize();
             $browser->type('q', 'I-ADVD');
-            $browser->press("GO");
+            $browser->press('GO');
             $browser->pause(1000)
                 ->screenshot('planesSearchResult');
             $browser->assertSee('I-ADVD');
diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php
index 08a34a3..d1a2194 100755
--- a/tests/DuskTestCase.php
+++ b/tests/DuskTestCase.php
@@ -2,10 +2,10 @@
 
 namespace Tests;
 
-use Laravel\Dusk\TestCase as BaseTestCase;
-use Facebook\WebDriver\Remote\RemoteWebDriver;
-use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Chrome\ChromeOptions;
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Laravel\Dusk\TestCase as BaseTestCase;
 
 abstract class DuskTestCase extends BaseTestCase
 {
diff --git a/tests/Feature/FirstTest.php b/tests/Feature/FirstTest.php
index f096ad3..85a0f47 100755
--- a/tests/Feature/FirstTest.php
+++ b/tests/Feature/FirstTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature;
 
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Tests\TestCase;
 
 class FirstTest extends TestCase
 {
@@ -22,8 +22,6 @@ public function testExample()
         $response = $this->get('/');
         $response->assertStatus(200);
 
-
-
         $response = $this->get('/404page');
         $response->assertStatus(404);
 
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index 9ec8912..f5b3141 100755
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature;
 
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Tests\TestCase;
 
 class UserTest extends TestCase
 {
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index d9ff897..225d467 100755
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit;
 
-use Tests\TestCase;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
 
 class ExampleTest extends TestCase
 {
@@ -16,6 +16,5 @@ class ExampleTest extends TestCase
     public function testBasicTest()
     {
         $this->assertTrue(true);
-
     }
 }
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 243f9c8..074505f 100755
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -1,2 +1,3 @@
 getScenario()->runStep(new \Codeception\Step\Action('setHeader', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -36,11 +38,11 @@ public function setHeader($name, $value) {
      * @param $password
      * @see \Codeception\Module\PhpBrowser::amHttpAuthenticated()
      */
-    public function amHttpAuthenticated($username, $password) {
+    public function amHttpAuthenticated($username, $password)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -54,11 +56,11 @@ public function amHttpAuthenticated($username, $password) {
      * ```
      * @see \Codeception\Module\PhpBrowser::amOnUrl()
      */
-    public function amOnUrl($url) {
+    public function amOnUrl($url)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -82,11 +84,11 @@ public function amOnUrl($url) {
      * @return mixed
      * @see \Codeception\Module\PhpBrowser::amOnSubdomain()
      */
-    public function amOnSubdomain($subdomain) {
+    public function amOnSubdomain($subdomain)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -109,11 +111,11 @@ public function amOnSubdomain($subdomain) {
      * @param callable $function
      * @see \Codeception\Module\PhpBrowser::executeInGuzzle()
      */
-    public function executeInGuzzle($function) {
+    public function executeInGuzzle($function)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInGuzzle', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -144,11 +146,11 @@ public function executeInGuzzle($function) {
      *        requests
      * @see \Codeception\Lib\InnerBrowser::haveHttpHeader()
      */
-    public function haveHttpHeader($name, $value) {
+    public function haveHttpHeader($name, $value)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('haveHttpHeader', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -169,11 +171,11 @@ public function haveHttpHeader($name, $value) {
      * @param string $name the name of the header to delete.
      * @see \Codeception\Lib\InnerBrowser::deleteHeader()
      */
-    public function deleteHeader($name) {
+    public function deleteHeader($name)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -190,11 +192,11 @@ public function deleteHeader($name) {
      * @param string $page
      * @see \Codeception\Lib\InnerBrowser::amOnPage()
      */
-    public function amOnPage($page) {
+    public function amOnPage($page)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -229,11 +231,11 @@ public function amOnPage($page) {
      * @param $context
      * @see \Codeception\Lib\InnerBrowser::click()
      */
-    public function click($link, $context = null) {
+    public function click($link, $context = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -269,9 +271,11 @@ public function click($link, $context = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::see()
      */
-    public function canSee($text, $selector = null) {
+    public function canSee($text, $selector = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -306,11 +310,11 @@ public function canSee($text, $selector = null) {
      * @param array|string $selector optional
      * @see \Codeception\Lib\InnerBrowser::see()
      */
-    public function see($text, $selector = null) {
+    public function see($text, $selector = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -344,9 +348,11 @@ public function see($text, $selector = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSee()
      */
-    public function cantSee($text, $selector = null) {
+    public function cantSee($text, $selector = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -379,11 +385,11 @@ public function cantSee($text, $selector = null) {
      * @param array|string $selector optional
      * @see \Codeception\Lib\InnerBrowser::dontSee()
      */
-    public function dontSee($text, $selector = null) {
+    public function dontSee($text, $selector = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -399,9 +405,11 @@ public function dontSee($text, $selector = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeInSource()
      */
-    public function canSeeInSource($raw) {
+    public function canSeeInSource($raw)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -416,11 +424,11 @@ public function canSeeInSource($raw) {
      * @param      $raw
      * @see \Codeception\Lib\InnerBrowser::seeInSource()
      */
-    public function seeInSource($raw) {
+    public function seeInSource($raw)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -436,9 +444,11 @@ public function seeInSource($raw) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
      */
-    public function cantSeeInSource($raw) {
+    public function cantSeeInSource($raw)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -453,11 +463,11 @@ public function cantSeeInSource($raw) {
      * @param      $raw
      * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
      */
-    public function dontSeeInSource($raw) {
+    public function dontSeeInSource($raw)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -476,9 +486,11 @@ public function dontSeeInSource($raw) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeLink()
      */
-    public function canSeeLink($text, $url = null) {
+    public function canSeeLink($text, $url = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -496,11 +508,11 @@ public function canSeeLink($text, $url = null) {
      * @param string $url optional
      * @see \Codeception\Lib\InnerBrowser::seeLink()
      */
-    public function seeLink($text, $url = null) {
+    public function seeLink($text, $url = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -519,9 +531,11 @@ public function seeLink($text, $url = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
      */
-    public function cantSeeLink($text, $url = null) {
+    public function cantSeeLink($text, $url = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -539,11 +553,11 @@ public function cantSeeLink($text, $url = null) {
      * @param string $url optional
      * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
      */
-    public function dontSeeLink($text, $url = null) {
+    public function dontSeeLink($text, $url = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -562,9 +576,11 @@ public function dontSeeLink($text, $url = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
      */
-    public function canSeeInCurrentUrl($uri) {
+    public function canSeeInCurrentUrl($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -582,11 +598,11 @@ public function canSeeInCurrentUrl($uri) {
      * @param string $uri
      * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
      */
-    public function seeInCurrentUrl($uri) {
+    public function seeInCurrentUrl($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -602,9 +618,11 @@ public function seeInCurrentUrl($uri) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
      */
-    public function cantSeeInCurrentUrl($uri) {
+    public function cantSeeInCurrentUrl($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -619,11 +637,11 @@ public function cantSeeInCurrentUrl($uri) {
      * @param string $uri
      * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
      */
-    public function dontSeeInCurrentUrl($uri) {
+    public function dontSeeInCurrentUrl($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -641,9 +659,11 @@ public function dontSeeInCurrentUrl($uri) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
      */
-    public function canSeeCurrentUrlEquals($uri) {
+    public function canSeeCurrentUrlEquals($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -660,11 +680,11 @@ public function canSeeCurrentUrlEquals($uri) {
      * @param string $uri
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
      */
-    public function seeCurrentUrlEquals($uri) {
+    public function seeCurrentUrlEquals($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -682,9 +702,11 @@ public function seeCurrentUrlEquals($uri) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
      */
-    public function cantSeeCurrentUrlEquals($uri) {
+    public function cantSeeCurrentUrlEquals($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -701,11 +723,11 @@ public function cantSeeCurrentUrlEquals($uri) {
      * @param string $uri
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
      */
-    public function dontSeeCurrentUrlEquals($uri) {
+    public function dontSeeCurrentUrlEquals($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -722,9 +744,11 @@ public function dontSeeCurrentUrlEquals($uri) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
      */
-    public function canSeeCurrentUrlMatches($uri) {
+    public function canSeeCurrentUrlMatches($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -740,11 +764,11 @@ public function canSeeCurrentUrlMatches($uri) {
      * @param string $uri
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
      */
-    public function seeCurrentUrlMatches($uri) {
+    public function seeCurrentUrlMatches($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -761,9 +785,11 @@ public function seeCurrentUrlMatches($uri) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
      */
-    public function cantSeeCurrentUrlMatches($uri) {
+    public function cantSeeCurrentUrlMatches($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -779,11 +805,11 @@ public function cantSeeCurrentUrlMatches($uri) {
      * @param string $uri
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
      */
-    public function dontSeeCurrentUrlMatches($uri) {
+    public function dontSeeCurrentUrlMatches($uri)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -802,11 +828,11 @@ public function dontSeeCurrentUrlMatches($uri) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
      */
-    public function grabFromCurrentUrl($uri = null) {
+    public function grabFromCurrentUrl($uri = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -824,9 +850,11 @@ public function grabFromCurrentUrl($uri = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
      */
-    public function canSeeCheckboxIsChecked($checkbox) {
+    public function canSeeCheckboxIsChecked($checkbox)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -843,11 +871,11 @@ public function canSeeCheckboxIsChecked($checkbox) {
      * @param $checkbox
      * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
      */
-    public function seeCheckboxIsChecked($checkbox) {
+    public function seeCheckboxIsChecked($checkbox)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -864,9 +892,11 @@ public function seeCheckboxIsChecked($checkbox) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
      */
-    public function cantSeeCheckboxIsChecked($checkbox) {
+    public function cantSeeCheckboxIsChecked($checkbox)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -882,11 +912,11 @@ public function cantSeeCheckboxIsChecked($checkbox) {
      * @param $checkbox
      * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
      */
-    public function dontSeeCheckboxIsChecked($checkbox) {
+    public function dontSeeCheckboxIsChecked($checkbox)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -909,9 +939,11 @@ public function dontSeeCheckboxIsChecked($checkbox) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeInField()
      */
-    public function canSeeInField($field, $value) {
+    public function canSeeInField($field, $value)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -933,11 +965,11 @@ public function canSeeInField($field, $value) {
      * @param $value
      * @see \Codeception\Lib\InnerBrowser::seeInField()
      */
-    public function seeInField($field, $value) {
+    public function seeInField($field, $value)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -960,9 +992,11 @@ public function seeInField($field, $value) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
      */
-    public function cantSeeInField($field, $value) {
+    public function cantSeeInField($field, $value)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -984,11 +1018,11 @@ public function cantSeeInField($field, $value) {
      * @param $value
      * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
      */
-    public function dontSeeInField($field, $value) {
+    public function dontSeeInField($field, $value)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1054,9 +1088,11 @@ public function dontSeeInField($field, $value) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
      */
-    public function canSeeInFormFields($formSelector, $params) {
+    public function canSeeInFormFields($formSelector, $params)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1121,11 +1157,11 @@ public function canSeeInFormFields($formSelector, $params) {
      * @param $params
      * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
      */
-    public function seeInFormFields($formSelector, $params) {
+    public function seeInFormFields($formSelector, $params)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1171,9 +1207,11 @@ public function seeInFormFields($formSelector, $params) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
      */
-    public function cantSeeInFormFields($formSelector, $params) {
+    public function cantSeeInFormFields($formSelector, $params)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1218,11 +1256,11 @@ public function cantSeeInFormFields($formSelector, $params) {
      * @param $params
      * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
      */
-    public function dontSeeInFormFields($formSelector, $params) {
+    public function dontSeeInFormFields($formSelector, $params)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1397,11 +1435,11 @@ public function dontSeeInFormFields($formSelector, $params) {
      * @param $button
      * @see \Codeception\Lib\InnerBrowser::submitForm()
      */
-    public function submitForm($selector, $params, $button = null) {
+    public function submitForm($selector, $params, $button = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1418,11 +1456,11 @@ public function submitForm($selector, $params, $button = null) {
      * @param $value
      * @see \Codeception\Lib\InnerBrowser::fillField()
      */
-    public function fillField($field, $value) {
+    public function fillField($field, $value)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1457,11 +1495,11 @@ public function fillField($field, $value) {
      * @param $option
      * @see \Codeception\Lib\InnerBrowser::selectOption()
      */
-    public function selectOption($select, $option) {
+    public function selectOption($select, $option)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1476,11 +1514,11 @@ public function selectOption($select, $option) {
      * @param $option
      * @see \Codeception\Lib\InnerBrowser::checkOption()
      */
-    public function checkOption($option) {
+    public function checkOption($option)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1495,11 +1533,11 @@ public function checkOption($option) {
      * @param $option
      * @see \Codeception\Lib\InnerBrowser::uncheckOption()
      */
-    public function uncheckOption($option) {
+    public function uncheckOption($option)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1516,11 +1554,11 @@ public function uncheckOption($option) {
      * @param $filename
      * @see \Codeception\Lib\InnerBrowser::attachFile()
      */
-    public function attachFile($field, $filename) {
+    public function attachFile($field, $filename)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1533,11 +1571,11 @@ public function attachFile($field, $filename) {
      * @param $params
      * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
      */
-    public function sendAjaxGetRequest($uri, $params = null) {
+    public function sendAjaxGetRequest($uri, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1561,11 +1599,11 @@ public function sendAjaxGetRequest($uri, $params = null) {
      * @param $params
      * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
      */
-    public function sendAjaxPostRequest($uri, $params = null) {
+    public function sendAjaxPostRequest($uri, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1587,11 +1625,11 @@ public function sendAjaxPostRequest($uri, $params = null) {
      * @param $params
      * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
      */
-    public function sendAjaxRequest($method, $uri, $params = null) {
+    public function sendAjaxRequest($method, $uri, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1612,11 +1650,11 @@ public function sendAjaxRequest($method, $uri, $params = null) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
      */
-    public function grabTextFrom($cssOrXPathOrRegex) {
+    public function grabTextFrom($cssOrXPathOrRegex)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1636,11 +1674,11 @@ public function grabTextFrom($cssOrXPathOrRegex) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
      */
-    public function grabAttributeFrom($cssOrXpath, $attribute) {
+    public function grabAttributeFrom($cssOrXpath, $attribute)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1668,11 +1706,11 @@ public function grabAttributeFrom($cssOrXpath, $attribute) {
      * @return string[]
      * @see \Codeception\Lib\InnerBrowser::grabMultiple()
      */
-    public function grabMultiple($cssOrXpath, $attribute = null) {
+    public function grabMultiple($cssOrXpath, $attribute = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1681,11 +1719,11 @@ public function grabMultiple($cssOrXpath, $attribute = null) {
      * @return array|mixed|null|string
      * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
      */
-    public function grabValueFrom($field) {
+    public function grabValueFrom($field)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1705,11 +1743,11 @@ public function grabValueFrom($field) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::setCookie()
      */
-    public function setCookie($name, $val, $params = null) {
+    public function setCookie($name, $val, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1722,11 +1760,11 @@ public function setCookie($name, $val, $params = null) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::grabCookie()
      */
-    public function grabCookie($cookie, $params = null) {
+    public function grabCookie($cookie, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1737,11 +1775,11 @@ public function grabCookie($cookie, $params = null) {
      * @return string Current page source code.
      * @see \Codeception\Lib\InnerBrowser::grabPageSource()
      */
-    public function grabPageSource() {
+    public function grabPageSource()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabPageSource', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1760,9 +1798,11 @@ public function grabPageSource() {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeCookie()
      */
-    public function canSeeCookie($cookie, $params = null) {
+    public function canSeeCookie($cookie, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1780,11 +1820,11 @@ public function canSeeCookie($cookie, $params = null) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::seeCookie()
      */
-    public function seeCookie($cookie, $params = null) {
+    public function seeCookie($cookie, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1798,9 +1838,11 @@ public function seeCookie($cookie, $params = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
      */
-    public function cantSeeCookie($cookie, $params = null) {
+    public function cantSeeCookie($cookie, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1813,11 +1855,11 @@ public function cantSeeCookie($cookie, $params = null) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
      */
-    public function dontSeeCookie($cookie, $params = null) {
+    public function dontSeeCookie($cookie, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1830,11 +1872,11 @@ public function dontSeeCookie($cookie, $params = null) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::resetCookie()
      */
-    public function resetCookie($name, $params = null) {
+    public function resetCookie($name, $params = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1859,9 +1901,11 @@ public function resetCookie($name, $params = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeElement()
      */
-    public function canSeeElement($selector, $attributes = null) {
+    public function canSeeElement($selector, $attributes = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1885,11 +1929,11 @@ public function canSeeElement($selector, $attributes = null) {
      * @return
      * @see \Codeception\Lib\InnerBrowser::seeElement()
      */
-    public function seeElement($selector, $attributes = null) {
+    public function seeElement($selector, $attributes = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1910,9 +1954,11 @@ public function seeElement($selector, $attributes = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
      */
-    public function cantSeeElement($selector, $attributes = null) {
+    public function cantSeeElement($selector, $attributes = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1932,11 +1978,11 @@ public function cantSeeElement($selector, $attributes = null) {
      * @param array $attributes
      * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
      */
-    public function dontSeeElement($selector, $attributes = null) {
+    public function dontSeeElement($selector, $attributes = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1953,9 +1999,11 @@ public function dontSeeElement($selector, $attributes = null) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
      */
-    public function canSeeNumberOfElements($selector, $expected) {
+    public function canSeeNumberOfElements($selector, $expected)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1971,11 +2019,11 @@ public function canSeeNumberOfElements($selector, $expected) {
      * @param mixed $expected int or int[]
      * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
      */
-    public function seeNumberOfElements($selector, $expected) {
+    public function seeNumberOfElements($selector, $expected)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1994,9 +2042,11 @@ public function seeNumberOfElements($selector, $expected) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
      */
-    public function canSeeOptionIsSelected($selector, $optionText) {
+    public function canSeeOptionIsSelected($selector, $optionText)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2014,11 +2064,11 @@ public function canSeeOptionIsSelected($selector, $optionText) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
      */
-    public function seeOptionIsSelected($selector, $optionText) {
+    public function seeOptionIsSelected($selector, $optionText)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2037,9 +2087,11 @@ public function seeOptionIsSelected($selector, $optionText) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
      */
-    public function cantSeeOptionIsSelected($selector, $optionText) {
+    public function cantSeeOptionIsSelected($selector, $optionText)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2057,11 +2109,11 @@ public function cantSeeOptionIsSelected($selector, $optionText) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
      */
-    public function dontSeeOptionIsSelected($selector, $optionText) {
+    public function dontSeeOptionIsSelected($selector, $optionText)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2069,20 +2121,22 @@ public function dontSeeOptionIsSelected($selector, $optionText) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
      */
-    public function canSeePageNotFound() {
+    public function canSeePageNotFound()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
      * Asserts that current page has 404 response status code.
      * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
      */
-    public function seePageNotFound() {
+    public function seePageNotFound()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2100,9 +2154,11 @@ public function seePageNotFound() {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
      */
-    public function canSeeResponseCodeIs($code) {
+    public function canSeeResponseCodeIs($code)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2119,11 +2175,11 @@ public function canSeeResponseCodeIs($code) {
      * @param $code
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
      */
-    public function seeResponseCodeIs($code) {
+    public function seeResponseCodeIs($code)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2134,9 +2190,11 @@ public function seeResponseCodeIs($code) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsBetween()
      */
-    public function canSeeResponseCodeIsBetween($from, $to) {
+    public function canSeeResponseCodeIsBetween($from, $to)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsBetween', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2146,11 +2204,11 @@ public function canSeeResponseCodeIsBetween($from, $to) {
      * @param $to
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsBetween()
      */
-    public function seeResponseCodeIsBetween($from, $to) {
+    public function seeResponseCodeIsBetween($from, $to)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsBetween', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2167,9 +2225,11 @@ public function seeResponseCodeIsBetween($from, $to) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
      */
-    public function cantSeeResponseCodeIs($code) {
+    public function cantSeeResponseCodeIs($code)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2185,11 +2245,11 @@ public function cantSeeResponseCodeIs($code) {
      * @param $code
      * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
      */
-    public function dontSeeResponseCodeIs($code) {
+    public function dontSeeResponseCodeIs($code)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseCodeIs', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2197,20 +2257,22 @@ public function dontSeeResponseCodeIs($code) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsSuccessful()
      */
-    public function canSeeResponseCodeIsSuccessful() {
+    public function canSeeResponseCodeIsSuccessful()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsSuccessful', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
      * Checks that the response code 2xx
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsSuccessful()
      */
-    public function seeResponseCodeIsSuccessful() {
+    public function seeResponseCodeIsSuccessful()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsSuccessful', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2218,20 +2280,22 @@ public function seeResponseCodeIsSuccessful() {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsRedirection()
      */
-    public function canSeeResponseCodeIsRedirection() {
+    public function canSeeResponseCodeIsRedirection()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsRedirection', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
      * Checks that the response code 3xx
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsRedirection()
      */
-    public function seeResponseCodeIsRedirection() {
+    public function seeResponseCodeIsRedirection()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsRedirection', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2239,20 +2303,22 @@ public function seeResponseCodeIsRedirection() {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsClientError()
      */
-    public function canSeeResponseCodeIsClientError() {
+    public function canSeeResponseCodeIsClientError()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsClientError', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
      * Checks that the response code is 4xx
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsClientError()
      */
-    public function seeResponseCodeIsClientError() {
+    public function seeResponseCodeIsClientError()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsClientError', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2260,20 +2326,22 @@ public function seeResponseCodeIsClientError() {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsServerError()
      */
-    public function canSeeResponseCodeIsServerError() {
+    public function canSeeResponseCodeIsServerError()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsServerError', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
      * Checks that the response code is 5xx
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsServerError()
      */
-    public function seeResponseCodeIsServerError() {
+    public function seeResponseCodeIsServerError()
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsServerError', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2291,9 +2359,11 @@ public function seeResponseCodeIsServerError() {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::seeInTitle()
      */
-    public function canSeeInTitle($title) {
+    public function canSeeInTitle($title)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2310,11 +2380,11 @@ public function canSeeInTitle($title) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::seeInTitle()
      */
-    public function seeInTitle($title) {
+    public function seeInTitle($title)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2326,9 +2396,11 @@ public function seeInTitle($title) {
      * Conditional Assertion: Test won't be stopped on fail
      * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
      */
-    public function cantSeeInTitle($title) {
+    public function cantSeeInTitle($title)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2339,11 +2411,11 @@ public function cantSeeInTitle($title) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
      */
-    public function dontSeeInTitle($title) {
+    public function dontSeeInTitle($title)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2363,11 +2435,11 @@ public function dontSeeInTitle($title) {
      * @param string $name
      * @see \Codeception\Lib\InnerBrowser::switchToIframe()
      */
-    public function switchToIframe($name) {
+    public function switchToIframe($name)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIframe', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2376,7 +2448,8 @@ public function switchToIframe($name) {
      * @param int $numberOfSteps (default value 1)
      * @see \Codeception\Lib\InnerBrowser::moveBack()
      */
-    public function moveBack($numberOfSteps = null) {
+    public function moveBack($numberOfSteps = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
     }
 }
diff --git a/tests/_support/_generated/FunctionalTesterActions.php b/tests/_support/_generated/FunctionalTesterActions.php
index d5e5a25..3b9345b 100755
--- a/tests/_support/_generated/FunctionalTesterActions.php
+++ b/tests/_support/_generated/FunctionalTesterActions.php
@@ -1,4 +1,7 @@
-getScenario()->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -68,11 +70,11 @@ public function assertEquals($expected, $actual, $message = null, $delta = null)
      * @param float  $delta
      * @see \Codeception\Module\Asserts::assertNotEquals()
      */
-    public function assertNotEquals($expected, $actual, $message = null, $delta = null) {
+    public function assertNotEquals($expected, $actual, $message = null, $delta = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -83,11 +85,11 @@ public function assertNotEquals($expected, $actual, $message = null, $delta = nu
      * @param string $message
      * @see \Codeception\Module\Asserts::assertSame()
      */
-    public function assertSame($expected, $actual, $message = null) {
+    public function assertSame($expected, $actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSame', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -98,11 +100,11 @@ public function assertSame($expected, $actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertNotSame()
      */
-    public function assertNotSame($expected, $actual, $message = null) {
+    public function assertNotSame($expected, $actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSame', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -113,11 +115,11 @@ public function assertNotSame($expected, $actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertGreaterThan()
      */
-    public function assertGreaterThan($expected, $actual, $message = null) {
+    public function assertGreaterThan($expected, $actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThan', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -128,11 +130,11 @@ public function assertGreaterThan($expected, $actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertGreaterThanOrEqual()
      */
-    public function assertGreaterThanOrEqual($expected, $actual, $message = null) {
+    public function assertGreaterThanOrEqual($expected, $actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThanOrEqual', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -143,11 +145,11 @@ public function assertGreaterThanOrEqual($expected, $actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertLessThan()
      */
-    public function assertLessThan($expected, $actual, $message = null) {
+    public function assertLessThan($expected, $actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThan', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -158,11 +160,11 @@ public function assertLessThan($expected, $actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertLessThanOrEqual()
      */
-    public function assertLessThanOrEqual($expected, $actual, $message = null) {
+    public function assertLessThanOrEqual($expected, $actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThanOrEqual', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -173,11 +175,11 @@ public function assertLessThanOrEqual($expected, $actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertContains()
      */
-    public function assertContains($needle, $haystack, $message = null) {
+    public function assertContains($needle, $haystack, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContains', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -188,11 +190,11 @@ public function assertContains($needle, $haystack, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertNotContains()
      */
-    public function assertNotContains($needle, $haystack, $message = null) {
+    public function assertNotContains($needle, $haystack, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContains', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -203,11 +205,11 @@ public function assertNotContains($needle, $haystack, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertRegExp()
      */
-    public function assertRegExp($pattern, $string, $message = null) {
+    public function assertRegExp($pattern, $string, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertRegExp', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -218,11 +220,11 @@ public function assertRegExp($pattern, $string, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertNotRegExp()
      */
-    public function assertNotRegExp($pattern, $string, $message = null) {
+    public function assertNotRegExp($pattern, $string, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotRegExp', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -233,11 +235,11 @@ public function assertNotRegExp($pattern, $string, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertStringStartsWith()
      */
-    public function assertStringStartsWith($prefix, $string, $message = null) {
+    public function assertStringStartsWith($prefix, $string, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsWith', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -248,11 +250,11 @@ public function assertStringStartsWith($prefix, $string, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertStringStartsNotWith()
      */
-    public function assertStringStartsNotWith($prefix, $string, $message = null) {
+    public function assertStringStartsNotWith($prefix, $string, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsNotWith', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -262,11 +264,11 @@ public function assertStringStartsNotWith($prefix, $string, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertEmpty()
      */
-    public function assertEmpty($actual, $message = null) {
+    public function assertEmpty($actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEmpty', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -276,11 +278,11 @@ public function assertEmpty($actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertNotEmpty()
      */
-    public function assertNotEmpty($actual, $message = null) {
+    public function assertNotEmpty($actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEmpty', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -290,11 +292,11 @@ public function assertNotEmpty($actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertNull()
      */
-    public function assertNull($actual, $message = null) {
+    public function assertNull($actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNull', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -304,11 +306,11 @@ public function assertNull($actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertNotNull()
      */
-    public function assertNotNull($actual, $message = null) {
+    public function assertNotNull($actual, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotNull', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -318,11 +320,11 @@ public function assertNotNull($actual, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertTrue()
      */
-    public function assertTrue($condition, $message = null) {
+    public function assertTrue($condition, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertTrue', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -332,11 +334,11 @@ public function assertTrue($condition, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertNotTrue()
      */
-    public function assertNotTrue($condition, $message = null) {
+    public function assertNotTrue($condition, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotTrue', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -346,11 +348,11 @@ public function assertNotTrue($condition, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertFalse()
      */
-    public function assertFalse($condition, $message = null) {
+    public function assertFalse($condition, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFalse', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -360,11 +362,11 @@ public function assertFalse($condition, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertNotFalse()
      */
-    public function assertNotFalse($condition, $message = null) {
+    public function assertNotFalse($condition, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotFalse', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -374,11 +376,11 @@ public function assertNotFalse($condition, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertFileExists()
      */
-    public function assertFileExists($filename, $message = null) {
+    public function assertFileExists($filename, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileExists', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -388,11 +390,11 @@ public function assertFileExists($filename, $message = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertFileNotExists()
      */
-    public function assertFileNotExists($filename, $message = null) {
+    public function assertFileNotExists($filename, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotExists', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -401,11 +403,11 @@ public function assertFileNotExists($filename, $message = null) {
      * @param $description
      * @see \Codeception\Module\Asserts::assertGreaterOrEquals()
      */
-    public function assertGreaterOrEquals($expected, $actual, $description = null) {
+    public function assertGreaterOrEquals($expected, $actual, $description = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterOrEquals', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -414,11 +416,11 @@ public function assertGreaterOrEquals($expected, $actual, $description = null) {
      * @param $description
      * @see \Codeception\Module\Asserts::assertLessOrEquals()
      */
-    public function assertLessOrEquals($expected, $actual, $description = null) {
+    public function assertLessOrEquals($expected, $actual, $description = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessOrEquals', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -426,11 +428,11 @@ public function assertLessOrEquals($expected, $actual, $description = null) {
      * @param $description
      * @see \Codeception\Module\Asserts::assertIsEmpty()
      */
-    public function assertIsEmpty($actual, $description = null) {
+    public function assertIsEmpty($actual, $description = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsEmpty', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -439,11 +441,11 @@ public function assertIsEmpty($actual, $description = null) {
      * @param $description
      * @see \Codeception\Module\Asserts::assertArrayHasKey()
      */
-    public function assertArrayHasKey($key, $actual, $description = null) {
+    public function assertArrayHasKey($key, $actual, $description = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayHasKey', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -452,11 +454,11 @@ public function assertArrayHasKey($key, $actual, $description = null) {
      * @param $description
      * @see \Codeception\Module\Asserts::assertArrayNotHasKey()
      */
-    public function assertArrayNotHasKey($key, $actual, $description = null) {
+    public function assertArrayNotHasKey($key, $actual, $description = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayNotHasKey', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -468,11 +470,11 @@ public function assertArrayNotHasKey($key, $actual, $description = null) {
      * @param string $message
      * @see \Codeception\Module\Asserts::assertArraySubset()
      */
-    public function assertArraySubset($subset, $array, $strict = null, $message = null) {
+    public function assertArraySubset($subset, $array, $strict = null, $message = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArraySubset', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -481,11 +483,11 @@ public function assertArraySubset($subset, $array, $strict = null, $message = nu
      * @param $description
      * @see \Codeception\Module\Asserts::assertCount()
      */
-    public function assertCount($expectedCount, $actual, $description = null) {
+    public function assertCount($expectedCount, $actual, $description = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertCount', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -494,11 +496,11 @@ public function assertCount($expectedCount, $actual, $description = null) {
      * @param $description
      * @see \Codeception\Module\Asserts::assertInstanceOf()
      */
-    public function assertInstanceOf($class, $actual, $description = null) {
+    public function assertInstanceOf($class, $actual, $description = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInstanceOf', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -507,11 +509,11 @@ public function assertInstanceOf($class, $actual, $description = null) {
      * @param $description
      * @see \Codeception\Module\Asserts::assertNotInstanceOf()
      */
-    public function assertNotInstanceOf($class, $actual, $description = null) {
+    public function assertNotInstanceOf($class, $actual, $description = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotInstanceOf', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -520,11 +522,11 @@ public function assertNotInstanceOf($class, $actual, $description = null) {
      * @param $description
      * @see \Codeception\Module\Asserts::assertInternalType()
      */
-    public function assertInternalType($type, $actual, $description = null) {
+    public function assertInternalType($type, $actual, $description = null)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInternalType', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -533,11 +535,11 @@ public function assertInternalType($type, $actual, $description = null) {
      * @param $message
      * @see \Codeception\Module\Asserts::fail()
      */
-    public function fail($message) {
+    public function fail($message)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -569,11 +571,11 @@ public function fail($message) {
      * @deprecated Use expectThrowable instead
      * @see \Codeception\Module\Asserts::expectException()
      */
-    public function expectException($exception, $callback) {
+    public function expectException($exception, $callback)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
     }
 
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -603,7 +605,8 @@ public function expectException($exception, $callback) {
      * @param $callback
      * @see \Codeception\Module\Asserts::expectThrowable()
      */
-    public function expectThrowable($throwable, $callback) {
+    public function expectThrowable($throwable, $callback)
+    {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('expectThrowable', func_get_args()));
     }
 }
diff --git a/tests/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php
index 8a88555..62817a5 100755
--- a/tests/acceptance/_bootstrap.php
+++ b/tests/acceptance/_bootstrap.php
@@ -1,2 +1,3 @@
 wantTo('test a non login redirect');
 $I->amOnPage('/home');
diff --git a/tests/acceptance/loginFailedCept.php b/tests/acceptance/loginFailedCept.php
index b55fddc..0aa1de2 100755
--- a/tests/acceptance/loginFailedCept.php
+++ b/tests/acceptance/loginFailedCept.php
@@ -1,4 +1,5 @@
 wantTo('test a failed login');
 $I->amOnPage('/login');
diff --git a/tests/acceptance/screenshotsCept.php b/tests/acceptance/screenshotsCept.php
index 695f464..b47011e 100755
--- a/tests/acceptance/screenshotsCept.php
+++ b/tests/acceptance/screenshotsCept.php
@@ -1,4 +1,5 @@
 wantTo('test a failed login');
 $I->amOnPage('/login');
diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php
index 8a88555..62817a5 100755
--- a/tests/functional/_bootstrap.php
+++ b/tests/functional/_bootstrap.php
@@ -1,2 +1,3 @@