Skip to content

L
laravel-mongodb
Commit 76675fd7 authored by duxet's avatar duxet
Browse files
Options

Make getQualifiedParentKeyName() public (needed by L5)

parent 27055397
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 88 deletions
composer.lock
View file @ 76675fd7
......@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "2456aaae0dc07e3bdfdb1cc4bd227e1b",
"hash": "0341d4649965c1c506a86d7a3ec12657",
"packages": [
{
"name": "classpreloader/classpreloader",
......@@ -254,16 +254,16 @@
},
{
"name": "jeremeamia/SuperClosure",
"version": "1.0.1",
"version": "1.0.x-dev",
"source": {
"type": "git",
"url": "https://github.com/jeremeamia/super_closure.git",
"reference": "d05400085f7d4ae6f20ba30d36550836c0d061e8"
"reference": "4d89ca74994feab128ea46d5b3add92e6cb84554"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/d05400085f7d4ae6f20ba30d36550836c0d061e8",
"reference": "d05400085f7d4ae6f20ba30d36550836c0d061e8",
"url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/4d89ca74994feab128ea46d5b3add92e6cb84554",
"reference": "4d89ca74994feab128ea46d5b3add92e6cb84554",
"shasum": ""
},
"require": {
......@@ -298,7 +298,7 @@
"serialize",
"tokenizer"
],
"time": "2013-10-09 04:20:00"
"time": "2015-01-10 01:09:28"
},
{
"name": "laravel/framework",
......@@ -306,12 +306,12 @@
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "9297ad762f2db3744db7ed7588dae844a282277f"
"reference": "638806a6efaa37b2470133d3be1e8d6945d859ca"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/9297ad762f2db3744db7ed7588dae844a282277f",
"reference": "9297ad762f2db3744db7ed7588dae844a282277f",
"url": "https://api.github.com/repos/laravel/framework/zipball/638806a6efaa37b2470133d3be1e8d6945d859ca",
"reference": "638806a6efaa37b2470133d3be1e8d6945d859ca",
"shasum": ""
},
"require": {
......@@ -376,6 +376,8 @@
"require-dev": {
"aws/aws-sdk-php": "~2.7",
"iron-io/iron_mq": "~1.5",
"league/flysystem-aws-s3-v2": "~1.0",
"league/flysystem-rackspace": "~1.0",
"mockery/mockery": "~0.9",
"pda/pheanstalk": "~3.0",
"phpunit/phpunit": "~4.0"
......@@ -417,7 +419,7 @@
"framework",
"laravel"
],
"time": "2015-01-09 21:44:31"
"time": "2015-01-23 14:49:33"
},
{
"name": "league/flysystem",
......@@ -425,51 +427,46 @@
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "59a5e264a89173e48c08674d15916d47a347f5b3"
"reference": "efa1d394bb45b0984a863854c608c607b9c2a9a4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/59a5e264a89173e48c08674d15916d47a347f5b3",
"reference": "59a5e264a89173e48c08674d15916d47a347f5b3",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/efa1d394bb45b0984a863854c608c607b9c2a9a4",
"reference": "efa1d394bb45b0984a863854c608c607b9c2a9a4",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"aws/aws-sdk-php": "~2.4",
"barracuda/copy": "~1.1.4",
"dropbox/dropbox-sdk": "~1.1.1",
"ext-fileinfo": "*",
"league/event": "~1.0",
"league/phpunit-coverage-listener": "~1.1",
"mockery/mockery": "~0.9",
"phpseclib/phpseclib": "~0.3.5",
"phpspec/phpspec": "~2.0.0",
"phpspec/prophecy-phpunit": "~1.0",
"phpunit/phpunit": "~4.0",
"predis/predis": "~1.0",
"rackspace/php-opencloud": "~1.11",
"tedivm/stash": "~0.12.0"
},
"suggest": {
"aws/aws-sdk-php": "Allows you to use AWS S3 storage",
"barracuda/copy": "Allows you to use Copy.com storage",
"dropbox/dropbox-sdk": "Allows you to use Dropbox storage",
"ext-fileinfo": "Required for MimeType",
"guzzlehttp/guzzle": "Allows you to use http files (reading only)",
"league/event": "Required for EventableFilesystem",
"league/flysystem-aws-s3-v2": "Use S3 storage with AWS SDK v2",
"league/flysystem-aws-s3-v3": "Use S3 storage with AWS SDK v3",
"league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
"league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
"league/flysystem-copy": "Allows you to use Copy.com storage",
"league/flysystem-dropbox": "Use Dropbox storage",
"league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
"league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
"league/flysystem-sftp": "Allows SFTP server storage via phpseclib",
"league/flysystem-webdav": "Allows you to use WebDAV storage",
"phpseclib/phpseclib": "Allows SFTP server storage",
"predis/predis": "Allows you to use Predis for caching",
"rackspace/php-opencloud": "Allows you to use Rackspace Cloud Files",
"sabre/dav": "Enables WebDav support",
"tedivm/stash": "Allows you to use Stash as cache implementation"
"league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
"predis/predis": "Allows you to use Predis for caching"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1-dev"
}
},
"autoload": {
......@@ -505,7 +502,7 @@
"sftp",
"storage"
],
"time": "2015-01-11 12:08:24"
"time": "2015-01-23 09:43:34"
},
{
"name": "monolog/monolog",
......@@ -513,12 +510,12 @@
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "b18a6eff04b15184375a6875ef2aa54bc5a7c9f2"
"reference": "ba31b79fa540d68da0e9e3269c0f85c1756ff10a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/b18a6eff04b15184375a6875ef2aa54bc5a7c9f2",
"reference": "b18a6eff04b15184375a6875ef2aa54bc5a7c9f2",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/ba31b79fa540d68da0e9e3269c0f85c1756ff10a",
"reference": "ba31b79fa540d68da0e9e3269c0f85c1756ff10a",
"shasum": ""
},
"require": {
......@@ -577,25 +574,28 @@
"logging",
"psr-3"
],
"time": "2015-01-07 15:29:03"
"time": "2015-01-20 10:31:44"
},
{
"name": "mtdowling/cron-expression",
"version": "v1.0.3",
"version": "v1.0.4",
"source": {
"type": "git",
"url": "https://github.com/mtdowling/cron-expression.git",
"reference": "a47ac8d5ec15049013792401af5a4d13e3dbe7f6"
"reference": "fd92e883195e5dfa77720b1868cf084b08be4412"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/a47ac8d5ec15049013792401af5a4d13e3dbe7f6",
"reference": "a47ac8d5ec15049013792401af5a4d13e3dbe7f6",
"url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/fd92e883195e5dfa77720b1868cf084b08be4412",
"reference": "fd92e883195e5dfa77720b1868cf084b08be4412",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"require-dev": {
"phpunit/phpunit": "4.*"
},
"type": "library",
"autoload": {
"psr-0": {
......@@ -618,7 +618,7 @@
"cron",
"schedule"
],
"time": "2013-11-23 19:48:39"
"time": "2015-01-11 23:07:46"
},
{
"name": "nesbot/carbon",
......@@ -810,12 +810,12 @@
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "e29c7b692bae6610b137670d6749151fd6e41608"
"reference": "db95cfa68a8bc91d1c54f75c416f481c9a8bd100"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/e29c7b692bae6610b137670d6749151fd6e41608",
"reference": "e29c7b692bae6610b137670d6749151fd6e41608",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/db95cfa68a8bc91d1c54f75c416f481c9a8bd100",
"reference": "db95cfa68a8bc91d1c54f75c416f481c9a8bd100",
"shasum": ""
},
"require": {
......@@ -854,7 +854,7 @@
"mail",
"mailer"
],
"time": "2014-12-05 14:17:46"
"time": "2015-01-18 13:49:36"
},
{
"name": "symfony/console",
......@@ -863,12 +863,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
"reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476"
"reference": "c483805ec0189376fa7a8427a059c64fc7238944"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/6ac6491ff60c0e5a941db3ccdc75a07adbb61476",
"reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476",
"url": "https://api.github.com/repos/symfony/Console/zipball/c483805ec0189376fa7a8427a059c64fc7238944",
"reference": "c483805ec0189376fa7a8427a059c64fc7238944",
"shasum": ""
},
"require": {
......@@ -911,7 +911,7 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
"time": "2015-01-06 17:50:02"
"time": "2015-01-20 01:40:20"
},
{
"name": "symfony/debug",
......@@ -920,18 +920,21 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/Debug.git",
"reference": "7213c8200d60728c9d4c56d5830aa2d80ae3d25d"
"reference": "4e45617592b8f64857f81027de35972c1529b70f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Debug/zipball/7213c8200d60728c9d4c56d5830aa2d80ae3d25d",
"reference": "7213c8200d60728c9d4c56d5830aa2d80ae3d25d",
"url": "https://api.github.com/repos/symfony/Debug/zipball/4e45617592b8f64857f81027de35972c1529b70f",
"reference": "4e45617592b8f64857f81027de35972c1529b70f",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"psr/log": "~1.0"
},
"conflict": {
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
},
"require-dev": {
"symfony/class-loader": "~2.2",
"symfony/http-foundation": "~2.1",
......@@ -968,7 +971,7 @@
],
"description": "Symfony Debug Component",
"homepage": "http://symfony.com",
"time": "2015-01-05 17:41:06"
"time": "2015-01-16 14:55:47"
},
{
"name": "symfony/event-dispatcher",
......@@ -977,12 +980,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
"reference": "eab88ace7a54741087fe4e0c7acd737d1f6186bf"
"reference": "7a26717d431dfb092198d7c55f06788b2de5aaf7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/eab88ace7a54741087fe4e0c7acd737d1f6186bf",
"reference": "eab88ace7a54741087fe4e0c7acd737d1f6186bf",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7a26717d431dfb092198d7c55f06788b2de5aaf7",
"reference": "7a26717d431dfb092198d7c55f06788b2de5aaf7",
"shasum": ""
},
"require": {
......@@ -1026,7 +1029,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
"time": "2015-01-09 06:51:41"
"time": "2015-01-16 15:11:56"
},
{
"name": "symfony/filesystem",
......@@ -1129,12 +1132,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation.git",
"reference": "3f4ba2c658be910fe6cec46ed34ee900bd18bb01"
"reference": "30bd736e25a32e03ae865c0371ae53f4d0802159"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/3f4ba2c658be910fe6cec46ed34ee900bd18bb01",
"reference": "3f4ba2c658be910fe6cec46ed34ee900bd18bb01",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/30bd736e25a32e03ae865c0371ae53f4d0802159",
"reference": "30bd736e25a32e03ae865c0371ae53f4d0802159",
"shasum": ""
},
"require": {
......@@ -1173,7 +1176,7 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com",
"time": "2015-01-05 17:41:06"
"time": "2015-01-20 01:40:20"
},
{
"name": "symfony/http-kernel",
......@@ -1182,12 +1185,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel.git",
"reference": "276be2d1ba1c3327af255b3ec64abb9caaf84844"
"reference": "b5859161c4bf3c8bb624690c218c7b1f0ee9c875"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/276be2d1ba1c3327af255b3ec64abb9caaf84844",
"reference": "276be2d1ba1c3327af255b3ec64abb9caaf84844",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/b5859161c4bf3c8bb624690c218c7b1f0ee9c875",
"reference": "b5859161c4bf3c8bb624690c218c7b1f0ee9c875",
"shasum": ""
},
"require": {
......@@ -1250,7 +1253,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com",
"time": "2015-01-07 15:48:51"
"time": "2015-01-13 14:49:42"
},
{
"name": "symfony/process",
......@@ -1306,12 +1309,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing.git",
"reference": "28382c6806780ddc657c136a5ca4415dd3252f41"
"reference": "bda1c3c67f2a33bbeabb1d321feaf626a0ca5698"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Routing/zipball/28382c6806780ddc657c136a5ca4415dd3252f41",
"reference": "28382c6806780ddc657c136a5ca4415dd3252f41",
"url": "https://api.github.com/repos/symfony/Routing/zipball/bda1c3c67f2a33bbeabb1d321feaf626a0ca5698",
"reference": "bda1c3c67f2a33bbeabb1d321feaf626a0ca5698",
"shasum": ""
},
"require": {
......@@ -1365,7 +1368,7 @@
"uri",
"url"
],
"time": "2015-01-05 14:28:40"
"time": "2015-01-15 12:15:12"
},
{
"name": "symfony/security-core",
......@@ -1495,12 +1498,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "36af986811340fd4c1bc39cf848da388bbdd8473"
"reference": "b3bedb7547aa9930c0b06404042bcdc0327a34b9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/36af986811340fd4c1bc39cf848da388bbdd8473",
"reference": "36af986811340fd4c1bc39cf848da388bbdd8473",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/b3bedb7547aa9930c0b06404042bcdc0327a34b9",
"reference": "b3bedb7547aa9930c0b06404042bcdc0327a34b9",
"shasum": ""
},
"require": {
......@@ -1528,6 +1531,10 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
......@@ -1539,7 +1546,7 @@
"debug",
"dump"
],
"time": "2015-01-01 13:28:01"
"time": "2015-01-21 17:40:20"
},
{
"name": "vlucas/phpdotenv",
......@@ -1692,12 +1699,12 @@
"source": {
"type": "git",
"url": "https://github.com/padraic/mockery.git",
"reference": "ee277735d9dea95553ee667bee3292cdd6947574"
"reference": "cce38ee95d444190e8aac2d46c6d5e7b94ea44ef"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/padraic/mockery/zipball/ee277735d9dea95553ee667bee3292cdd6947574",
"reference": "ee277735d9dea95553ee667bee3292cdd6947574",
"url": "https://api.github.com/repos/padraic/mockery/zipball/cce38ee95d444190e8aac2d46c6d5e7b94ea44ef",
"reference": "cce38ee95d444190e8aac2d46c6d5e7b94ea44ef",
"shasum": ""
},
"require": {
......@@ -1726,7 +1733,7 @@
],
"authors": [
{
"name": "Padraic Brady",
"name": "Pádraic Brady",
"email": "padraic.brady@gmail.com",
"homepage": "http://blog.astrumfutura.com"
},
......@@ -1736,7 +1743,7 @@
"homepage": "http://davedevelopment.co.uk"
}
],
"description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succint API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
"description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
"homepage": "http://github.com/padraic/mockery",
"keywords": [
"BDD",
......@@ -1750,7 +1757,7 @@
"test double",
"testing"
],
"time": "2014-12-31 11:42:06"
"time": "2015-01-18 20:11:41"
},
{
"name": "orchestra/testbench",
......@@ -1758,12 +1765,12 @@
"source": {
"type": "git",
"url": "https://github.com/orchestral/testbench.git",
"reference": "45e456ee2534654afb056244265c50da3629afed"
"reference": "f568f98bbe66fc2823a5392a6862d60b25e242d9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/orchestral/testbench/zipball/45e456ee2534654afb056244265c50da3629afed",
"reference": "45e456ee2534654afb056244265c50da3629afed",
"url": "https://api.github.com/repos/orchestral/testbench/zipball/f568f98bbe66fc2823a5392a6862d60b25e242d9",
"reference": "f568f98bbe66fc2823a5392a6862d60b25e242d9",
"shasum": ""
},
"require": {
......@@ -1811,7 +1818,7 @@
"orchestral",
"testing"
],
"time": "2015-01-08 08:26:01"
"time": "2015-01-23 03:08:41"
},
{
"name": "satooshi/php-coveralls",
......@@ -1990,12 +1997,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
"reference": "c0eaf25074a2a8a5b94c54414a600d94b78fb7dc"
"reference": "ecc1e637a1839f37d83f3ead522112f12bedf204"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/c0eaf25074a2a8a5b94c54414a600d94b78fb7dc",
"reference": "c0eaf25074a2a8a5b94c54414a600d94b78fb7dc",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/ecc1e637a1839f37d83f3ead522112f12bedf204",
"reference": "ecc1e637a1839f37d83f3ead522112f12bedf204",
"shasum": ""
},
"require": {
......@@ -2028,7 +2035,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
"time": "2015-01-09 19:59:30"
"time": "2015-01-20 01:40:45"
}
],
"aliases": [],
......@@ -2037,7 +2044,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": ">=5.4.0",
"php": ">=5.5.0",
"ext-mongo": "*"
},
"platform-dev": []
......
src/Jenssegers/Mongodb/Relations/EmbedsOneOrMany.php
View file @ 76675fd7
......@@ -383,7 +383,7 @@ abstract class EmbedsOneOrMany extends Relation {
*
* @return string
*/
protected function getQualifiedParentKeyName()
public function getQualifiedParentKeyName()
{
if ($parentRelation = $this->getParentRelation())
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment