Skip to content
This repository was archived by the owner on Jun 28, 2021. It is now read-only.

Commit 5daea7a

Browse files
committed
Documentation done!
1 parent 0e81268 commit 5daea7a

File tree

12 files changed

+79
-426
lines changed

12 files changed

+79
-426
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ script:
2525
else
2626
./vendor/bin/phpunit -v --configuration ./tests/travis/$DB.travis.xml
2727
fi
28+
# Code shall respect rules
29+
- composer check-quality-code
2830

2931
after_script:
3032
- |
@@ -34,8 +36,6 @@ after_script:
3436
fi
3537
#Push code climate coverage
3638
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
37-
# Code should respect rules
38-
- composer check-quality-code
3939

4040
notifications:
4141
webhooks: https://coveralls.io/webhook?repo_token=$COVERALLS_WEBHOOK

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
All notable changes to this project will be documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
33
This project adheres to [Semantic Versioning](https://semver.org/).
44

5-
## [Unreleased]
6-
### Work in progress
7-
- New file to help contributors to pull request a new spatial function and test it.
5+
## [2.0.0-RC0] Release candidat - 2020-03-18
86

97
### Added
108
- A new documentation hosted on ReadTheDocs.
119
- Adding support of PHP7.2, PHP7.3, PHP7.4,
1210
- Needed PHP extension added in composer.json,
11+
- Spatial function implementing the ISO/IEC 13249-3:2016 or [OGC Standard](https://www.ogc.org/standards/sfs) are now stored in the [Standard](./lib/CrEOF/Spatial/ORM/Query/AST/Functions/Standard) directory.
12+
- Specific spatial function of the PostgreSql server are now store in the [PostgreSql](./lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql) directory.
13+
- Specific spatial function of the PostgreSql server are now store in the [MySql](./lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql) directory.
1314
- Code coverage is now really at 90 percent. (CreOf code coverage was not valid because of AST functions which contained only properties),
1415
- AST Functions updated to avoid misconfiguration (some properties was missing),
1516
- AST Functions updated to detect which function was not tested,

CONTRIBUTING.md

Lines changed: 0 additions & 87 deletions
This file was deleted.

README.md

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,57 +3,48 @@ Doctrine2 multi-platform support for spatial types and functions.
33
Currently MySQL and PostgreSQL with PostGIS are supported.
44
Could potentially add support for other platforms if an interest is expressed.
55

6+
## Current status
7+
[![Build Status](https://travis-ci.org/Alexandre-T/doctrine2-spatial.svg?branch=master)](https://travis-ci.org/Alexandre-T/doctrine2-spatial)
8+
[![Code Climate](https://codeclimate.com/github/Alexandre-T/doctrine2-spatial/badges/gpa.svg)](https://codeclimate.com/github/Alexandre-T/doctrine2-spatial)
9+
[![Coverage Status](https://coveralls.io/repos/Alexandre-T/doctrine2-spatial/badge.svg?branch=master&service=github)](https://coveralls.io/github/Alexandre-T/doctrine2-spatial?branch=master)
10+
[![Downloads](https://img.shields.io/packagist/dm/Alexandre-T/doctrine2-spatial.svg)](https://packagist.org/packages/Alexandre-T/doctrine2-spatial)
11+
[![Documentation Status](https://readthedocs.org/projects/doctrine2-spatial/badge/?version=latest)](https://doctrine2-spatial.readthedocs.io/en/latest/?badge=latest)
12+
13+
Documentation
14+
-------------
15+
16+
The [new documentation](https://doctrine2-spatial.readthedocs.io) explain how to:
17+
18+
* install this doctrine extension,
19+
* configure this extension,
20+
* create spatial entities,
21+
* use spatial functions into your repositories,
22+
* contribute (and test)
23+
24+
The documentation contains a glossary of all available types and all available spatial functions.
25+
626
## Project origins
727
This useful project was created by Derek J. Lambert.
828
Alexandre Tranchant forked it from [creof/doctrine2-spatial](https://github.com/creof/doctrine2-spatial)
9-
because project seems to be unactive since 2017.
29+
because project seems to be non-active since 2017.
1030

1131
The master release can be used, but be careful of backward incompatibility.
1232

1333
## Developments in progress
1434
This fork will upgrade this package to the last doctrine version and the [PHP supported versions](https://www.php.net/supported-versions.php).
1535
I would like to release the 2.0.0 version at the end of March.
1636

17-
The major update concerns the directories where functions are now stored.
18-
* Spatial function implementing the ISO/IEC 13249-3:2016 or [OGC Standard](https://www.ogc.org/standards/sfs) are now
19-
stored in the [Standard](./lib/CrEOF/Spatial/ORM/Query/AST/Functions/Standard) directory.
20-
* Specific spatial function of the PostgreSql server are now store in the
21-
[PostgreSql](./lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql) directory.
22-
* Specific spatial function of the PostgreSql server are now store in the
23-
[MySql](./lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql) directory.
24-
25-
## Current status
26-
[![Build Status](https://travis-ci.org/Alexandre-T/doctrine2-spatial.svg?branch=master)](https://travis-ci.org/Alexandre-T/doctrine2-spatial)
27-
[![Code Climate](https://codeclimate.com/github/Alexandre-T/doctrine2-spatial/badges/gpa.svg)](https://codeclimate.com/github/Alexandre-T/doctrine2-spatial)
28-
[![Coverage Status](https://coveralls.io/repos/Alexandre-T/doctrine2-spatial/badge.svg?branch=master&service=github)](https://coveralls.io/github/Alexandre-T/doctrine2-spatial?branch=master)
29-
[![Downloads](https://img.shields.io/packagist/dm/Alexandre-T/doctrine2-spatial.svg)](https://packagist.org/packages/Alexandre-T/doctrine2-spatial)
30-
31-
### Documentation
32-
33-
*Documentation is already improved, but I'm working on a new documentation using sphinx and hosted on [ReadTheDocs](https://www.readthedocs.io/)
34-
I will provide a lot of example, essentialy with a symfony project. Feel free to [contribute](./CONTRIBUTING.md)!*
35-
36-
Currently, the documentation is splitted into some files.
37-
1. the [core of documentation](./doc/index.md),
38-
2. the [needed installation steps](./doc/install.md),
39-
3. if your using symfony framework, the [configuration page](./doc/configuration.md) explains how to configure your
40-
symfony application, and how to configure the types and the spatial functions that you want to use in your application.
41-
Do not forget, that it is not optimal to declare every types and every functions if you do not need them.
42-
4. the [entity page](./doc/entity.md) describes how to create an ORM entity with spatial columns
43-
5. the standard, postgresql and mysql contains a description of some of the implementable method
4437

4538
Compatibility
4639
-------------
4740
### PHP
48-
This package to the last doctrine version and the [PHP supported versions](https://www.php.net/supported-versions.php).
41+
This doctrine extension is compatible with PHP 7.2, 7.3 and 7.4
42+
Security fixes will follow the [PHP Roadmap](https://www.php.net/supported-versions.php).
4943

5044
### Doctrine dev version
51-
This version should be used with the actual doctrine stable version: 2.7
52-
Continuous integration tests libraries does not implements the 2.8.x-dev version. It should change very soon.
53-
I try to be compatible with this version.
54-
55-
Continuous integration tests libraries with 2.8.x-dev version. We **DO NOT* try to be compatible with this version,
56-
currently. There is too much difference between interface declarations.
45+
This extension should be used with the actual doctrine stable version: 2.7
46+
Continuous integration tests libraries with 2.8.x-dev version. We **ONLY** try to stay compatible with this version,
47+
currently.
5748

5849
### MySQL 5.7 and 8.0
5950
A lot of functions change their names between this two versions. The [MySQL 5.7 deprecated functions](https://stackoverflow.com/questions/60377271/why-some-spatial-functions-does-not-exists-on-my-mysql-server)
@@ -62,7 +53,7 @@ are not implemented.
6253
### MariaDB 10
6354
This version is **NOT** compatible with MariaDB version. Some spatial functions seems to work but their results are
6455
different from MySQL version (StContains function is a good example). You can contribute, but I suggest to avoid
65-
MySql and MariaDb servers.
56+
MySql and MariaDb servers, because of [their shortcomings and vulnerabilities](https://sqlpro.developpez.com/tutoriel/dangers-mysql-mariadb/).
6657

6758
### PostgreSQL
6859
You should use PostgreSql server. This is a most powerful server and this is a "true" database server. It preserves data

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
"php-cs-fixer fix --dry-run --config=.php_cs.dist --allow-risky=yes -vvv",
3737
"phpcs --standard=phpcs.xml.dist -s",
3838
"phpmd lib text ./phpmd.lib.xml",
39-
"phpmd tests xml ./phpmd.test.xml --exclude OrmTestCase.php"
39+
"phpmd tests text ./phpmd.test.xml --exclude OrmTestCase.php"
4040
],
4141
"phpcs": "phpcs --standard=phpcs.xml.dist -s",
4242
"phpcsfixer": "php-cs-fixer --config=.php_cs.dist fix --allow-risky=yes -vvv",
4343
"phpmd": [
4444
"phpmd lib text ./phpmd.lib.xml",
45-
"phpmd tests xml ./phpmd.test.xml --exclude OrmTestCase.php"
45+
"phpmd tests text ./phpmd.test.xml --exclude OrmTestCase.php"
4646
],
4747
"test-mysql": "phpunit --configuration phpunit.mysql.xml",
4848
"test-pgsql": "phpunit --configuration phpunit.pgsql.xml"

doc/configuration.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

doc/entity.md

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)