github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-13 23:53:42 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update to Laravel 5.1

Browse Source 
Eloquent `lists()` now returns a collection
This commit is contained in:
Toby Zerner 2015-08-12 13:24:11 +09:30
parent 5d8371935e
commit 8e860d452e
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/core/composer.json
View File

@ -9,11 +9,11 @@
], ],
"require": { "require": {
"php": ">=5.4.0", "php": ">=5.4.0",
"illuminate/support": "5.0.*", "illuminate/support": "5.1.*",
"tobscure/json-api": "^0.1.1", "tobscure/json-api": "^0.1.1",
"oyejorge/less.php": "~1.5", "oyejorge/less.php": "~1.5",
"intervention/image": "^2.3.0", "intervention/image": "^2.3.0",
"s9e/text-formatter": "dev-release/php5.3", "s9e/text-formatter": "dev-release/php5.3@dev",
"psr/http-message": "^1.0", "psr/http-message": "^1.0",
"zendframework/zend-diactoros": "^1.1", "zendframework/zend-diactoros": "^1.1",
"nikic/fast-route": "^0.6", "nikic/fast-route": "^0.6",
@ -28,6 +28,5 @@
"psr-4": { "psr-4": {
"Flarum\\": "src/" "Flarum\\": "src/"
} }
}, }
"minimum-stability": "stable"
} }

34
framework/core/composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://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#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "6570cb23f32b6f8ecef5911d9b6cc2dc", "hash": "bffd49c3f2b15cb68bf47422d850f867",
"packages": [ "packages": [
{ {
"name": "danielstjules/stringy", "name": "danielstjules/stringy",
@ -241,25 +241,25 @@
}, },
{ {
"name": "illuminate/contracts", "name": "illuminate/contracts",
"version": "v5.0.33", "version": "v5.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/contracts.git", "url": "https://github.com/illuminate/contracts.git",
"reference": "b8b11d78724a6f8a62be3b1dfa20fa372f861398" "reference": "140dd18acb6be297fbd9870f8dda9d9d0a17c460"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/b8b11d78724a6f8a62be3b1dfa20fa372f861398", "url": "https://api.github.com/repos/illuminate/contracts/zipball/140dd18acb6be297fbd9870f8dda9d9d0a17c460",
"reference": "b8b11d78724a6f8a62be3b1dfa20fa372f861398", "reference": "140dd18acb6be297fbd9870f8dda9d9d0a17c460",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.4.0" "php": ">=5.5.9"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "5.0-dev" "dev-master": "5.1-dev"
} }
}, },
"autoload": { "autoload": {
@ -279,37 +279,37 @@
], ],
"description": "The Illuminate Contracts package.", "description": "The Illuminate Contracts package.",
"homepage": "http://laravel.com", "homepage": "http://laravel.com",
"time": "2015-05-15 07:22:28" "time": "2015-07-14 01:36:14"
}, },
{ {
"name": "illuminate/support", "name": "illuminate/support",
"version": "v5.0.33", "version": "v5.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/support.git", "url": "https://github.com/illuminate/support.git",
"reference": "32a12f97029b624fc0f9454e7ca69eaafef49c5d" "reference": "2ba8a22a554aee9a412baa2e16e4387262d6d57c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/32a12f97029b624fc0f9454e7ca69eaafef49c5d", "url": "https://api.github.com/repos/illuminate/support/zipball/2ba8a22a554aee9a412baa2e16e4387262d6d57c",
"reference": "32a12f97029b624fc0f9454e7ca69eaafef49c5d", "reference": "2ba8a22a554aee9a412baa2e16e4387262d6d57c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"danielstjules/stringy": "~1.8", "danielstjules/stringy": "~1.8",
"doctrine/inflector": "~1.0", "doctrine/inflector": "~1.0",
"ext-mbstring": "*", "ext-mbstring": "*",
"illuminate/contracts": "5.0.*", "illuminate/contracts": "5.1.*",
"php": ">=5.4.0" "php": ">=5.5.9"
}, },
"suggest": { "suggest": {
"jeremeamia/superclosure": "Required to be able to serialize closures (~2.0).", "jeremeamia/superclosure": "Required to be able to serialize closures (~2.0).",
"symfony/var-dumper": "Required to use the dd function (2.6.*)." "symfony/var-dumper": "Required to use the dd function (2.7.*)."
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "5.0-dev" "dev-master": "5.1-dev"
} }
}, },
"autoload": { "autoload": {
@ -332,7 +332,7 @@
], ],
"description": "The Illuminate Support package.", "description": "The Illuminate Support package.",
"homepage": "http://laravel.com", "homepage": "http://laravel.com",
"time": "2015-06-04 12:15:51" "time": "2015-07-20 16:31:36"
}, },
{ {
"name": "intervention/image", "name": "intervention/image",

2
framework/core/src/Core/Posts/PostRepository.php
View File

@ -70,7 +70,7 @@ class PostRepository
$query->orderBy($field, $order); $query->orderBy($field, $order);
} }
$ids = $query->lists('id'); $ids = $query->lists('id')->all();
return $this->findByIds($ids, $actor); return $this->findByIds($ids, $actor);
} }