Merge pull request #265 from nextcloud/enh/noid/adjust-21

adjustments for 21
nextcloud · Jan 29, 2021 · c0844ad · c0844ad
2 parents e6e89e2 + 741b5f3
commit c0844ad
Show file tree

Hide file tree

Showing 13 changed files with 2,123 additions and 622 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -15,26 +15,26 @@ steps:
       # Code checker
       - ./occ app:check-code $APP_NAME -c strong-comparison
       - ./occ app:check-code $APP_NAME -c deprecation
-  - name: syntax-php7.2
-    image: nextcloudci/php7.2:php7.2-14
+  - name: syntax-php7.3
+    image: nextcloudci/php7.3:php7.3-5
     environment:
       APP_NAME: ldap_write_support
       CORE_BRANCH: stable20
       DB: sqlite
     commands:
       - composer install
       - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-  - name: syntax-php7.3
-    image: nextcloudci/php7.3:php7.3-5
+  - name: syntax-php7.4
+    image: nextcloudci/php7.4:php7.4-2
     environment:
       APP_NAME: ldap_write_support
       CORE_BRANCH: master
       DB: sqlite
     commands:
       - composer install
       - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-  - name: syntax-php7.4
-    image: nextcloudci/php7.4:php7.4-2
+  - name: syntax-php8.0
+    image: nextcloudci/php8.0:latest
     environment:
       APP_NAME: ldap_write_support
       CORE_BRANCH: master
@@ -134,87 +134,87 @@ trigger:
     - pull_request
     - push
 type: docker
----
-kind: pipeline
-name: integration-stable20
-steps:
-  - name: integration
-    image: nextcloudci/php7.3:php7.3-5
-    environment:
-      APP_NAME: ldap_write_support
-      CORE_BRANCH: stable20
-      DB: sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ config:system:set redis host --value=cache
-      - php occ config:system:set redis port --value=6379 --type=integer
-      - php occ config:system:set redis timeout --value=0 --type=integer
-      - php occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
-      - php occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
-      - php occ app:enable user_ldap
-      - php occ app:enable $APP_NAME
-      - cd apps/$APP_NAME
-      - cd tests/integration
-      - ./run.sh
-
-services:
-  - name: cache
-    image: redis
-  - name: openldap
-    image: nextcloudci/openldap:openldap-7
-    environment:
-      SLAPD_DOMAIN: nextcloud.ci
-      SLAPD_ORGANIZATION: Nextcloud
-      SLAPD_PASSWORD: admin
-      SLAPD_ADDITIONAL_MODULES: memberof
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-type: docker
-
----
-kind: pipeline
-name: integration-stable20-nocache
-steps:
-  - name: integration
-    image: nextcloudci/php7.3:php7.3-5
-    environment:
-      APP_NAME: ldap_write_support
-      CORE_BRANCH: stable20
-      DB: sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ app:enable user_ldap
-      - php occ app:enable $APP_NAME
-      - cd apps/$APP_NAME
-      - cd tests/integration
-      - ./run.sh
-
-services:
-  - name: openldap
-    image: nextcloudci/openldap:openldap-7
-    environment:
-      SLAPD_DOMAIN: nextcloud.ci
-      SLAPD_ORGANIZATION: Nextcloud
-      SLAPD_PASSWORD: admin
-      SLAPD_ADDITIONAL_MODULES: memberof
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-type: docker
+#---
+#kind: pipeline
+#name: integration-stable21
+#steps:
+#  - name: integration
+#    image: nextcloudci/php7.3:php7.3-5
+#    environment:
+#      APP_NAME: ldap_write_support
+#      CORE_BRANCH: stable20
+#      DB: sqlite
+#    commands:
+#      # Pre-setup steps
+#      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+#      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+#      - cd ../server/
+#      - php occ config:system:set redis host --value=cache
+#      - php occ config:system:set redis port --value=6379 --type=integer
+#      - php occ config:system:set redis timeout --value=0 --type=integer
+#      - php occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
+#      - php occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
+#      - php occ app:enable user_ldap
+#      - php occ app:enable $APP_NAME
+#      - cd apps/$APP_NAME
+#      - cd tests/integration
+#      - ./run.sh
+#
+#services:
+#  - name: cache
+#    image: redis
+#  - name: openldap
+#    image: nextcloudci/openldap:openldap-7
+#    environment:
+#      SLAPD_DOMAIN: nextcloud.ci
+#      SLAPD_ORGANIZATION: Nextcloud
+#      SLAPD_PASSWORD: admin
+#      SLAPD_ADDITIONAL_MODULES: memberof
+#
+#trigger:
+#  branch:
+#    - master
+#    - stable*
+#  event:
+#    - pull_request
+#    - push
+#type: docker
+#
+#---
+#kind: pipeline
+#name: integration-stable20-nocache
+#steps:
+#  - name: integration
+#    image: nextcloudci/php7.3:php7.3-5
+#    environment:
+#      APP_NAME: ldap_write_support
+#      CORE_BRANCH: stable20
+#      DB: sqlite
+#    commands:
+#      # Pre-setup steps
+#      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+#      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+#      - cd ../server/
+#      - php occ app:enable user_ldap
+#      - php occ app:enable $APP_NAME
+#      - cd apps/$APP_NAME
+#      - cd tests/integration
+#      - ./run.sh
+#
+#services:
+#  - name: openldap
+#    image: nextcloudci/openldap:openldap-7
+#    environment:
+#      SLAPD_DOMAIN: nextcloud.ci
+#      SLAPD_ORGANIZATION: Nextcloud
+#      SLAPD_PASSWORD: admin
+#      SLAPD_ADDITIONAL_MODULES: memberof
+#
+#trigger:
+#  branch:
+#    - master
+#    - stable*
+#  event:
+#    - pull_request
+#    - push
+#type: docker
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -11,7 +11,7 @@
 * auto generate a user id (optional)
 * and more behavioral switches
     ]]></description>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
     <licence>agpl</licence>
     <author mail="[email protected]" homepage="http://eita.org.br">Alan Freihof Tygel</author>
     <author mail="[email protected]" homepage="https://arthur-schiwon.de">Arthur Schiwon</author>
