-commit 4cd6e7f3bbcff7e2a1c5a39917176d28fa02911f
-Author: Ismaël Bouya <ismael.bouya@normalesup.org>
-Date: Sat Jun 16 11:40:00 2018 +0200
-
- Add ldap
-
diff --git a/.travis.yml b/.travis.yml
-index 57b3aa53..3b7638eb 100644
+index 04cea258..56b1f576 100644
--- a/.travis.yml
+++ b/.travis.yml
-@@ -54,6 +54,7 @@ branches:
+@@ -58,6 +58,7 @@ install:
before_script:
- PHP=$TRAVIS_PHP_VERSION
+ # optional (default sets user as enabled unconditionally)
+ ldap_enabled_attribute: ~
diff --git a/app/config/security.yml b/app/config/security.yml
-index 796dc361..59f48626 100644
+index 02afc9ea..48fbb553 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -6,6 +6,7 @@ security:
pattern: ^/
form_login:
diff --git a/composer.json b/composer.json
-index dca274ed..f115d229 100644
+index 68cfad05..32a3d1a4 100644
--- a/composer.json
+++ b/composer.json
-@@ -87,6 +87,9 @@
+@@ -85,7 +85,11 @@
+ "friendsofsymfony/jsrouting-bundle": "^1.6.3",
+ "bdunogier/guzzle-site-authenticator": "^1.0.0",
"defuse/php-encryption": "^2.1",
- "html2text/html2text": "^4.1"
- },
+- "html2text/html2text": "^4.1"
++ "html2text/html2text": "^4.1",
++ "fr3d/ldap-bundle": "^3.0"
++ },
+ "suggest": {
+ "fr3d/ldap-bundle": "If you want to authenticate via LDAP"
-+ },
+ },
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "~2.2",
- "doctrine/data-fixtures": "~1.1",
+diff --git a/composer.lock b/composer.lock
+index 251ee081..37795e0b 100644
+--- a/composer.lock
++++ b/composer.lock
+@@ -4,7 +4,7 @@
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+ "This file is @generated automatically"
+ ],
+- "content-hash": "d2a0bd8408dccdeb7a7455996519829b",
++ "content-hash": "4699d166d03a8e5f70d802d0bc3e6a20",
+ "packages": [
+ {
+ "name": "bdunogier/guzzle-site-authenticator",
+@@ -1346,6 +1346,65 @@
+ ],
+ "time": "2018-12-14T19:44:53+00:00"
+ },
++ {
++ "name": "fr3d/ldap-bundle",
++ "version": "v3.0.0",
++ "source": {
++ "type": "git",
++ "url": "https://github.com/Maks3w/FR3DLdapBundle.git",
++ "reference": "5a8927c11af45fa06331b97221c6da1a4a237475"
++ },
++ "dist": {
++ "type": "zip",
++ "url": "https://api.github.com/repos/Maks3w/FR3DLdapBundle/zipball/5a8927c11af45fa06331b97221c6da1a4a237475",
++ "reference": "5a8927c11af45fa06331b97221c6da1a4a237475",
++ "shasum": ""
++ },
++ "require": {
++ "php": ">=5.5",
++ "psr/log": "~1.0",
++ "symfony/config": "2.3 - 3",
++ "symfony/dependency-injection": "2.3 - 3",
++ "symfony/polyfill-php56": "^1.1",
++ "symfony/security": "2.3 - 3",
++ "symfony/security-bundle": "2.3 - 3",
++ "zendframework/zend-ldap": "2.5 - 3"
++ },
++ "require-dev": {
++ "fabpot/php-cs-fixer": "1.11.*",
++ "fr3d/psr3-message-assertions": "0.1.*",
++ "friendsofsymfony/user-bundle": "~1.3",
++ "maks3w/phpunit-methods-trait": "^4.6",
++ "phpunit/phpunit": "^4.6",
++ "symfony/validator": "2.3 - 3"
++ },
++ "suggest": {
++ "friendsofsymfony/user-bundle": "Integrate authentication and management for DB users, useful for unmanned LDAP servers",
++ "symfony/validator": "Allow pre-validate for existing users before register new ones"
++ },
++ "type": "symfony-bundle",
++ "autoload": {
++ "psr-4": {
++ "FR3D\\LdapBundle\\": ""
++ }
++ },
++ "notification-url": "https://packagist.org/downloads/",
++ "license": [
++ "MIT"
++ ],
++ "authors": [
++ {
++ "name": "Maks3w"
++ }
++ ],
++ "description": "This package provide users and authentication services based on LDAP directories for Symfony2 framework",
++ "homepage": "https://github.com/Maks3w/FR3DLdapBundle",
++ "keywords": [
++ "Authentication",
++ "ldap"
++ ],
++ "time": "2016-02-12T17:45:14+00:00"
++ },
+ {
+ "name": "friendsofsymfony/jsrouting-bundle",
+ "version": "1.6.3",
+@@ -7027,6 +7086,59 @@
+ "zf2"
+ ],
+ "time": "2018-04-25T15:33:34+00:00"
++ },
++ {
++ "name": "zendframework/zend-ldap",
++ "version": "2.10.0",
++ "source": {
++ "type": "git",
++ "url": "https://github.com/zendframework/zend-ldap.git",
++ "reference": "b63c7884a08d3a6bda60ebcf7d6238cf8ad89f49"
++ },
++ "dist": {
++ "type": "zip",
++ "url": "https://api.github.com/repos/zendframework/zend-ldap/zipball/b63c7884a08d3a6bda60ebcf7d6238cf8ad89f49",
++ "reference": "b63c7884a08d3a6bda60ebcf7d6238cf8ad89f49",
++ "shasum": ""
++ },
++ "require": {
++ "ext-ldap": "*",
++ "php": "^5.6 || ^7.0"
++ },
++ "require-dev": {
++ "php-mock/php-mock-phpunit": "^1.1.2 || ^2.1.1",
++ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
++ "zendframework/zend-coding-standard": "~1.0.0",
++ "zendframework/zend-config": "^2.5",
++ "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
++ "zendframework/zend-stdlib": "^2.7 || ^3.0"
++ },
++ "suggest": {
++ "zendframework/zend-eventmanager": "Zend\\EventManager component"
++ },
++ "type": "library",
++ "extra": {
++ "branch-alias": {
++ "dev-master": "2.10.x-dev",
++ "dev-develop": "2.11.x-dev"
++ }
++ },
++ "autoload": {
++ "psr-4": {
++ "Zend\\Ldap\\": "src/"
++ }
++ },
++ "notification-url": "https://packagist.org/downloads/",
++ "license": [
++ "BSD-3-Clause"
++ ],
++ "description": "Provides support for LDAP operations including but not limited to binding, searching and modifying entries in an LDAP directory",
++ "keywords": [
++ "ZendFramework",
++ "ldap",
++ "zf"
++ ],
++ "time": "2018-07-05T05:05:12+00:00"
+ }
+ ],
+ "packages-dev": [
+@@ -7561,12 +7673,12 @@
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/phpunit-bridge.git",
+- "reference": "5dab0d4b2ac99ab22b447b615fdfdc10ec4af3d5"
++ "reference": "d61ec438634e0f234c6bda1c6ee97016bbb0e7a1"
+ },
+ "dist": {
+ "type": "zip",
+- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/5dab0d4b2ac99ab22b447b615fdfdc10ec4af3d5",
+- "reference": "5dab0d4b2ac99ab22b447b615fdfdc10ec4af3d5",
++ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d61ec438634e0f234c6bda1c6ee97016bbb0e7a1",
++ "reference": "d61ec438634e0f234c6bda1c6ee97016bbb0e7a1",
+ "shasum": ""
+ },
+ "require": {
+@@ -7619,7 +7731,7 @@
+ ],
+ "description": "Symfony PHPUnit Bridge",
+ "homepage": "https://symfony.com",
+- "time": "2019-01-01T13:45:19+00:00"
++ "time": "2019-01-16T13:27:11+00:00"
+ },
+ {
+ "name": "symfony/polyfill-php72",
diff --git a/scripts/install.sh b/scripts/install.sh
-index 62a46f4f..5ea3933c 100644
+index 8b7ea03f..3a4a33ab 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
-@@ -12,5 +12,8 @@ ENV=$1
+@@ -26,5 +26,8 @@ ENV=$1
TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
git checkout $TAG
SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=$ENV
diff --git a/scripts/update.sh b/scripts/update.sh
-index d0598135..753ccbc3 100644
+index c62d104a..6259a431 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
-@@ -18,6 +18,9 @@ git fetch origin
+@@ -32,6 +32,9 @@ git fetch origin
git fetch --tags
TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
git checkout $TAG --force
projects / perso / Immae / Config / Nix.git / blobdiff