This commit is contained in:
Daniel
2021-02-15 21:44:32 +01:00
parent c66f7d19a4
commit c58fe40fbe
21 changed files with 2254 additions and 2989 deletions

12
app/certbot.log Normal file
View File

@@ -0,0 +1,12 @@
Traceback (most recent call last):
File "/usr/bin/certbot", line 9, in <module>
load_entry_point('certbot==0.9.3', 'console_scripts', 'certbot')()
File "/usr/lib/python2.7/dist-packages/certbot/main.py", line 749, in main
setup_logging(config)
File "/usr/lib/python2.7/dist-packages/certbot/main.py", line 642, in setup_logging
config, logfile=logfile, fmt=file_fmt)
File "/usr/lib/python2.7/dist-packages/certbot/main.py", line 604, in setup_log_file_handler
raise errors.Error(_PERM_ERR_FMT.format(error))
Error: The following error was encountered:
[Errno 13] Permission denied: '/var/log/letsencrypt/letsencrypt.log'
If running as non-root, set --config-dir, --logs-dir, and --work-dir to writeable paths.

View File

@@ -0,0 +1,6 @@
use GuzzleHttp\client;
class JustWatch {
private $path = 'https://apis.justwatch.com/content/%s';
}

View File

@@ -693,7 +693,7 @@ class TMDb
*/
public function getConfiguration()
{
$config = $this->_makeCall('configuration');
$config = $this->_makeCall('configuration');
if( ! empty($config))
{
@@ -717,7 +717,7 @@ class TMDb
if(isset($config['images']))
{
$base_url = $config['images']['base_url'];
$base_url = $config['images']['secure_base_url'];
$available_sizes = $this->getAvailableImageSizes($imagetype);
if(in_array($size, $available_sizes))

View File

@@ -23,7 +23,7 @@ Route::get('/', function()
$news = News::aktuell()->get();
$nextfilm = Dumbo::find(1)->film;
$tmdb = new TMDb(Config::get('constants.tvdb.apikey'), 'de', TRUE);
$tmdb = new TMDb(Config::get('constants.tvdb.apikey'), 'de', TRUE, TMDb::API_SCHEME_SSL);
foreach(array("top" => $mg[0], "neu" => $vorgeschlagen[0], "alt" => $gesehen[0]) as $key => $val) {
$tmovie = $tmdb->getMovie($val->tvdbid);
$images[$key] = $tmdb->getImageUrl($tmovie['poster_path'], TMDb::IMAGE_POSTER, 'w342');
@@ -337,16 +337,18 @@ Route::post('settings/{mode}', array('before' => 'auth', function($mode) {
$val = Validator::make($vfields, $vrules);
if($val->passes()) {
/* Delete old Avatars */
array_map('unlink', glob(public_path("img/avatars/". Auth::user()->id . "-*")));
//array_map('unlink', glob(public_path("img/avatars/". Auth::user()->id . "-*")));
/** @var Symfony\Component\HttpFoundation\File\UploadedFile $file */
$file = Input::file('avatar');
$file = $file->move( public_path("img/avatars/"), Auth::user()->id . "-". Str::slug($file->getFilename()) . "." . $file->guessExtension() );
$i = new Imagick();
$i->readImage($file->getRealPath());
$i->cropThumbnailImage(100, 100);
$i->writeImage();
exec('/usr/bin/gm convert -size 100x100 ' . $file->getRealPath() . ' -thumbnail 100x100^ -gravity center -extent 100x100 +profile "*" ' . $file->getRealPath());
//$i = new Imagick();
//$i->readImage($file->getRealPath());
//$i->cropThumbnailImage(100, 100);
//$i->writeImage();
/** @var User $u */
$u = Auth::user();
@@ -560,8 +562,5 @@ Route::get('stats', function() {
),
];
// dd(DB::getQueryLog());
return View::make('stats')->with('stats', $stats);
});

View File

@@ -73,7 +73,7 @@
<footer id="footer">
<div class="container">
<hr>
<small>&copy; 2013-2016 &mdash; Daniel M&uuml;llers</small>
<small>&copy; 2013-{{ date("Y") }} &mdash; Daniel M&uuml;llers</small>
</div>
</footer>

View File

@@ -1,4 +1,4 @@
@extends('hello');
@extends('hello')
@section('content')
<div class="row">

View File

@@ -9,37 +9,38 @@
<div class="panel panel-default">
<div class="panel-heading">{{$stat["name"]}}</div>
<div class="panel-body">
<?php $top = $stat["vals"]->shift() ?>
<?php $top = $stat["vals"]->shift(); $prop = $stat['prop']; ?>
<div>
@if($stat['type'] === "User")
<div class="pull-left" style="margin-right:5px">
<img class="img-circle media-object" src="{{$top->$stat['prop']->getAvatar()}}" width="47">
<img class="img-circle media-object" src="{{$top->$prop->getAvatar()}}" width="47">
</div>
@endif
@if($stat['type'] === "Film")
<div class="pull-left" style="margin-right:5px">
<img class="media-object" src="{{$top->$stat['prop']->getPoster()}}" height="47">
<img class="media-object" src="{{$top->$prop->getPoster()}}" height="47">
</div>
@endif
<div class="media-body">
<h4 class="media-heading">{{is_object($top->$stat['prop']) ? $top->$stat['prop']->name : dd($top)}}</h4>
<h4 class="media-heading">{{is_object($top->$prop) ? $top->$prop->name : dd($top)}}</h4>
<b>{{$top->count}}</b> {{$top->count ==1 ? $stat['entr'][0] : $stat['entr'][1] }}
</div>
</div>
@foreach($stat['vals'] as $top)
<?php $prop = $stat['prop']; ?>
<div style="margin-top: 10px;">
@if($stat['type'] === "User")
<div class="pull-left" style="margin-right:5px">
<img class="img-circle media-object" src="{{$top->$stat['prop']->getAvatar()}}" width="20">
<img class="img-circle media-object" src="{{$top->$prop->getAvatar()}}" width="20">
</div>
@endif
@if($stat['type'] === "Film")
<div class="pull-left" style="margin-right:5px">
<img class="media-object" src="{{$top->$stat['prop']->getPoster()}}" height="20">
<img class="media-object" src="{{$top->$prop->getPoster()}}" height="20">
</div>
@endif
<div class="media-body">
<h5 class="media-heading">{{$top->$stat['prop']->name}} &mdash; <b>{{$top->count}}</b> {{$top->count ==1 ? $stat['entr'][0] : $stat['entr'][1] }}</h5>
<h5 class="media-heading">{{$top->$prop->name}} &mdash; <b>{{$top->count}}</b> {{$top->count ==1 ? $stat['entr'][0] : $stat['entr'][1] }}</h5>
</div>
</div>
@endforeach

View File

@@ -1,9 +1,10 @@
{
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"name": "ascarion/dumbo",
"description": "Dumbo Film Platform",
"keywords": ["dumbo", "film"],
"require": {
"laravel/framework": "4.0.*"
"laravel/framework": "4.0.*",
"guzzlehttp/guzzle": "^6.3@dev"
},
"autoload": {
"classmap": [

425
composer.lock generated
View File

@@ -1,21 +1,22 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"hash": "5f4fb65cecf43da689abed6fc20358f5",
"content-hash": "0083c6856528368b62681e275ac8466f",
"packages": [
{
"name": "classpreloader/classpreloader",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/mtdowling/ClassPreloader.git",
"url": "https://github.com/ClassPreloader/ClassPreloader.git",
"reference": "1a50f7945b725ff2c60f234e51407d1d6e7c77c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mtdowling/ClassPreloader/zipball/1a50f7945b725ff2c60f234e51407d1d6e7c77c5",
"url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/1a50f7945b725ff2c60f234e51407d1d6e7c77c5",
"reference": "1a50f7945b725ff2c60f234e51407d1d6e7c77c5",
"shasum": ""
},
@@ -50,7 +51,7 @@
"class",
"preload"
],
"time": "2013-06-24 22:58:34"
"time": "2013-06-24T22:58:34+00:00"
},
{
"name": "doctrine/annotations",
@@ -121,7 +122,7 @@
"docblock",
"parser"
],
"time": "2013-06-16 21:33:03"
"time": "2013-06-16T21:33:03+00:00"
},
{
"name": "doctrine/cache",
@@ -190,7 +191,7 @@
"cache",
"caching"
],
"time": "2013-08-07 16:04:25"
"time": "2013-08-07T16:04:25+00:00"
},
{
"name": "doctrine/collections",
@@ -257,7 +258,7 @@
"collections",
"iterator"
],
"time": "2013-08-29 16:56:45"
"time": "2013-08-29T16:56:45+00:00"
},
{
"name": "doctrine/common",
@@ -331,7 +332,7 @@
"persistence",
"spl"
],
"time": "2013-08-20 18:10:31"
"time": "2013-08-20T18:10:31+00:00"
},
{
"name": "doctrine/dbal",
@@ -401,7 +402,7 @@
"persistence",
"queryobject"
],
"time": "2013-09-05 17:30:39"
"time": "2013-09-05T17:30:39+00:00"
},
{
"name": "doctrine/inflector",
@@ -469,7 +470,7 @@
"singularize",
"string"
],
"time": "2013-04-10 16:14:30"
"time": "2013-04-10T16:14:30+00:00"
},
{
"name": "doctrine/lexer",
@@ -526,7 +527,7 @@
"lexer",
"parser"
],
"time": "2013-03-07 12:15:25"
"time": "2013-03-07T12:15:25+00:00"
},
{
"name": "filp/whoops",
@@ -577,7 +578,195 @@
"whoops",
"zf2"
],
"time": "2013-06-10 12:22:13"
"time": "2013-06-10T12:22:13+00:00"
},
{
"name": "guzzlehttp/guzzle",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "a7010cc9b52ecfa00051bb26e4ae025958fe9851"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a7010cc9b52ecfa00051bb26e4ae025958fe9851",
"reference": "a7010cc9b52ecfa00051bb26e4ae025958fe9851",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.4",
"php": ">=5.5"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
"psr/log": "^1.1"
},
"suggest": {
"psr/log": "Required for using the Log middleware"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.3-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Guzzle is a PHP HTTP client library",
"homepage": "http://guzzlephp.org/",
"keywords": [
"client",
"curl",
"framework",
"http",
"http client",
"rest",
"web service"
],
"time": "2019-08-23T22:16:30+00:00"
},
{
"name": "guzzlehttp/promises",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "17d36ed176c998839582c739ce0753381598edf0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/17d36ed176c998839582c739ce0753381598edf0",
"reference": "17d36ed176c998839582c739ce0753381598edf0",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "^5.7.27 || ^7.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Guzzle promises library",
"keywords": [
"promise"
],
"time": "2019-07-02T14:54:06+00:00"
},
{
"name": "guzzlehttp/psr7",
"version": "1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "2595b33c1c924889b474d324f3d719fa40b6954e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/2595b33c1c924889b474d324f3d719fa40b6954e",
"reference": "2595b33c1c924889b474d324f3d719fa40b6954e",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"psr/http-message": "~1.0",
"ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
},
"provide": {
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"ext-zlib": "*",
"phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
},
"suggest": {
"zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.6-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Psr7\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Tobias Schultze",
"homepage": "https://github.com/Tobion"
}
],
"description": "PSR-7 message implementation that also provides common utility methods",
"keywords": [
"http",
"message",
"psr-7",
"request",
"response",
"stream",
"uri",
"url"
],
"time": "2019-08-13T16:05:52+00:00"
},
{
"name": "ircmaxell/password-compat",
@@ -616,7 +805,7 @@
"hashing",
"password"
],
"time": "2013-04-30 19:58:08"
"time": "2013-04-30T19:58:08+00:00"
},
{
"name": "laravel/framework",
@@ -728,7 +917,7 @@
"framework",
"laravel"
],
"time": "2013-08-31 21:50:30"
"time": "2013-08-31T21:50:30+00:00"
},
{
"name": "monolog/monolog",
@@ -790,7 +979,7 @@
"logging",
"psr-3"
],
"time": "2013-09-02 10:24:25"
"time": "2013-09-02T10:24:25+00:00"
},
{
"name": "nesbot/carbon",
@@ -833,7 +1022,7 @@
"datetime",
"time"
],
"time": "2013-08-21 04:36:40"
"time": "2013-08-21T04:36:40+00:00"
},
{
"name": "nikic/php-parser",
@@ -877,7 +1066,7 @@
"parser",
"php"
],
"time": "2013-08-25 17:11:40"
"time": "2013-08-25T17:11:40+00:00"
},
{
"name": "patchwork/utf8",
@@ -922,7 +1111,7 @@
"utf-8",
"utf8"
],
"time": "2013-08-19 09:37:02"
"time": "2013-08-19T09:37:02+00:00"
},
{
"name": "predis/predis",
@@ -969,7 +1158,57 @@
"predis",
"redis"
],
"time": "2013-08-31 08:51:10"
"time": "2013-08-31T08:51:10+00:00"
},
{
"name": "psr/http-message",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-message.git",
"reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-message/zipball/efd67d1dc14a7ef4fc4e518e7dee91c271d524e4",
"reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Http\\Message\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interface for HTTP messages",
"homepage": "https://github.com/php-fig/http-message",
"keywords": [
"http",
"http-message",
"psr",
"psr-7",
"request",
"response"
],
"time": "2019-08-29T13:16:46+00:00"
},
{
"name": "psr/log",
@@ -1007,7 +1246,47 @@
"psr",
"psr-3"
],
"time": "2012-12-21 11:40:51"
"time": "2012-12-21T11:40:51+00:00"
},
{
"name": "ralouphie/getallheaders",
"version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/ralouphie/getallheaders.git",
"reference": "120b605dfeb996808c31b6477290a714d356e822"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
"reference": "120b605dfeb996808c31b6477290a714d356e822",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"require-dev": {
"php-coveralls/php-coveralls": "^2.1",
"phpunit/phpunit": "^5 || ^6.5"
},
"type": "library",
"autoload": {
"files": [
"src/getallheaders.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Ralph Khattar",
"email": "ralph.khattar@gmail.com"
}
],
"description": "A polyfill for getallheaders.",
"time": "2019-03-08T08:55:37+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -1056,7 +1335,7 @@
"mail",
"mailer"
],
"time": "2013-08-30 12:35:21"
"time": "2013-08-30T12:35:21+00:00"
},
{
"name": "symfony/browser-kit",
@@ -1064,12 +1343,12 @@
"target-dir": "Symfony/Component/BrowserKit",
"source": {
"type": "git",
"url": "https://github.com/symfony/BrowserKit.git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "11dcdf2a3f485e0b362cfc364b7e9e5ef80562ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/BrowserKit/zipball/11dcdf2a3f485e0b362cfc364b7e9e5ef80562ab",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/11dcdf2a3f485e0b362cfc364b7e9e5ef80562ab",
"reference": "11dcdf2a3f485e0b362cfc364b7e9e5ef80562ab",
"shasum": ""
},
@@ -1111,7 +1390,7 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "http://symfony.com",
"time": "2013-08-31 06:12:22"
"time": "2013-08-31T06:12:22+00:00"
},
{
"name": "symfony/console",
@@ -1119,12 +1398,12 @@
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
"url": "https://github.com/symfony/console.git",
"reference": "6db369933dae13262c7c8c9a265d51723be1d2e3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/6db369933dae13262c7c8c9a265d51723be1d2e3",
"url": "https://api.github.com/repos/symfony/console/zipball/6db369933dae13262c7c8c9a265d51723be1d2e3",
"reference": "6db369933dae13262c7c8c9a265d51723be1d2e3",
"shasum": ""
},
@@ -1164,7 +1443,7 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
"time": "2013-09-06 18:20:34"
"time": "2013-09-06T18:20:34+00:00"
},
{
"name": "symfony/css-selector",
@@ -1172,12 +1451,12 @@
"target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "885544201cb24e79754da1dbd61bd779c2e4353e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/885544201cb24e79754da1dbd61bd779c2e4353e",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/885544201cb24e79754da1dbd61bd779c2e4353e",
"reference": "885544201cb24e79754da1dbd61bd779c2e4353e",
"shasum": ""
},
@@ -1215,7 +1494,7 @@
],
"description": "Symfony CssSelector Component",
"homepage": "http://symfony.com",
"time": "2013-07-21 12:12:18"
"time": "2013-07-21T12:12:18+00:00"
},
{
"name": "symfony/debug",
@@ -1223,12 +1502,12 @@
"target-dir": "Symfony/Component/Debug",
"source": {
"type": "git",
"url": "https://github.com/symfony/Debug.git",
"url": "https://github.com/symfony/debug.git",
"reference": "729f6d19cfc401c4942e43fcc1059103bd6df130"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Debug/zipball/729f6d19cfc401c4942e43fcc1059103bd6df130",
"url": "https://api.github.com/repos/symfony/debug/zipball/729f6d19cfc401c4942e43fcc1059103bd6df130",
"reference": "729f6d19cfc401c4942e43fcc1059103bd6df130",
"shasum": ""
},
@@ -1271,7 +1550,7 @@
],
"description": "Symfony Debug Component",
"homepage": "http://symfony.com",
"time": "2013-08-08 14:16:10"
"time": "2013-08-08T14:16:10+00:00"
},
{
"name": "symfony/dom-crawler",
@@ -1279,12 +1558,12 @@
"target-dir": "Symfony/Component/DomCrawler",
"source": {
"type": "git",
"url": "https://github.com/symfony/DomCrawler.git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/DomCrawler/zipball/e05e07fe8958a304b5e135f8e65d4ae6148cf59b",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/e05e07fe8958a304b5e135f8e65d4ae6148cf59b",
"reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b",
"shasum": ""
},
@@ -1324,7 +1603,7 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "http://symfony.com",
"time": "2013-07-21 12:12:18"
"time": "2013-07-21T12:12:18+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -1332,12 +1611,12 @@
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/41c9826457c65fa3cf746f214985b7ca9cba42f8",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/41c9826457c65fa3cf746f214985b7ca9cba42f8",
"reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8",
"shasum": ""
},
@@ -1378,7 +1657,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
"time": "2013-07-21 12:12:18"
"time": "2013-07-21T12:12:18+00:00"
},
{
"name": "symfony/filesystem",
@@ -1386,12 +1665,12 @@
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
"url": "https://github.com/symfony/Filesystem.git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "da0dcf60b7307f68667fecef8ccbb2b070bda7cf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Filesystem/zipball/da0dcf60b7307f68667fecef8ccbb2b070bda7cf",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/da0dcf60b7307f68667fecef8ccbb2b070bda7cf",
"reference": "da0dcf60b7307f68667fecef8ccbb2b070bda7cf",
"shasum": ""
},
@@ -1425,7 +1704,7 @@
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com",
"time": "2013-08-09 07:26:54"
"time": "2013-08-09T07:26:54+00:00"
},
{
"name": "symfony/finder",
@@ -1433,12 +1712,12 @@
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
"url": "https://github.com/symfony/finder.git",
"reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Finder/zipball/4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
"url": "https://api.github.com/repos/symfony/finder/zipball/4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
"reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
"shasum": ""
},
@@ -1472,7 +1751,7 @@
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com",
"time": "2013-08-13 20:18:00"
"time": "2013-08-13T20:18:00+00:00"
},
{
"name": "symfony/http-foundation",
@@ -1480,12 +1759,12 @@
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation.git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "cd7b96d5777a742e178fb58059ab70d794b5b351"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/cd7b96d5777a742e178fb58059ab70d794b5b351",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/cd7b96d5777a742e178fb58059ab70d794b5b351",
"reference": "cd7b96d5777a742e178fb58059ab70d794b5b351",
"shasum": ""
},
@@ -1522,7 +1801,7 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com",
"time": "2013-08-29 19:32:30"
"time": "2013-08-29T19:32:30+00:00"
},
{
"name": "symfony/http-kernel",
@@ -1530,12 +1809,12 @@
"target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel.git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "0bd6f23256c47d209ed0f30ce54aef0405a750ec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0bd6f23256c47d209ed0f30ce54aef0405a750ec",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/0bd6f23256c47d209ed0f30ce54aef0405a750ec",
"reference": "0bd6f23256c47d209ed0f30ce54aef0405a750ec",
"shasum": ""
},
@@ -1593,7 +1872,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com",
"time": "2013-09-06 18:20:34"
"time": "2013-09-06T18:20:34+00:00"
},
{
"name": "symfony/process",
@@ -1601,12 +1880,12 @@
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
"url": "https://github.com/symfony/process.git",
"reference": "6e3b487a74ce7dcab6af34e14afcb9d438d69327"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/6e3b487a74ce7dcab6af34e14afcb9d438d69327",
"url": "https://api.github.com/repos/symfony/process/zipball/6e3b487a74ce7dcab6af34e14afcb9d438d69327",
"reference": "6e3b487a74ce7dcab6af34e14afcb9d438d69327",
"shasum": ""
},
@@ -1640,7 +1919,7 @@
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
"time": "2013-08-30 13:10:46"
"time": "2013-08-30T13:10:46+00:00"
},
{
"name": "symfony/routing",
@@ -1648,12 +1927,12 @@
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing.git",
"url": "https://github.com/symfony/routing.git",
"reference": "3085975262bc36dc89929a936056dc6e5cb8a100"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Routing/zipball/3085975262bc36dc89929a936056dc6e5cb8a100",
"url": "https://api.github.com/repos/symfony/routing/zipball/3085975262bc36dc89929a936056dc6e5cb8a100",
"reference": "3085975262bc36dc89929a936056dc6e5cb8a100",
"shasum": ""
},
@@ -1698,7 +1977,7 @@
],
"description": "Symfony Routing Component",
"homepage": "http://symfony.com",
"time": "2013-09-06 18:20:34"
"time": "2013-09-06T18:20:34+00:00"
},
{
"name": "symfony/translation",
@@ -1706,12 +1985,12 @@
"target-dir": "Symfony/Component/Translation",
"source": {
"type": "git",
"url": "https://github.com/symfony/Translation.git",
"url": "https://github.com/symfony/translation.git",
"reference": "65f888291f0896ad492f9abc6dc05c998373aded"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Translation/zipball/65f888291f0896ad492f9abc6dc05c998373aded",
"url": "https://api.github.com/repos/symfony/translation/zipball/65f888291f0896ad492f9abc6dc05c998373aded",
"reference": "65f888291f0896ad492f9abc6dc05c998373aded",
"shasum": ""
},
@@ -1753,23 +2032,17 @@
],
"description": "Symfony Translation Component",
"homepage": "http://symfony.com",
"time": "2013-08-26 05:49:51"
"time": "2013-08-26T05:49:51+00:00"
}
],
"packages-dev": [
],
"aliases": [
],
"packages-dev": [],
"aliases": [],
"minimum-stability": "dev",
"stability-flags": [
],
"platform": [
],
"platform-dev": [
]
"stability-flags": {
"guzzlehttp/guzzle": 20
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform-dev": []
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

View File

@@ -59,4 +59,4 @@ $app->run();
|
*/
$app->shutdown();
$app->shutdown();

2
public/info.php Normal file
View File

@@ -0,0 +1,2 @@
asdölgfih
<?php phpinfo(); ?>

2
vendor/autoload.php vendored
View File

@@ -2,6 +2,6 @@
// autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php';
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit7389a4d4b2c7fcdb9cbed4794746f4b3::getLoader();

View File

@@ -13,9 +13,7 @@
namespace Composer\Autoload;
/**
* ClassLoader implements a PSR-0 class loader
*
* See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
@@ -39,22 +37,48 @@ namespace Composer\Autoload;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
private $prefixes = array();
private $fallbackDirs = array();
// PSR-4
private $prefixLengthsPsr4 = array();
private $prefixDirsPsr4 = array();
private $fallbackDirsPsr4 = array();
// PSR-0
private $prefixesPsr0 = array();
private $fallbackDirsPsr0 = array();
private $useIncludePath = false;
private $classMap = array();
private $classMapAuthoritative = false;
private $missingClasses = array();
private $apcuPrefix;
public function getPrefixes()
{
return call_user_func_array('array_merge', $this->prefixes);
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
}
return array();
}
public function getPrefixesPsr4()
{
return $this->prefixDirsPsr4;
}
public function getFallbackDirs()
{
return $this->fallbackDirs;
return $this->fallbackDirsPsr0;
}
public function getFallbackDirsPsr4()
{
return $this->fallbackDirsPsr4;
}
public function getClassMap()
@@ -75,23 +99,24 @@ class ClassLoader
}
/**
* Registers a set of classes, merging with any others previously set.
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
* @param string $prefix The classes prefix
* @param array|string $paths The location(s) of the classes
* @param bool $prepend Prepend the location(s)
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 root directories
* @param bool $prepend Whether to prepend the directories
*/
public function add($prefix, $paths, $prepend = false)
{
if (!$prefix) {
if ($prepend) {
$this->fallbackDirs = array_merge(
$this->fallbackDirsPsr0 = array_merge(
(array) $paths,
$this->fallbackDirs
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirs = array_merge(
$this->fallbackDirs,
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
(array) $paths
);
}
@@ -100,38 +125,109 @@ class ClassLoader
}
$first = $prefix[0];
if (!isset($this->prefixes[$first][$prefix])) {
$this->prefixes[$first][$prefix] = (array) $paths;
if (!isset($this->prefixesPsr0[$first][$prefix])) {
$this->prefixesPsr0[$first][$prefix] = (array) $paths;
return;
}
if ($prepend) {
$this->prefixes[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix] = array_merge(
(array) $paths,
$this->prefixes[$first][$prefix]
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixes[$first][$prefix] = array_merge(
$this->prefixes[$first][$prefix],
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
(array) $paths
);
}
}
/**
* Registers a set of classes, replacing any others previously set.
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The classes prefix
* @param array|string $paths The location(s) of the classes
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
(array) $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
(array) $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
// Register directories for a new namespace.
$length = strlen($prefix);
if ('\\' !== $prefix[$length - 1]) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
(array) $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 base directories
*/
public function set($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirs = (array) $paths;
return;
$this->fallbackDirsPsr0 = (array) $paths;
} else {
$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
}
}
/**
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*/
public function setPsr4($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr4 = (array) $paths;
} else {
$length = strlen($prefix);
if ('\\' !== $prefix[$length - 1]) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
}
$this->prefixes[substr($prefix, 0, 1)][$prefix] = (array) $paths;
}
/**
@@ -155,6 +251,47 @@ class ClassLoader
return $this->useIncludePath;
}
/**
* Turns off searching the prefix and fallback directories for classes
* that have not been registered with the class map.
*
* @param bool $classMapAuthoritative
*/
public function setClassMapAuthoritative($classMapAuthoritative)
{
$this->classMapAuthoritative = $classMapAuthoritative;
}
/**
* Should class lookup fail if not found in the current class map?
*
* @return bool
*/
public function isClassMapAuthoritative()
{
return $this->classMapAuthoritative;
}
/**
* APCu prefix to use to cache found/not-found classes, if the extension is enabled.
*
* @param string|null $apcuPrefix
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
}
/**
* The APCu prefix in use, or null if APCu caching is not enabled.
*
* @return string|null
*/
public function getApcuPrefix()
{
return $this->apcuPrefix;
}
/**
* Registers this instance as an autoloader.
*
@@ -182,7 +319,7 @@ class ClassLoader
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
include $file;
includeFile($file);
return true;
}
@@ -197,50 +334,112 @@ class ClassLoader
*/
public function findFile($class)
{
// work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
if ('\\' == $class[0]) {
$class = substr($class, 1);
}
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
$classPath = strtr(substr($class, 0, $pos), '\\', DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
$className = substr($class, $pos + 1);
} else {
// PEAR-like class name
$classPath = null;
$className = $class;
if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false;
}
if (null !== $this->apcuPrefix) {
$file = apcu_fetch($this->apcuPrefix.$class, $hit);
if ($hit) {
return $file;
}
}
$classPath .= strtr($className, '_', DIRECTORY_SEPARATOR) . '.php';
$file = $this->findFileWithExtension($class, '.php');
// Search for Hack files if we are running on HHVM
if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh');
}
if (null !== $this->apcuPrefix) {
apcu_add($this->apcuPrefix.$class, $file);
}
if (false === $file) {
// Remember that this class does not exist.
$this->missingClasses[$class] = true;
}
return $file;
}
private function findFileWithExtension($class, $ext)
{
// PSR-4 lookup
$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
$first = $class[0];
if (isset($this->prefixes[$first])) {
foreach ($this->prefixes[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
return $dir . DIRECTORY_SEPARATOR . $classPath;
if (isset($this->prefixLengthsPsr4[$first])) {
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
if (file_exists($file = $dir . $pathEnd)) {
return $file;
}
}
}
}
}
foreach ($this->fallbackDirs as $dir) {
if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
return $dir . DIRECTORY_SEPARATOR . $classPath;
// PSR-4 fallback dirs
foreach ($this->fallbackDirsPsr4 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
return $file;
}
}
if ($this->useIncludePath && $file = stream_resolve_include_path($classPath)) {
// PSR-0 lookup
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
} else {
// PEAR-like class name
$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
}
if (isset($this->prefixesPsr0[$first])) {
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
}
}
}
// PSR-0 fallback dirs
foreach ($this->fallbackDirsPsr0 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
// PSR-0 include paths.
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
return $this->classMap[$class] = false;
return false;
}
}
/**
* Scope isolated include.
*
* Prevents access to $this/self from included files.
*/
function includeFile($file)
{
include $file;
}

File diff suppressed because it is too large Load Diff

View File

@@ -6,7 +6,11 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
$vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
$vendorDir . '/ircmaxell/password-compat/lib/password.php',
$vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
);
'7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
'2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
'58571171fd5812e6e447dce228f52f4d' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
);

View File

@@ -23,26 +23,48 @@ class ComposerAutoloaderInit7389a4d4b2c7fcdb9cbed4794746f4b3
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit7389a4d4b2c7fcdb9cbed4794746f4b3', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
$loader->set($namespace, $path);
}
call_user_func(\Composer\Autoload\ComposerStaticInit7389a4d4b2c7fcdb9cbed4794746f4b3::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
$loader->set($namespace, $path);
}
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
$map = require __DIR__ . '/autoload_psr4.php';
foreach ($map as $namespace => $path) {
$loader->setPsr4($namespace, $path);
}
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
}
}
$loader->register(true);
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
require $file;
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit7389a4d4b2c7fcdb9cbed4794746f4b3::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire7389a4d4b2c7fcdb9cbed4794746f4b3($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire7389a4d4b2c7fcdb9cbed4794746f4b3($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -13,7 +13,7 @@ class Collection extends BaseCollection {
*/
public function find($key, $default = null)
{
return array_first($this->items, function($key, $model) use ($key)
return array_first($this->items, function($key, $model)
{
return $model->getKey() == $key;

View File

@@ -51,7 +51,7 @@ class Encrypter {
*/
public function encrypt($value)
{
$iv = mcrypt_create_iv($this->getIvSize(), $this->getRandomizer());
$iv = @mcrypt_create_iv($this->getIvSize(), $this->getRandomizer());
$value = base64_encode($this->padAndMcrypt($value, $iv));
@@ -74,7 +74,7 @@ class Encrypter {
{
$value = $this->addPadding(serialize($value));
return mcrypt_encrypt($this->cipher, $this->key, $value, $this->mode, $iv);
return @mcrypt_encrypt($this->cipher, $this->key, $value, $this->mode, $iv);
}
/**
@@ -106,7 +106,7 @@ class Encrypter {
*/
protected function mcryptDecrypt($value, $iv)
{
return mcrypt_decrypt($this->cipher, $this->key, $value, $this->mode, $iv);
return @mcrypt_decrypt($this->cipher, $this->key, $value, $this->mode, $iv);
}
/**
@@ -216,7 +216,7 @@ class Encrypter {
*/
protected function getIvSize()
{
return mcrypt_get_iv_size($this->cipher, $this->mode);
return @mcrypt_get_iv_size($this->cipher, $this->mode);
}
/**
@@ -268,4 +268,4 @@ class Encrypter {
$this->mode = $mode;
}
}
}

View File

@@ -585,8 +585,9 @@ class Carbon extends DateTime
*
* @return self
*/
public function setTime($hour, $minute, $second = 0)
public function setTime($hour, $minute, $second = NULL, $microseconds = NULL)
{
if(is_null($second)) $second = 0;
return $this->hour($hour)->minute($minute)->second($second);
}