Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest #4

Merged
merged 67 commits into from
Oct 11, 2019
Merged

Merge latest #4

merged 67 commits into from
Oct 11, 2019

Conversation

ScottSpittle
Copy link

FRX-179 - Update to latest remote

jenssegers and others added 30 commits June 18, 2018 09:45
Fix issue using query builder first() method (in case with usage outside the Laravel)
Updated model to be compatible with laravel/lumen 5.7.14
Replaced whereIn method retrieval for relations
The main solution is to solve the bugs encountered in using database alone
reassigned getDatabaseName method
Update originalIsEquivalent to work with Laravel 5.8
*   Update Dockerfile, add for methods setUp and tearDown return type hint in all tests, replace fire on dispatch

* Resolve error test with touch

* Use COMPOSER_VERSION in Dockerfile

* Add alias for composer

* Change parent method's names
Broken commit in laravel: laravel/framework@2ee1892

* Remove changes in .travis.yml

* Remove changes from Dockerfile

* Revert changes in docker-compose.yml

* Update image with mysql
Smolevich and others added 27 commits August 1, 2019 17:21
…ongodb#1795)

* Revert changes in Builder and Model for id keys, fix test for Queue

* Fix format in Model
…ongodb#1738)

* use env values from phpunit.xml, update database.php and queue.php

* Add .editorconfig

* Update QueueTest.php

* Update phpunit.xml.dist

* Use in casting instead intval
Co-Authored-By: Jens Segers <segers.jens@gmail.com>
EmbedsMany respect primaryKey on association
fix filtering with operator not like issue
Add hasIndex and dropIndexIfExists methods
@Flambe Flambe merged commit 2e5d6b9 into master Oct 11, 2019
@Flambe Flambe deleted the merge_latest branch October 11, 2019 13:26
ScottSpittle added a commit that referenced this pull request Oct 29, 2019
This reverts commit 2e5d6b9.

# Conflicts:
#	src/Jenssegers/Mongodb/Eloquent/Model.php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.