Merge branch 'Zverik:master' into leaflet-1-dot-9

.github/workflows/ci.yml

@@ -31,4 +31,5 @@ jobs:
       - name: Run tests
         run: |
           composer validate
+          cp www/config.php.sample www/config.php
           ./vendor/bin/phpunit --display-warnings test/

.gitignore

@@ -1,5 +1,8 @@
 www/data/
 www/locale/
-locales/transifex_config
-
 /vendor/
+locales/transifex_config
+*.db
+*.db-*
+www/config.php
+*.swp

CHANGELOG.md

@@ -2,8 +2,10 @@
 
 ## master
 
-* Add `console_auth.php` for interacting with [pyLevel0](https://github.com/Zverik/pyLevel0).
 * Fixed user names with quotes.
+* OAuth2 support.
+* Data is now stored in a SQLite database instead of files.
+* Unit tests (thanks @mtmail).
 
 ## 1.2, 9.02.2016
 

README.md

@@ -6,10 +6,11 @@ This is a text-based in-browser editor for OSM data. See [its wiki page](http://
 
 You will need PHP with `mod_gettext`.
 
-* Copy all files from `www` to a document root directory.
-* Open [this link](http://www.openstreetmap.org/user/username/oauth_clients/new) and register your instance of Level0. It needs permissions for reading user details and modifying the map.
-* Edit `config.php`, inserting both OAuth keys.
-* Create `data` directory and give writing permissions for it to web server process. Check path in `config.php`.
+* Point your `DocumentRoot` to the `www` directory.
+* Run `composer install`.
+* Open [this link](https://www.openstreetmap.org/oauth2/applications/new) and register your instance of Level0. It needs permissions for reading user details and modifying the map.
+* Create `www/config.php` from `www/config.php.sample`, inserting both OAuth keys.
+* Create `data` directory and give writing permissions for it to web server process. Check path in `config.php`. Maybe you'll also need `httpd_sys_rw_content` SELinux tag.
 * Check path to document root in `locales/deploy_locales` and run it.
 
 You're set: download some data in the editor and login to OSM.
@@ -29,3 +30,5 @@ Run tests using `phpunit --display-warnings test/`
 ## License and authors
 
 Level0 is written by Ilya Zverev and published under WTFPL license.
+
+Thank you to [OpenCage](https://opencagedata.com/) for sponsoring work on Level0!

composer.json

@@ -2,8 +2,12 @@
     "name": "zverik/level0",
     "description": "Web-based OpenStreetMap Editor",
     "type": "project",
+    "require": {
+        "jbelien/oauth2-openstreetmap": "^0.1.2"
+    },
     "require-dev": {
-        "phpunit/phpunit": "^11.2"
+        "phpunit/phpunit": "^11.2",
+        "php-webdriver/webdriver": "^1.15"
     },
     "license": "WTFPL"
 }