@@ -24,7 +24,7 @@
     <screenshot>https://raw.githubusercontent.com/nextcloud/ldap_write_support/master/img/screenshots/settings.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/nextcloud/ldap_write_support/master/img/screenshots/users.png</screenshot>
     <dependencies>
-        <nextcloud min-version="20" max-version="21"/>
+        <nextcloud min-version="21" max-version="21"/>
     </dependencies>
     <commands>
         <command>OCA\LdapWriteSupport\Command\GroupAdminsToLdap</command>

diff --git a/composer.json b/composer.json
@@ -2,14 +2,13 @@
     "name": "nextcloud/ldap_write_support",
     "type": "project",
     "require-dev": {
-        "jakub-onderka/php-parallel-lint": "^1.0"
+        "php-parallel-lint/php-parallel-lint": "^1.2"
     },
     "license": "AGPLv3",
     "authors": [
         {
             "name": "Arthur Schiwon",
             "email": "[email protected]"
         }
-    ],
-    "require": {}
+    ]
 }
diff --git a/composer.lock b/composer.lock
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -4,8 +4,6 @@
 
 namespace OCA\LdapWriteSupport\AppInfo;
 
-use OCA\LdapWriteSupport\LDAPUserManager;
-use OCA\LdapWriteSupport\LDAPGroupManager;
 use OCA\LdapWriteSupport\Listener\UserBackendRegisteredListener;
 use OCA\LdapWriteSupport\Listener\GroupBackendRegisteredListener;
 use OCA\User_LDAP\Events\GroupBackendRegistered;
@@ -16,12 +14,6 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 
 class Application extends App implements IBootstrap {
-	/** @var LDAPUserManager */
-	protected $ldapUserManager;
-
-	/** @var LDAPGroupManager */
-	protected $ldapGroupManager;
-
 	public const APP_ID = 'ldap_write_support';
 
 	public function __construct(array $urlParams = []) {