Skip to content

Fix validation when creating GeometryCollections #120

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.

Sign up for GitHub

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

Merged
grimzy merged 14 commits into from
Mar 8, 2020
Merged

Fix validation when creating GeometryCollections #120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6cb9154
Fixed validation when creating GeometryCollections
grimzy Mar 2, 2020
5f72bd1
Apply fixes from StyleCI
grimzy Mar 2, 2020
7d0e7f2
Fix versions after merging PR
grimzy Feb 29, 2020
52ba574
Merge remote-tracking branch 'origin/issue-95-point-collection-min-it…
grimzy Mar 2, 2020
472f5c1
Remove unneeded $minimumCollectionItems in MultiLineString type
grimzy Mar 3, 2020
7c431e6
Doc :book:
grimzy Mar 3, 2020
f1ca3e6
Oops :laughing:
grimzy Mar 3, 2020
2eb1c72
More Oops :laughing: :laughing: :laughing:
grimzy Mar 3, 2020
35f8031
Last Oops
grimzy Mar 3, 2020
2d3139d
Merge remote-tracking branch 'origin/master' into issue-95-point-coll…
grimzy Mar 8, 2020
881955c
Apply fixes from StyleCI
grimzy Mar 8, 2020
534dddc
Set $minimumCollectionItems to 0 for GeometryCollection and MultiPoly…
grimzy Mar 8, 2020
3c0afed
Merge remote-tracking branch 'origin/issue-95-point-collection-min-it…
grimzy Mar 8, 2020
acd15ea
Set same OR
grimzy Mar 8, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix versions after merging PR
  • Loading branch information
@grimzy
grimzy committed Mar 2, 2020
commit 7d0e7f29d43f03da82f11164196d2cda0db3338f
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
- docker

before_install:
- echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- sudo /etc/init.d/mysql stop
- make start_db V=$MYSQL_VERSION

Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
}
],
"require": {
"php": ">=5.5",
"php": ">=5.5.9",
"ext-pdo": "*",
"ext-json": "*",
"illuminate/database": "^5.2|^6.0",
"illuminate/database": "^5.2||^6.0",
"geo-io/wkb-parser": "^1.0",
"jmikola/geojson": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8||~5.7",
"mockery/mockery": "^0.9.9",
"laravel/laravel": "^5.2|^6.0",
"laravel/laravel": "^5.2||^6.0",
"doctrine/dbal": "^2.5",
"laravel/browser-kit-testing": "^2.0",
"php-coveralls/php-coveralls": "^2.0"
Expand Down