nextcloud / server

apps/user_ldap/tests/WizardTest.php

Indentation +400 added lines, -400 removed lines

@@ -23,404 +23,404 @@
  * @package OCA\User_LDAP\Tests
  */
 class WizardTest extends TestCase {
-	protected function setUp(): void {
-		parent::setUp();
-		//we need to make sure the consts are defined, otherwise tests will fail
-		//on systems without php5_ldap
-		$ldapConsts = ['LDAP_OPT_PROTOCOL_VERSION',
-			'LDAP_OPT_REFERRALS', 'LDAP_OPT_NETWORK_TIMEOUT'];
-		foreach ($ldapConsts as $const) {
-			if (!defined($const)) {
-				define($const, 42);
-			}
-		}
-	}
-
-	private function getWizardAndMocks(): array {
-		static $confMethods;
-
-		if (is_null($confMethods)) {
-			$confMethods = get_class_methods('\OCA\User_LDAP\Configuration');
-		}
-		/** @var ILDAPWrapper&MockObject $lw */
-		$lw = $this->createMock(ILDAPWrapper::class);
-
-		/** @var Configuration&MockObject $conf */
-		$conf = $this->getMockBuilder(Configuration::class)
-			->onlyMethods($confMethods)
-			->setConstructorArgs(['', true])
-			->getMock();
-
-		/** @var Access&MockObject $access */
-		$access = $this->createMock(Access::class);
-
-		return [new Wizard($conf, $lw, $access), $conf, $lw, $access];
-	}
-
-	private function prepareLdapWrapperForConnections(MockObject $ldap) {
-		$ldap->expects($this->once())
-			->method('connect')
-			//dummy value
-			->willReturn(ldap_connect('ldap://example.com'));
-
-		$ldap->expects($this->exactly(3))
-			->method('setOption')
-			->willReturn(true);
-
-		$ldap->expects($this->once())
-			->method('bind')
-			->willReturn(true);
-	}
-
-	public function testCumulativeSearchOnAttributeLimited(): void {
-		[$wizard, $configuration, $ldap] = $this->getWizardAndMocks();
-
-		$configuration->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'ldapBase') {
-					return ['base'];
-				}
-				return null;
-			});
-
-		$this->prepareLdapWrapperForConnections($ldap);
-
-		$ldap->expects($this->any())
-			->method('isResource')
-			->willReturn(true);
-
-		$ldap->expects($this->exactly(2))
-			->method('search')
-			//dummy value, usually invalid
-			->willReturn(true);
-
-		$ldap->expects($this->exactly(2))
-			->method('countEntries')
-			//an is_resource check will follow, so we need to return a dummy resource
-			->willReturn(23);
-
-		//5 DNs per filter means 2x firstEntry and 8x nextEntry
-		$ldap->expects($this->exactly(2))
-			->method('firstEntry')
-			//dummy value, usually invalid
-			->willReturn(true);
-
-		$ldap->expects($this->exactly(8))
-			->method('nextEntry')
-			//dummy value, usually invalid
-			->willReturn(true);
-
-		$ldap->expects($this->exactly(10))
-			->method('getAttributes')
-			//dummy value, usually invalid
-			->willReturn(['cn' => ['foo'], 'count' => 1]);
-
-		global $uidnumber;
-		$uidnumber = 1;
-		$ldap->expects($this->exactly(10))
-			->method('getDN')
-			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $b) {
-				global $uidnumber;
-				return $uidnumber++;
-			});
-
-		// The following expectations are the real test
-		$filters = ['f1', 'f2', '*'];
-		$wizard->cumulativeSearchOnAttribute($filters, 'cn', 5);
-		unset($uidnumber);
-	}
-
-	public function testCumulativeSearchOnAttributeUnlimited(): void {
-		[$wizard, $configuration, $ldap] = $this->getWizardAndMocks();
-
-		$configuration->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'ldapBase') {
-					return ['base'];
-				}
-				return null;
-			});
-
-		$this->prepareLdapWrapperForConnections($ldap);
-
-		$ldap->expects($this->any())
-			->method('isResource')
-			->willReturnCallback(function ($r) {
-				if ($r instanceof \LDAP\Connection) {
-					return true;
-				}
-				if ($r % 24 === 0) {
-					global $uidnumber;
-					$uidnumber++;
-					return false;
-				}
-				return true;
-			});
-
-		$ldap->expects($this->exactly(2))
-			->method('search')
-			//dummy value, usually invalid
-			->willReturn(true);
-
-		$ldap->expects($this->exactly(2))
-			->method('countEntries')
-			//an is_resource check will follow, so we need to return a dummy resource
-			->willReturn(23);
-
-		//5 DNs per filter means 2x firstEntry and 8x nextEntry
-		$ldap->expects($this->exactly(2))
-			->method('firstEntry')
-			//dummy value, usually invalid
-			->willReturnCallback(function ($r) {
-				global $uidnumber;
-				return $uidnumber;
-			});
-
-		$ldap->expects($this->exactly(46))
-			->method('nextEntry')
-			//dummy value, usually invalid
-			->willReturnCallback(function ($r) {
-				global $uidnumber;
-				return $uidnumber;
-			});
-
-		$ldap->expects($this->exactly(46))
-			->method('getAttributes')
-			//dummy value, usually invalid
-			->willReturn(['cn' => ['foo'], 'count' => 1]);
-
-		global $uidnumber;
-		$uidnumber = 1;
-		$ldap->expects($this->exactly(46))
-			->method('getDN')
-			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $b) {
-				global $uidnumber;
-				return $uidnumber++;
-			});
-
-		// The following expectations are the real test
-		$filters = ['f1', 'f2', '*'];
-		$wizard->cumulativeSearchOnAttribute($filters, 'cn', 0);
-		unset($uidnumber);
-	}
-
-	public function testDetectEmailAttributeAlreadySet(): void {
-		[$wizard, $configuration, $ldap, $access]
-			= $this->getWizardAndMocks();
-
-		$configuration->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'ldapEmailAttribute') {
-					return 'myEmailAttribute';
-				} else {
-					//for requirement checks
-					return 'let me pass';
-				}
-			});
-
-		$access->expects($this->once())
-			->method('countUsers')
-			->willReturn(42);
-
-		$wizard->detectEmailAttribute();
-	}
-
-	public function testDetectEmailAttributeOverrideSet(): void {
-		[$wizard, $configuration, $ldap, $access]
-			= $this->getWizardAndMocks();
-
-		$configuration->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'ldapEmailAttribute') {
-					return 'myEmailAttribute';
-				} else {
-					//for requirement checks
-					return 'let me pass';
-				}
-			});
-
-		$access->expects($this->exactly(3))
-			->method('combineFilterWithAnd')
-			->willReturnCallback(function ($filterParts) {
-				return str_replace('=*', '', array_pop($filterParts));
-			});
-
-		$access->expects($this->exactly(3))
-			->method('countUsers')
-			->willReturnCallback(function ($filter) {
-				if ($filter === 'myEmailAttribute') {
-					return 0;
-				} elseif ($filter === 'mail') {
-					return 3;
-				} elseif ($filter === 'mailPrimaryAddress') {
-					return 17;
-				}
-				throw new \Exception('Untested filter: ' . $filter);
-			});
-
-		$result = $wizard->detectEmailAttribute()->getResultArray();
-		$this->assertSame('mailPrimaryAddress',
-			$result['changes']['ldap_email_attr']);
-	}
-
-	public function testDetectEmailAttributeFind(): void {
-		[$wizard, $configuration, $ldap, $access]
-			= $this->getWizardAndMocks();
-
-		$configuration->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'ldapEmailAttribute') {
-					return '';
-				} else {
-					//for requirement checks
-					return 'let me pass';
-				}
-			});
-
-		$access->expects($this->exactly(2))
-			->method('combineFilterWithAnd')
-			->willReturnCallback(function ($filterParts) {
-				return str_replace('=*', '', array_pop($filterParts));
-			});
-
-		$access->expects($this->exactly(2))
-			->method('countUsers')
-			->willReturnCallback(function ($filter) {
-				if ($filter === 'myEmailAttribute') {
-					return 0;
-				} elseif ($filter === 'mail') {
-					return 3;
-				} elseif ($filter === 'mailPrimaryAddress') {
-					return 17;
-				}
-				throw new \Exception('Untested filter: ' . $filter);
-			});
-
-		$result = $wizard->detectEmailAttribute()->getResultArray();
-		$this->assertSame('mailPrimaryAddress',
-			$result['changes']['ldap_email_attr']);
-	}
-
-	public function testDetectEmailAttributeFindNothing(): void {
-		[$wizard, $configuration, $ldap, $access]
-			= $this->getWizardAndMocks();
-
-		$configuration->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'ldapEmailAttribute') {
-					return 'myEmailAttribute';
-				} else {
-					//for requirement checks
-					return 'let me pass';
-				}
-			});
-
-		$access->expects($this->exactly(3))
-			->method('combineFilterWithAnd')
-			->willReturnCallback(function ($filterParts) {
-				return str_replace('=*', '', array_pop($filterParts));
-			});
-
-		$access->expects($this->exactly(3))
-			->method('countUsers')
-			->willReturnCallback(function ($filter) {
-				if ($filter === 'myEmailAttribute') {
-					return 0;
-				} elseif ($filter === 'mail') {
-					return 0;
-				} elseif ($filter === 'mailPrimaryAddress') {
-					return 0;
-				}
-				throw new \Exception('Untested filter: ' . $filter);
-			});
-
-		$result = $wizard->detectEmailAttribute();
-		$this->assertFalse($result->hasChanges());
-	}
-
-	public function testCumulativeSearchOnAttributeSkipReadDN(): void {
-		// tests that there is no infinite loop, when skipping already processed
-		// DNs (they can be returned multiple times for multiple filters )
-		[$wizard, $configuration, $ldap] = $this->getWizardAndMocks();
-
-		$configuration->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'ldapBase') {
-					return ['base'];
-				}
-				return null;
-			});
-
-		$this->prepareLdapWrapperForConnections($ldap);
-
-		$ldap->expects($this->any())
-			->method('isResource')
-			->willReturnCallback(function ($res) {
-				return (bool)$res;
-			});
-
-		$ldap->expects($this->any())
-			->method('search')
-			//dummy value, usually invalid
-			->willReturn(true);
-
-		$ldap->expects($this->any())
-			->method('countEntries')
-			//an is_resource check will follow, so we need to return a dummy resource
-			->willReturn(7);
-
-		//5 DNs per filter means 2x firstEntry and 8x nextEntry
-		$ldap->expects($this->any())
-			->method('firstEntry')
-			//dummy value, usually invalid
-			->willReturn(1);
-
-		global $mark;
-		$mark = false;
-		// entries return order: 1, 2, 3, 4, 4, 5, 6
-		$ldap->expects($this->any())
-			->method('nextEntry')
-			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $prev) {
-				$current = $prev + 1;
-				if ($current === 7) {
-					return false;
-				}
-				global $mark;
-				if ($prev === 4 && !$mark) {
-					$mark = true;
-					return 4;
-				}
-				return $current;
-			});
-
-		$ldap->expects($this->any())
-			->method('getAttributes')
-			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $entry) {
-				return ['cn' => [$entry], 'count' => 1];
-			});
-
-		$ldap->expects($this->any())
-			->method('getDN')
-			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $b) {
-				return $b;
-			});
-
-		// The following expectations are the real test
-		$filters = ['f1', 'f2', '*'];
-		$resultArray = $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0);
-		$this->assertCount(6, $resultArray);
-		unset($mark);
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        //we need to make sure the consts are defined, otherwise tests will fail
+        //on systems without php5_ldap
+        $ldapConsts = ['LDAP_OPT_PROTOCOL_VERSION',
+            'LDAP_OPT_REFERRALS', 'LDAP_OPT_NETWORK_TIMEOUT'];
+        foreach ($ldapConsts as $const) {
+            if (!defined($const)) {
+                define($const, 42);
+            }
+        }
+    }
+
+    private function getWizardAndMocks(): array {
+        static $confMethods;
+
+        if (is_null($confMethods)) {
+            $confMethods = get_class_methods('\OCA\User_LDAP\Configuration');
+        }
+        /** @var ILDAPWrapper&MockObject $lw */
+        $lw = $this->createMock(ILDAPWrapper::class);
+
+        /** @var Configuration&MockObject $conf */
+        $conf = $this->getMockBuilder(Configuration::class)
+            ->onlyMethods($confMethods)
+            ->setConstructorArgs(['', true])
+            ->getMock();
+
+        /** @var Access&MockObject $access */
+        $access = $this->createMock(Access::class);
+
+        return [new Wizard($conf, $lw, $access), $conf, $lw, $access];
+    }
+
+    private function prepareLdapWrapperForConnections(MockObject $ldap) {
+        $ldap->expects($this->once())
+            ->method('connect')
+            //dummy value
+            ->willReturn(ldap_connect('ldap://example.com'));
+
+        $ldap->expects($this->exactly(3))
+            ->method('setOption')
+            ->willReturn(true);
+
+        $ldap->expects($this->once())
+            ->method('bind')
+            ->willReturn(true);
+    }
+
+    public function testCumulativeSearchOnAttributeLimited(): void {
+        [$wizard, $configuration, $ldap] = $this->getWizardAndMocks();
+
+        $configuration->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'ldapBase') {
+                    return ['base'];
+                }
+                return null;
+            });
+
+        $this->prepareLdapWrapperForConnections($ldap);
+
+        $ldap->expects($this->any())
+            ->method('isResource')
+            ->willReturn(true);
+
+        $ldap->expects($this->exactly(2))
+            ->method('search')
+            //dummy value, usually invalid
+            ->willReturn(true);
+
+        $ldap->expects($this->exactly(2))
+            ->method('countEntries')
+            //an is_resource check will follow, so we need to return a dummy resource
+            ->willReturn(23);
+
+        //5 DNs per filter means 2x firstEntry and 8x nextEntry
+        $ldap->expects($this->exactly(2))
+            ->method('firstEntry')
+            //dummy value, usually invalid
+            ->willReturn(true);
+
+        $ldap->expects($this->exactly(8))
+            ->method('nextEntry')
+            //dummy value, usually invalid
+            ->willReturn(true);
+
+        $ldap->expects($this->exactly(10))
+            ->method('getAttributes')
+            //dummy value, usually invalid
+            ->willReturn(['cn' => ['foo'], 'count' => 1]);
+
+        global $uidnumber;
+        $uidnumber = 1;
+        $ldap->expects($this->exactly(10))
+            ->method('getDN')
+            //dummy value, usually invalid
+            ->willReturnCallback(function ($a, $b) {
+                global $uidnumber;
+                return $uidnumber++;
+            });
+
+        // The following expectations are the real test
+        $filters = ['f1', 'f2', '*'];
+        $wizard->cumulativeSearchOnAttribute($filters, 'cn', 5);
+        unset($uidnumber);
+    }
+
+    public function testCumulativeSearchOnAttributeUnlimited(): void {
+        [$wizard, $configuration, $ldap] = $this->getWizardAndMocks();
+
+        $configuration->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'ldapBase') {
+                    return ['base'];
+                }
+                return null;
+            });
+
+        $this->prepareLdapWrapperForConnections($ldap);
+
+        $ldap->expects($this->any())
+            ->method('isResource')
+            ->willReturnCallback(function ($r) {
+                if ($r instanceof \LDAP\Connection) {
+                    return true;
+                }
+                if ($r % 24 === 0) {
+                    global $uidnumber;
+                    $uidnumber++;
+                    return false;
+                }
+                return true;
+            });
+
+        $ldap->expects($this->exactly(2))
+            ->method('search')
+            //dummy value, usually invalid
+            ->willReturn(true);
+
+        $ldap->expects($this->exactly(2))
+            ->method('countEntries')
+            //an is_resource check will follow, so we need to return a dummy resource
+            ->willReturn(23);
+
+        //5 DNs per filter means 2x firstEntry and 8x nextEntry
+        $ldap->expects($this->exactly(2))
+            ->method('firstEntry')
+            //dummy value, usually invalid
+            ->willReturnCallback(function ($r) {
+                global $uidnumber;
+                return $uidnumber;
+            });
+
+        $ldap->expects($this->exactly(46))
+            ->method('nextEntry')
+            //dummy value, usually invalid
+            ->willReturnCallback(function ($r) {
+                global $uidnumber;
+                return $uidnumber;
+            });
+
+        $ldap->expects($this->exactly(46))
+            ->method('getAttributes')
+            //dummy value, usually invalid
+            ->willReturn(['cn' => ['foo'], 'count' => 1]);
+
+        global $uidnumber;
+        $uidnumber = 1;
+        $ldap->expects($this->exactly(46))
+            ->method('getDN')
+            //dummy value, usually invalid
+            ->willReturnCallback(function ($a, $b) {
+                global $uidnumber;
+                return $uidnumber++;
+            });
+
+        // The following expectations are the real test
+        $filters = ['f1', 'f2', '*'];
+        $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0);
+        unset($uidnumber);
+    }
+
+    public function testDetectEmailAttributeAlreadySet(): void {
+        [$wizard, $configuration, $ldap, $access]
+            = $this->getWizardAndMocks();
+
+        $configuration->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'ldapEmailAttribute') {
+                    return 'myEmailAttribute';
+                } else {
+                    //for requirement checks
+                    return 'let me pass';
+                }
+            });
+
+        $access->expects($this->once())
+            ->method('countUsers')
+            ->willReturn(42);
+
+        $wizard->detectEmailAttribute();
+    }
+
+    public function testDetectEmailAttributeOverrideSet(): void {
+        [$wizard, $configuration, $ldap, $access]
+            = $this->getWizardAndMocks();
+
+        $configuration->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'ldapEmailAttribute') {
+                    return 'myEmailAttribute';
+                } else {
+                    //for requirement checks
+                    return 'let me pass';
+                }
+            });
+
+        $access->expects($this->exactly(3))
+            ->method('combineFilterWithAnd')
+            ->willReturnCallback(function ($filterParts) {
+                return str_replace('=*', '', array_pop($filterParts));
+            });
+
+        $access->expects($this->exactly(3))
+            ->method('countUsers')
+            ->willReturnCallback(function ($filter) {
+                if ($filter === 'myEmailAttribute') {
+                    return 0;
+                } elseif ($filter === 'mail') {
+                    return 3;
+                } elseif ($filter === 'mailPrimaryAddress') {
+                    return 17;
+                }
+                throw new \Exception('Untested filter: ' . $filter);
+            });
+
+        $result = $wizard->detectEmailAttribute()->getResultArray();
+        $this->assertSame('mailPrimaryAddress',
+            $result['changes']['ldap_email_attr']);
+    }
+
+    public function testDetectEmailAttributeFind(): void {
+        [$wizard, $configuration, $ldap, $access]
+            = $this->getWizardAndMocks();
+
+        $configuration->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'ldapEmailAttribute') {
+                    return '';
+                } else {
+                    //for requirement checks
+                    return 'let me pass';
+                }
+            });
+
+        $access->expects($this->exactly(2))
+            ->method('combineFilterWithAnd')
+            ->willReturnCallback(function ($filterParts) {
+                return str_replace('=*', '', array_pop($filterParts));
+            });
+
+        $access->expects($this->exactly(2))
+            ->method('countUsers')
+            ->willReturnCallback(function ($filter) {
+                if ($filter === 'myEmailAttribute') {
+                    return 0;
+                } elseif ($filter === 'mail') {
+                    return 3;
+                } elseif ($filter === 'mailPrimaryAddress') {
+                    return 17;
+                }
+                throw new \Exception('Untested filter: ' . $filter);
+            });
+
+        $result = $wizard->detectEmailAttribute()->getResultArray();
+        $this->assertSame('mailPrimaryAddress',
+            $result['changes']['ldap_email_attr']);
+    }
+
+    public function testDetectEmailAttributeFindNothing(): void {
+        [$wizard, $configuration, $ldap, $access]
+            = $this->getWizardAndMocks();
+
+        $configuration->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'ldapEmailAttribute') {
+                    return 'myEmailAttribute';
+                } else {
+                    //for requirement checks
+                    return 'let me pass';
+                }
+            });
+
+        $access->expects($this->exactly(3))
+            ->method('combineFilterWithAnd')
+            ->willReturnCallback(function ($filterParts) {
+                return str_replace('=*', '', array_pop($filterParts));
+            });
+
+        $access->expects($this->exactly(3))
+            ->method('countUsers')
+            ->willReturnCallback(function ($filter) {
+                if ($filter === 'myEmailAttribute') {
+                    return 0;
+                } elseif ($filter === 'mail') {
+                    return 0;
+                } elseif ($filter === 'mailPrimaryAddress') {
+                    return 0;
+                }
+                throw new \Exception('Untested filter: ' . $filter);
+            });
+
+        $result = $wizard->detectEmailAttribute();
+        $this->assertFalse($result->hasChanges());
+    }
+
+    public function testCumulativeSearchOnAttributeSkipReadDN(): void {
+        // tests that there is no infinite loop, when skipping already processed
+        // DNs (they can be returned multiple times for multiple filters )
+        [$wizard, $configuration, $ldap] = $this->getWizardAndMocks();
+
+        $configuration->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'ldapBase') {
+                    return ['base'];
+                }
+                return null;
+            });
+
+        $this->prepareLdapWrapperForConnections($ldap);
+
+        $ldap->expects($this->any())
+            ->method('isResource')
+            ->willReturnCallback(function ($res) {
+                return (bool)$res;
+            });
+
+        $ldap->expects($this->any())
+            ->method('search')
+            //dummy value, usually invalid
+            ->willReturn(true);
+
+        $ldap->expects($this->any())
+            ->method('countEntries')
+            //an is_resource check will follow, so we need to return a dummy resource
+            ->willReturn(7);
+
+        //5 DNs per filter means 2x firstEntry and 8x nextEntry
+        $ldap->expects($this->any())
+            ->method('firstEntry')
+            //dummy value, usually invalid
+            ->willReturn(1);
+
+        global $mark;
+        $mark = false;
+        // entries return order: 1, 2, 3, 4, 4, 5, 6
+        $ldap->expects($this->any())
+            ->method('nextEntry')
+            //dummy value, usually invalid
+            ->willReturnCallback(function ($a, $prev) {
+                $current = $prev + 1;
+                if ($current === 7) {
+                    return false;
+                }
+                global $mark;
+                if ($prev === 4 && !$mark) {
+                    $mark = true;
+                    return 4;
+                }
+                return $current;
+            });
+
+        $ldap->expects($this->any())
+            ->method('getAttributes')
+            //dummy value, usually invalid
+            ->willReturnCallback(function ($a, $entry) {
+                return ['cn' => [$entry], 'count' => 1];
+            });
+
+        $ldap->expects($this->any())
+            ->method('getDN')
+            //dummy value, usually invalid
+            ->willReturnCallback(function ($a, $b) {
+                return $b;
+            });
+
+        // The following expectations are the real test
+        $filters = ['f1', 'f2', '*'];
+        $resultArray = $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0);
+        $this->assertCount(6, $resultArray);
+        unset($mark);
+    }
 }

Spacing +26 added lines, -26 removed lines

@@ -77,7 +77,7 @@ 
 
 		$configuration->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'ldapBase') {
 					return ['base'];
 				}
@@ -121,7 +121,7 @@ 
 		$ldap->expects($this->exactly(10))
 			->method('getDN')
 			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $b) {
+			->willReturnCallback(function($a, $b) {
 				global $uidnumber;
 				return $uidnumber++;
 			});
@@ -137,7 +137,7 @@ 
 
 		$configuration->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'ldapBase') {
 					return ['base'];
 				}
@@ -148,7 +148,7 @@ 
 
 		$ldap->expects($this->any())
 			->method('isResource')
-			->willReturnCallback(function ($r) {
+			->willReturnCallback(function($r) {
 				if ($r instanceof \LDAP\Connection) {
 					return true;
 				}
@@ -174,7 +174,7 @@ 
 		$ldap->expects($this->exactly(2))
 			->method('firstEntry')
 			//dummy value, usually invalid
-			->willReturnCallback(function ($r) {
+			->willReturnCallback(function($r) {
 				global $uidnumber;
 				return $uidnumber;
 			});
@@ -182,7 +182,7 @@ 
 		$ldap->expects($this->exactly(46))
 			->method('nextEntry')
 			//dummy value, usually invalid
-			->willReturnCallback(function ($r) {
+			->willReturnCallback(function($r) {
 				global $uidnumber;
 				return $uidnumber;
 			});
@@ -197,7 +197,7 @@ 
 		$ldap->expects($this->exactly(46))
 			->method('getDN')
 			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $b) {
+			->willReturnCallback(function($a, $b) {
 				global $uidnumber;
 				return $uidnumber++;
 			});
@@ -214,7 +214,7 @@ 
 
 		$configuration->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'ldapEmailAttribute') {
 					return 'myEmailAttribute';
 				} else {
@@ -236,7 +236,7 @@ 
 
 		$configuration->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'ldapEmailAttribute') {
 					return 'myEmailAttribute';
 				} else {
@@ -247,13 +247,13 @@ 
 
 		$access->expects($this->exactly(3))
 			->method('combineFilterWithAnd')
-			->willReturnCallback(function ($filterParts) {
+			->willReturnCallback(function($filterParts) {
 				return str_replace('=*', '', array_pop($filterParts));
 			});
 
 		$access->expects($this->exactly(3))
 			->method('countUsers')
-			->willReturnCallback(function ($filter) {
+			->willReturnCallback(function($filter) {
 				if ($filter === 'myEmailAttribute') {
 					return 0;
 				} elseif ($filter === 'mail') {
@@ -261,7 +261,7 @@ 
 				} elseif ($filter === 'mailPrimaryAddress') {
 					return 17;
 				}
-				throw new \Exception('Untested filter: ' . $filter);
+				throw new \Exception('Untested filter: '.$filter);
 			});
 
 		$result = $wizard->detectEmailAttribute()->getResultArray();
@@ -275,7 +275,7 @@ 
 
 		$configuration->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'ldapEmailAttribute') {
 					return '';
 				} else {
@@ -286,13 +286,13 @@ 
 
 		$access->expects($this->exactly(2))
 			->method('combineFilterWithAnd')
-			->willReturnCallback(function ($filterParts) {
+			->willReturnCallback(function($filterParts) {
 				return str_replace('=*', '', array_pop($filterParts));
 			});
 
 		$access->expects($this->exactly(2))
 			->method('countUsers')
-			->willReturnCallback(function ($filter) {
+			->willReturnCallback(function($filter) {
 				if ($filter === 'myEmailAttribute') {
 					return 0;
 				} elseif ($filter === 'mail') {
@@ -300,7 +300,7 @@ 
 				} elseif ($filter === 'mailPrimaryAddress') {
 					return 17;
 				}
-				throw new \Exception('Untested filter: ' . $filter);
+				throw new \Exception('Untested filter: '.$filter);
 			});
 
 		$result = $wizard->detectEmailAttribute()->getResultArray();
@@ -314,7 +314,7 @@ 
 
 		$configuration->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'ldapEmailAttribute') {
 					return 'myEmailAttribute';
 				} else {
@@ -325,13 +325,13 @@ 
 
 		$access->expects($this->exactly(3))
 			->method('combineFilterWithAnd')
-			->willReturnCallback(function ($filterParts) {
+			->willReturnCallback(function($filterParts) {
 				return str_replace('=*', '', array_pop($filterParts));
 			});
 
 		$access->expects($this->exactly(3))
 			->method('countUsers')
-			->willReturnCallback(function ($filter) {
+			->willReturnCallback(function($filter) {
 				if ($filter === 'myEmailAttribute') {
 					return 0;
 				} elseif ($filter === 'mail') {
@@ -339,7 +339,7 @@ 
 				} elseif ($filter === 'mailPrimaryAddress') {
 					return 0;
 				}
-				throw new \Exception('Untested filter: ' . $filter);
+				throw new \Exception('Untested filter: '.$filter);
 			});
 
 		$result = $wizard->detectEmailAttribute();
@@ -353,7 +353,7 @@ 
 
 		$configuration->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'ldapBase') {
 					return ['base'];
 				}
@@ -364,8 +364,8 @@ 
 
 		$ldap->expects($this->any())
 			->method('isResource')
-			->willReturnCallback(function ($res) {
-				return (bool)$res;
+			->willReturnCallback(function($res) {
+				return (bool) $res;
 			});
 
 		$ldap->expects($this->any())
@@ -390,7 +390,7 @@ 
 		$ldap->expects($this->any())
 			->method('nextEntry')
 			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $prev) {
+			->willReturnCallback(function($a, $prev) {
 				$current = $prev + 1;
 				if ($current === 7) {
 					return false;
@@ -406,14 +406,14 @@ 
 		$ldap->expects($this->any())
 			->method('getAttributes')
 			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $entry) {
+			->willReturnCallback(function($a, $entry) {
 				return ['cn' => [$entry], 'count' => 1];
 			});
 
 		$ldap->expects($this->any())
 			->method('getDN')
 			//dummy value, usually invalid
-			->willReturnCallback(function ($a, $b) {
+			->willReturnCallback(function($a, $b) {
 				return $b;
 			});
 

apps/user_ldap/tests/LDAPTest.php

Indentation +50 added lines, -50 removed lines

@@ -12,63 +12,63 @@
 use Test\TestCase;
 
 class LDAPTest extends TestCase {
-	private LDAP&MockObject $ldap;
+    private LDAP&MockObject $ldap;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->ldap = $this->getMockBuilder(LDAP::class)
-			->onlyMethods(['invokeLDAPMethod'])
-			->getMock();
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->ldap = $this->getMockBuilder(LDAP::class)
+            ->onlyMethods(['invokeLDAPMethod'])
+            ->getMock();
+    }
 
-	public static function errorProvider(): array {
-		return [
-			[
-				'ldap_search(): Partial search results returned: Sizelimit exceeded at /srv/http/nextcloud/master/apps/user_ldap/lib/LDAP.php#292',
-				false
-			],
-			[
-				'Some other error', true
-			]
-		];
-	}
+    public static function errorProvider(): array {
+        return [
+            [
+                'ldap_search(): Partial search results returned: Sizelimit exceeded at /srv/http/nextcloud/master/apps/user_ldap/lib/LDAP.php#292',
+                false
+            ],
+            [
+                'Some other error', true
+            ]
+        ];
+    }
 
-	/**
-	 * @dataProvider errorProvider
-	 */
-	public function testSearchWithErrorHandler(string $errorMessage, bool $passThrough): void {
-		$wasErrorHandlerCalled = false;
-		$errorHandler = function ($number, $message, $file, $line) use (&$wasErrorHandlerCalled): void {
-			$wasErrorHandlerCalled = true;
-		};
+    /**
+     * @dataProvider errorProvider
+     */
+    public function testSearchWithErrorHandler(string $errorMessage, bool $passThrough): void {
+        $wasErrorHandlerCalled = false;
+        $errorHandler = function ($number, $message, $file, $line) use (&$wasErrorHandlerCalled): void {
+            $wasErrorHandlerCalled = true;
+        };
 
-		set_error_handler($errorHandler);
+        set_error_handler($errorHandler);
 
-		$this->ldap
-			->expects($this->once())
-			->method('invokeLDAPMethod')
-			->with('search', $this->anything(), $this->anything(), $this->anything(), $this->anything(), $this->anything())
-			->willReturnCallback(function () use ($errorMessage): void {
-				trigger_error($errorMessage);
-			});
+        $this->ldap
+            ->expects($this->once())
+            ->method('invokeLDAPMethod')
+            ->with('search', $this->anything(), $this->anything(), $this->anything(), $this->anything(), $this->anything())
+            ->willReturnCallback(function () use ($errorMessage): void {
+                trigger_error($errorMessage);
+            });
 
-		$fakeResource = ldap_connect();
-		$this->ldap->search($fakeResource, 'base', 'filter', []);
-		$this->assertSame($wasErrorHandlerCalled, $passThrough);
+        $fakeResource = ldap_connect();
+        $this->ldap->search($fakeResource, 'base', 'filter', []);
+        $this->assertSame($wasErrorHandlerCalled, $passThrough);
 
-		restore_error_handler();
-	}
+        restore_error_handler();
+    }
 
-	public function testModReplace(): void {
-		$link = $this->createMock(LDAP::class);
-		$userDN = 'CN=user';
-		$password = 'MyPassword';
-		$this->ldap
-			->expects($this->once())
-			->method('invokeLDAPMethod')
-			->with('mod_replace', $link, $userDN, ['userPassword' => $password])
-			->willReturn(true);
+    public function testModReplace(): void {
+        $link = $this->createMock(LDAP::class);
+        $userDN = 'CN=user';
+        $password = 'MyPassword';
+        $this->ldap
+            ->expects($this->once())
+            ->method('invokeLDAPMethod')
+            ->with('mod_replace', $link, $userDN, ['userPassword' => $password])
+            ->willReturn(true);
 
-		$this->assertTrue($this->ldap->modReplace($link, $userDN, $password));
-	}
+        $this->assertTrue($this->ldap->modReplace($link, $userDN, $password));
+    }
 }

apps/user_ldap/tests/HelperTest.php

Indentation +82 added lines, -82 removed lines

@@ -17,86 +17,86 @@
  * @group DB
  */
 class HelperTest extends \Test\TestCase {
-	private IConfig&MockObject $config;
-
-	private Helper $helper;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->helper = new Helper($this->config, Server::get(IDBConnection::class));
-	}
-
-	public function testGetServerConfigurationPrefixes(): void {
-		$this->config->method('getAppKeys')
-			->with($this->equalTo('user_ldap'))
-			->willReturn([
-				'foo',
-				'ldap_configuration_active',
-				's1ldap_configuration_active',
-			]);
-
-		$result = $this->helper->getServerConfigurationPrefixes(false);
-
-		$this->assertEquals(['', 's1'], $result);
-	}
-
-	public function testGetServerConfigurationPrefixesActive(): void {
-		$this->config->method('getAppKeys')
-			->with($this->equalTo('user_ldap'))
-			->willReturn([
-				'foo',
-				'ldap_configuration_active',
-				's1ldap_configuration_active',
-			]);
-
-		$this->config->method('getAppValue')
-			->willReturnCallback(function ($app, $key, $default) {
-				if ($app !== 'user_ldap') {
-					$this->fail('wrong app');
-				}
-				if ($key === 's1ldap_configuration_active') {
-					return '1';
-				}
-				return $default;
-			});
-
-		$result = $this->helper->getServerConfigurationPrefixes(true);
-
-		$this->assertEquals(['s1'], $result);
-	}
-
-	public function testGetServerConfigurationHost(): void {
-		$this->config->method('getAppKeys')
-			->with($this->equalTo('user_ldap'))
-			->willReturn([
-				'foo',
-				'ldap_host',
-				's1ldap_host',
-				's02ldap_host',
-			]);
-
-		$this->config->method('getAppValue')
-			->willReturnCallback(function ($app, $key, $default) {
-				if ($app !== 'user_ldap') {
-					$this->fail('wrong app');
-				}
-				if ($key === 'ldap_host') {
-					return 'example.com';
-				}
-				if ($key === 's1ldap_host') {
-					return 'foo.bar.com';
-				}
-				return $default;
-			});
-
-		$result = $this->helper->getServerConfigurationHosts();
-
-		$this->assertEquals([
-			'' => 'example.com',
-			's1' => 'foo.bar.com',
-			's02' => '',
-		], $result);
-	}
+    private IConfig&MockObject $config;
+
+    private Helper $helper;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->helper = new Helper($this->config, Server::get(IDBConnection::class));
+    }
+
+    public function testGetServerConfigurationPrefixes(): void {
+        $this->config->method('getAppKeys')
+            ->with($this->equalTo('user_ldap'))
+            ->willReturn([
+                'foo',
+                'ldap_configuration_active',
+                's1ldap_configuration_active',
+            ]);
+
+        $result = $this->helper->getServerConfigurationPrefixes(false);
+
+        $this->assertEquals(['', 's1'], $result);
+    }
+
+    public function testGetServerConfigurationPrefixesActive(): void {
+        $this->config->method('getAppKeys')
+            ->with($this->equalTo('user_ldap'))
+            ->willReturn([
+                'foo',
+                'ldap_configuration_active',
+                's1ldap_configuration_active',
+            ]);
+
+        $this->config->method('getAppValue')
+            ->willReturnCallback(function ($app, $key, $default) {
+                if ($app !== 'user_ldap') {
+                    $this->fail('wrong app');
+                }
+                if ($key === 's1ldap_configuration_active') {
+                    return '1';
+                }
+                return $default;
+            });
+
+        $result = $this->helper->getServerConfigurationPrefixes(true);
+
+        $this->assertEquals(['s1'], $result);
+    }
+
+    public function testGetServerConfigurationHost(): void {
+        $this->config->method('getAppKeys')
+            ->with($this->equalTo('user_ldap'))
+            ->willReturn([
+                'foo',
+                'ldap_host',
+                's1ldap_host',
+                's02ldap_host',
+            ]);
+
+        $this->config->method('getAppValue')
+            ->willReturnCallback(function ($app, $key, $default) {
+                if ($app !== 'user_ldap') {
+                    $this->fail('wrong app');
+                }
+                if ($key === 'ldap_host') {
+                    return 'example.com';
+                }
+                if ($key === 's1ldap_host') {
+                    return 'foo.bar.com';
+                }
+                return $default;
+            });
+
+        $result = $this->helper->getServerConfigurationHosts();
+
+        $this->assertEquals([
+            '' => 'example.com',
+            's1' => 'foo.bar.com',
+            's02' => '',
+        ], $result);
+    }
 }

apps/user_ldap/tests/User/DeletedUsersIndexTest.php

Indentation +75 added lines, -75 removed lines

@@ -23,79 +23,79 @@
  * @package OCA\User_LDAP\Tests\User
  */
 class DeletedUsersIndexTest extends \Test\TestCase {
-	protected DeletedUsersIndex $dui;
-	protected IConfig $config;
-	protected IDBConnection $db;
-	protected UserMapping&MockObject $mapping;
-	protected IManager&MockObject $shareManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		// no mocks for those as tests go against DB
-		$this->config = Server::get(IConfig::class);
-		$this->db = Server::get(IDBConnection::class);
-
-		// ensure a clean database
-		$this->config->deleteAppFromAllUsers('user_ldap');
-
-		$this->mapping = $this->createMock(UserMapping::class);
-		$this->shareManager = $this->createMock(IManager::class);
-
-		$this->dui = new DeletedUsersIndex($this->config, $this->mapping, $this->shareManager);
-	}
-
-	protected function tearDown(): void {
-		$this->config->deleteAppFromAllUsers('user_ldap');
-		parent::tearDown();
-	}
-
-	public function testMarkAndFetchUser(): void {
-		$uids = [
-			'cef3775c-71d2-48eb-8984-39a4051b0b95',
-			'8c4bbb40-33ed-42d0-9b14-85b0ab76c1cc',
-		];
-
-		// ensure test works on a pristine state
-		$this->assertFalse($this->dui->hasUsers());
-
-		$this->dui->markUser($uids[0]);
-
-		$this->assertTrue($this->dui->hasUsers());
-
-		$this->dui->markUser($uids[1]);
-
-		$deletedUsers = $this->dui->getUsers();
-		$this->assertSame(2, count($deletedUsers));
-
-		// ensure the different uids were used
-		foreach ($deletedUsers as $deletedUser) {
-			$this->assertTrue(in_array($deletedUser->getOCName(), $uids));
-			$i = array_search($deletedUser->getOCName(), $uids);
-			$this->assertNotFalse($i);
-			unset($uids[$i]);
-		}
-		$this->assertEmpty($uids);
-	}
-
-	public function testUnmarkUser(): void {
-		$uids = [
-			'22a162c7-a9ee-487c-9f33-0563795583fb',
-			'1fb4e0da-4a75-47f3-8fa7-becc7e35c9c5',
-		];
-
-		// we know this works, because of "testMarkAndFetchUser"
-		$this->dui->markUser($uids[0]);
-		// this returns a working instance of OfflineUser
-		$testUser = $this->dui->getUsers()[0];
-		$testUser->unmark();
-
-		// the DUI caches the users, to clear mark someone else
-		$this->dui->markUser($uids[1]);
-
-		$deletedUsers = $this->dui->getUsers();
-		foreach ($deletedUsers as $deletedUser) {
-			$this->assertNotSame($testUser->getOCName(), $deletedUser->getOCName());
-		}
-	}
+    protected DeletedUsersIndex $dui;
+    protected IConfig $config;
+    protected IDBConnection $db;
+    protected UserMapping&MockObject $mapping;
+    protected IManager&MockObject $shareManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        // no mocks for those as tests go against DB
+        $this->config = Server::get(IConfig::class);
+        $this->db = Server::get(IDBConnection::class);
+
+        // ensure a clean database
+        $this->config->deleteAppFromAllUsers('user_ldap');
+
+        $this->mapping = $this->createMock(UserMapping::class);
+        $this->shareManager = $this->createMock(IManager::class);
+
+        $this->dui = new DeletedUsersIndex($this->config, $this->mapping, $this->shareManager);
+    }
+
+    protected function tearDown(): void {
+        $this->config->deleteAppFromAllUsers('user_ldap');
+        parent::tearDown();
+    }
+
+    public function testMarkAndFetchUser(): void {
+        $uids = [
+            'cef3775c-71d2-48eb-8984-39a4051b0b95',
+            '8c4bbb40-33ed-42d0-9b14-85b0ab76c1cc',
+        ];
+
+        // ensure test works on a pristine state
+        $this->assertFalse($this->dui->hasUsers());
+
+        $this->dui->markUser($uids[0]);
+
+        $this->assertTrue($this->dui->hasUsers());
+
+        $this->dui->markUser($uids[1]);
+
+        $deletedUsers = $this->dui->getUsers();
+        $this->assertSame(2, count($deletedUsers));
+
+        // ensure the different uids were used
+        foreach ($deletedUsers as $deletedUser) {
+            $this->assertTrue(in_array($deletedUser->getOCName(), $uids));
+            $i = array_search($deletedUser->getOCName(), $uids);
+            $this->assertNotFalse($i);
+            unset($uids[$i]);
+        }
+        $this->assertEmpty($uids);
+    }
+
+    public function testUnmarkUser(): void {
+        $uids = [
+            '22a162c7-a9ee-487c-9f33-0563795583fb',
+            '1fb4e0da-4a75-47f3-8fa7-becc7e35c9c5',
+        ];
+
+        // we know this works, because of "testMarkAndFetchUser"
+        $this->dui->markUser($uids[0]);
+        // this returns a working instance of OfflineUser
+        $testUser = $this->dui->getUsers()[0];
+        $testUser->unmark();
+
+        // the DUI caches the users, to clear mark someone else
+        $this->dui->markUser($uids[1]);
+
+        $deletedUsers = $this->dui->getUsers();
+        foreach ($deletedUsers as $deletedUser) {
+            $this->assertNotSame($testUser->getOCName(), $deletedUser->getOCName());
+        }
+    }
 }

apps/user_ldap/tests/User/UserTest.php

Indentation +1150 added lines, -1150 removed lines

@@ -32,1154 +32,1154 @@
  * @package OCA\User_LDAP\Tests\User
  */
 class UserTest extends \Test\TestCase {
-	protected Access&MockObject $access;
-	protected Connection&MockObject $connection;
-	protected IConfig&MockObject $config;
-	protected INotificationManager&MockObject $notificationManager;
-	protected IUserManager&MockObject $userManager;
-	protected Image&MockObject $image;
-	protected IAvatarManager&MockObject $avatarManager;
-	protected LoggerInterface&MockObject $logger;
-	protected string $uid = 'alice';
-	protected string $dn = 'uid=alice,dc=foo,dc=bar';
-	protected User $user;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->connection = $this->getMockBuilder(Connection::class)
-			->setConstructorArgs([$this->createMock(ILDAPWrapper::class)])
-			->getMock();
-
-		$this->access = $this->createMock(Access::class);
-		$this->access->connection = $this->connection;
-		$this->access->expects($this->any())
-			->method('getConnection')
-			->willReturn($this->connection);
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->avatarManager = $this->createMock(IAvatarManager::class);
-		$this->image = $this->createMock(Image::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->notificationManager = $this->createMock(INotificationManager::class);
-
-		$this->user = new User(
-			$this->uid,
-			$this->dn,
-			$this->access,
-			$this->config,
-			$this->image,
-			$this->logger,
-			$this->avatarManager,
-			$this->userManager,
-			$this->notificationManager
-		);
-	}
-
-	public function testGetDNandUsername(): void {
-		$this->assertSame($this->dn, $this->user->getDN());
-		$this->assertSame($this->uid, $this->user->getUsername());
-	}
-
-	public function testUpdateEmailProvided(): void {
-		$this->connection->expects($this->once())
-			->method('__get')
-			->with($this->equalTo('ldapEmailAttribute'))
-			->willReturn('email');
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('email'))
-			->willReturn(['alice@foo.bar']);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->once())
-			->method('setSystemEMailAddress')
-			->with('alice@foo.bar');
-
-		$this->userManager->expects($this->any())
-			->method('get')
-			->willReturn($coreUser);
-
-		$this->user->updateEmail();
-	}
-
-	public function testUpdateEmailNotProvided(): void {
-		$this->connection->expects($this->once())
-			->method('__get')
-			->with($this->equalTo('ldapEmailAttribute'))
-			->willReturn('email');
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('email'))
-			->willReturn(false);
-
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$this->user->updateEmail();
-	}
-
-	public function testUpdateEmailNotConfigured(): void {
-		$this->connection->expects($this->once())
-			->method('__get')
-			->with($this->equalTo('ldapEmailAttribute'))
-			->willReturn('');
-
-		$this->access->expects($this->never())
-			->method('readAttribute');
-
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$this->user->updateEmail();
-	}
-
-	public function testUpdateQuotaAllProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '']
-			]);
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('myquota'))
-			->willReturn(['42 GB']);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->once())
-			->method('setQuota')
-			->with('42 GB');
-
-		$this->userManager->expects($this->atLeastOnce())
-			->method('get')
-			->with($this->uid)
-			->willReturn($coreUser);
-
-		$this->user->updateQuota();
-	}
-
-	public function testUpdateQuotaToDefaultAllProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '']
-			]);
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('myquota'))
-			->willReturn(['default']);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->once())
-			->method('setQuota')
-			->with('default');
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with($this->uid)
-			->willReturn($coreUser);
-
-		$this->user->updateQuota();
-	}
-
-	public function testUpdateQuotaToNoneAllProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '']
-			]);
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('myquota'))
-			->willReturn(['none']);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->once())
-			->method('setQuota')
-			->with('none');
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with($this->uid)
-			->willReturn($coreUser);
-
-		$this->user->updateQuota();
-	}
-
-	public function testUpdateQuotaDefaultProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '25 GB'],
-			]);
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('myquota'))
-			->willReturn(false);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->once())
-			->method('setQuota')
-			->with('25 GB');
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with($this->uid)
-			->willReturn($coreUser);
-
-		$this->user->updateQuota();
-	}
-
-	public function testUpdateQuotaIndividualProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '']
-			]);
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('myquota'))
-			->willReturn(['27 GB']);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->once())
-			->method('setQuota')
-			->with('27 GB');
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with($this->uid)
-			->willReturn($coreUser);
-
-		$this->user->updateQuota();
-	}
-
-	public function testUpdateQuotaNoneProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '']
-			]);
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('myquota'))
-			->willReturn(false);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->never())
-			->method('setQuota');
-
-		$this->userManager->expects($this->never())
-			->method('get')
-			->with($this->uid);
-
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$this->user->updateQuota();
-	}
-
-	public function testUpdateQuotaNoneConfigured(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', ''],
-				['ldapQuotaDefault', '']
-			]);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->never())
-			->method('setQuota');
-
-		$this->userManager->expects($this->never())
-			->method('get');
-
-		$this->access->expects($this->never())
-			->method('readAttribute');
-
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$this->user->updateQuota();
-	}
-
-	public function testUpdateQuotaFromValue(): void {
-		$readQuota = '19 GB';
-
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '']
-			]);
-
-		$this->access->expects($this->never())
-			->method('readAttribute');
-
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())
-			->method('setQuota')
-			->with($readQuota);
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with($this->uid)
-			->willReturn($user);
-
-		$this->user->updateQuota($readQuota);
-	}
-
-	/**
-	 * Unparseable quota will fallback to use the LDAP default
-	 */
-	public function testUpdateWrongQuotaAllProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '23 GB']
-			]);
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('myquota'))
-			->willReturn(['42 GBwos']);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->once())
-			->method('setQuota')
-			->with('23 GB');
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with($this->uid)
-			->willReturn($coreUser);
-
-		$this->user->updateQuota();
-	}
-
-	/**
-	 * No user quota and wrong default will set 'default' as quota
-	 */
-	public function testUpdateWrongDefaultQuotaProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '23 GBwowowo']
-			]);
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('myquota'))
-			->willReturn(false);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->never())
-			->method('setQuota');
-
-		$this->userManager->expects($this->never())
-			->method('get');
-
-		$this->user->updateQuota();
-	}
-
-	/**
-	 * Wrong user quota and wrong default will set 'default' as quota
-	 */
-	public function testUpdateWrongQuotaAndDefaultAllProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', 'myquota'],
-				['ldapQuotaDefault', '23 GBwowowo']
-			]);
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('myquota'))
-			->willReturn(['23 flush']);
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->never())
-			->method('setQuota');
-
-		$this->userManager->expects($this->never())
-			->method('get');
-
-		$this->user->updateQuota();
-	}
-
-	/**
-	 * No quota attribute set and wrong default will set 'default' as quota
-	 */
-	public function testUpdateWrongDefaultQuotaNotProvided(): void {
-		$this->connection->expects($this->exactly(2))
-			->method('__get')
-			->willReturnMap([
-				['ldapQuotaAttribute', ''],
-				['ldapQuotaDefault', '23 GBwowowo']
-			]);
-
-		$this->access->expects($this->never())
-			->method('readAttribute');
-
-		$coreUser = $this->createMock(IUser::class);
-		$coreUser->expects($this->never())
-			->method('setQuota');
-
-		$this->userManager->expects($this->never())
-			->method('get');
-
-		$this->user->updateQuota();
-	}
-
-	//the testUpdateAvatar series also implicitly tests getAvatarImage
-	public function XtestUpdateAvatarJpegPhotoProvided() {
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('jpegphoto'))
-			->willReturn(['this is a photo']);
-
-		$this->image->expects($this->once())
-			->method('loadFromBase64')
-			->willReturn('imageResource');
-		$this->image->expects($this->once())
-			->method('valid')
-			->willReturn(true);
-		$this->image->expects($this->once())
-			->method('width')
-			->willReturn(128);
-		$this->image->expects($this->once())
-			->method('height')
-			->willReturn(128);
-		$this->image->expects($this->once())
-			->method('centerCrop')
-			->willReturn(true);
-		$this->image->expects($this->once())
-			->method('data')
-			->willReturn('this is a photo');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with($this->uid, 'user_ldap', 'lastAvatarChecksum', '')
-			->willReturn('');
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with($this->uid, 'user_ldap', 'lastAvatarChecksum', md5('this is a photo'));
-
-		$avatar = $this->createMock(IAvatar::class);
-		$avatar->expects($this->once())
-			->method('set')
-			->with($this->image);
-
-		$this->avatarManager->expects($this->once())
-			->method('getAvatar')
-			->with($this->equalTo($this->uid))
-			->willReturn($avatar);
-
-		$this->connection->expects($this->any())
-			->method('resolveRule')
-			->with('avatar')
-			->willReturn(['jpegphoto', 'thumbnailphoto']);
-
-		$this->user->updateAvatar();
-	}
-
-	public function testUpdateAvatarKnownJpegPhotoProvided(): void {
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('jpegphoto'))
-			->willReturn(['this is a photo']);
-
-		$this->image->expects($this->once())
-			->method('loadFromBase64')
-			->willReturn('imageResource');
-		$this->image->expects($this->never())
-			->method('valid');
-		$this->image->expects($this->never())
-			->method('width');
-		$this->image->expects($this->never())
-			->method('height');
-		$this->image->expects($this->never())
-			->method('centerCrop');
-		$this->image->expects($this->once())
-			->method('data')
-			->willReturn('this is a photo');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with($this->uid, 'user_ldap', 'lastAvatarChecksum', '')
-			->willReturn(md5('this is a photo'));
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$avatar = $this->createMock(IAvatar::class);
-		$avatar->expects($this->never())
-			->method('set');
-		$avatar->expects($this->any())
-			->method('exists')
-			->willReturn(true);
-		$avatar->expects($this->any())
-			->method('isCustomAvatar')
-			->willReturn(true);
-
-		$this->avatarManager->expects($this->any())
-			->method('getAvatar')
-			->with($this->uid)
-			->willReturn($avatar);
-
-		$this->connection->expects($this->any())
-			->method('resolveRule')
-			->with('avatar')
-			->willReturn(['jpegphoto', 'thumbnailphoto']);
-
-		$this->assertTrue($this->user->updateAvatar());
-	}
-
-	public function XtestUpdateAvatarThumbnailPhotoProvided() {
-		$this->access->expects($this->any())
-			->method('readAttribute')
-			->willReturnCallback(function ($dn, $attr) {
-				if ($dn === $this->dn
-					&& $attr === 'jpegphoto') {
-					return false;
-				} elseif ($dn === $this->dn
-					&& $attr === 'thumbnailphoto') {
-					return ['this is a photo'];
-				}
-				return null;
-			});
-
-		$this->image->expects($this->once())
-			->method('loadFromBase64')
-			->willReturn('imageResource');
-		$this->image->expects($this->once())
-			->method('valid')
-			->willReturn(true);
-		$this->image->expects($this->once())
-			->method('width')
-			->willReturn(128);
-		$this->image->expects($this->once())
-			->method('height')
-			->willReturn(128);
-		$this->image->expects($this->once())
-			->method('centerCrop')
-			->willReturn(true);
-		$this->image->expects($this->once())
-			->method('data')
-			->willReturn('this is a photo');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with($this->uid, 'user_ldap', 'lastAvatarChecksum', '')
-			->willReturn('');
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with($this->uid, 'user_ldap', 'lastAvatarChecksum', md5('this is a photo'));
-
-		$avatar = $this->createMock(IAvatar::class);
-		$avatar->expects($this->once())
-			->method('set')
-			->with($this->image);
-
-		$this->avatarManager->expects($this->once())
-			->method('getAvatar')
-			->with($this->equalTo($this->uid))
-			->willReturn($avatar);
-
-		$this->connection->expects($this->any())
-			->method('resolveRule')
-			->with('avatar')
-			->willReturn(['jpegphoto', 'thumbnailphoto']);
-
-		$this->user->updateAvatar();
-	}
-
-	public function testUpdateAvatarCorruptPhotoProvided(): void {
-		$this->access->expects($this->any())
-			->method('readAttribute')
-			->willReturnCallback(function ($dn, $attr) {
-				if ($dn === $this->dn
-					&& $attr === 'jpegphoto') {
-					return false;
-				} elseif ($dn === $this->dn
-					&& $attr === 'thumbnailphoto') {
-					return ['this is a photo'];
-				}
-				return null;
-			});
-
-		$this->image->expects($this->once())
-			->method('loadFromBase64')
-			->willReturn(false);
-		$this->image->expects($this->never())
-			->method('valid');
-		$this->image->expects($this->never())
-			->method('width');
-		$this->image->expects($this->never())
-			->method('height');
-		$this->image->expects($this->never())
-			->method('centerCrop');
-		$this->image->expects($this->never())
-			->method('data');
-
-		$this->config->expects($this->never())
-			->method('getUserValue');
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$avatar = $this->createMock(IAvatar::class);
-		$avatar->expects($this->never())
-			->method('set');
-
-		$this->avatarManager->expects($this->never())
-			->method('getAvatar');
-
-		$this->connection->expects($this->any())
-			->method('resolveRule')
-			->with('avatar')
-			->willReturn(['jpegphoto', 'thumbnailphoto']);
-
-		$this->user->updateAvatar();
-	}
-
-	public function XtestUpdateAvatarUnsupportedThumbnailPhotoProvided() {
-		$this->access->expects($this->any())
-			->method('readAttribute')
-			->willReturnCallback(function ($dn, $attr) {
-				if ($dn === $this->dn
-					&& $attr === 'jpegphoto') {
-					return false;
-				} elseif ($dn === $this->dn
-					&& $attr === 'thumbnailphoto') {
-					return ['this is a photo'];
-				}
-				return null;
-			});
-
-		$this->image->expects($this->once())
-			->method('loadFromBase64')
-			->willReturn('imageResource');
-		$this->image->expects($this->once())
-			->method('valid')
-			->willReturn(true);
-		$this->image->expects($this->once())
-			->method('width')
-			->willReturn(128);
-		$this->image->expects($this->once())
-			->method('height')
-			->willReturn(128);
-		$this->image->expects($this->once())
-			->method('centerCrop')
-			->willReturn(true);
-		$this->image->expects($this->once())
-			->method('data')
-			->willReturn('this is a photo');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with($this->uid, 'user_ldap', 'lastAvatarChecksum', '')
-			->willReturn('');
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$avatar = $this->createMock(IAvatar::class);
-		$avatar->expects($this->once())
-			->method('set')
-			->with($this->image)
-			->willThrowException(new \Exception());
-
-		$this->avatarManager->expects($this->once())
-			->method('getAvatar')
-			->with($this->equalTo($this->uid))
-			->willReturn($avatar);
-
-		$this->connection->expects($this->any())
-			->method('resolveRule')
-			->with('avatar')
-			->willReturn(['jpegphoto', 'thumbnailphoto']);
-
-		$this->assertFalse($this->user->updateAvatar());
-	}
-
-	public function testUpdateAvatarNotProvided(): void {
-		$this->access->expects($this->any())
-			->method('readAttribute')
-			->willReturnCallback(function ($dn, $attr) {
-				if ($dn === $this->dn
-					&& $attr === 'jpegPhoto') {
-					return false;
-				} elseif ($dn === $this->dn
-					&& $attr === 'thumbnailPhoto') {
-					return false;
-				}
-				return null;
-			});
-
-		$this->image->expects($this->never())
-			->method('valid');
-		$this->image->expects($this->never())
-			->method('width');
-		$this->image->expects($this->never())
-			->method('height');
-		$this->image->expects($this->never())
-			->method('centerCrop');
-		$this->image->expects($this->never())
-			->method('data');
-
-		$this->config->expects($this->never())
-			->method('getUserValue');
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$this->avatarManager->expects($this->never())
-			->method('getAvatar');
-
-		$this->connection->expects($this->any())
-			->method('resolveRule')
-			->with('avatar')
-			->willReturn(['jpegphoto', 'thumbnailphoto']);
-
-		$this->user->updateAvatar();
-	}
-
-	public static function extStorageHomeDataProvider(): array {
-		return [
-			[ 'myFolder', null ],
-			[ '', null, false ],
-			[ 'myFolder', 'myFolder' ],
-		];
-	}
-
-	/**
-	 * @dataProvider extStorageHomeDataProvider
-	 */
-	public function testUpdateExtStorageHome(string $expected, ?string $valueFromLDAP = null, bool $isSet = true): void {
-		if ($valueFromLDAP === null) {
-			$this->connection->expects($this->once())
-				->method('__get')
-				->willReturnMap([
-					['ldapExtStorageHomeAttribute', 'homeDirectory'],
-				]);
-
-			$return = [];
-			if ($isSet) {
-				$return[] = $expected;
-			}
-			$this->access->expects($this->once())
-				->method('readAttribute')
-				->with($this->dn, 'homeDirectory')
-				->willReturn($return);
-		}
-
-		if ($expected !== '') {
-			$this->config->expects($this->once())
-				->method('setUserValue')
-				->with($this->uid, 'user_ldap', 'extStorageHome', $expected);
-		} else {
-			$this->config->expects($this->once())
-				->method('deleteUserValue')
-				->with($this->uid, 'user_ldap', 'extStorageHome');
-		}
-
-		$actual = $this->user->updateExtStorageHome($valueFromLDAP);
-		$this->assertSame($expected, $actual);
-	}
-
-	public function testMarkLogin(): void {
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with($this->equalTo($this->uid),
-				$this->equalTo('user_ldap'),
-				$this->equalTo(User::USER_PREFKEY_FIRSTLOGIN),
-				$this->equalTo(1))
-			->willReturn(true);
-
-		$this->user->markLogin();
-	}
-
-	public function testGetAvatarImageProvided(): void {
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn),
-				$this->equalTo('jpegphoto'))
-			->willReturn(['this is a photo']);
-		$this->connection->expects($this->any())
-			->method('resolveRule')
-			->with('avatar')
-			->willReturn(['jpegphoto', 'thumbnailphoto']);
-
-		$photo = $this->user->getAvatarImage();
-		$this->assertSame('this is a photo', $photo);
-		//make sure readAttribute is not called again but the already fetched
-		//photo is returned
-		$this->user->getAvatarImage();
-	}
-
-	public function testGetAvatarImageDisabled(): void {
-		$this->access->expects($this->never())
-			->method('readAttribute')
-			->with($this->equalTo($this->dn), $this->anything());
-		$this->connection->expects($this->any())
-			->method('resolveRule')
-			->with('avatar')
-			->willReturn([]);
-
-		$this->assertFalse($this->user->getAvatarImage());
-	}
-
-	public static function imageDataProvider(): array {
-		return [
-			[ false, false ],
-			[ 'corruptData', false ],
-			[ 'validData', true ],
-		];
-	}
-
-	public function testProcessAttributes(): void {
-		$requiredMethods = [
-			'updateQuota',
-			'updateEmail',
-			'composeAndStoreDisplayName',
-			'storeLDAPUserName',
-			'getHomePath',
-			'updateAvatar',
-			'updateExtStorageHome',
-		];
-
-		/** @var User&MockObject $userMock */
-		$userMock = $this->getMockBuilder(User::class)
-			->setConstructorArgs([
-				$this->uid,
-				$this->dn,
-				$this->access,
-				$this->config,
-				$this->image,
-				$this->logger,
-				$this->avatarManager,
-				$this->userManager,
-				$this->notificationManager
-			])
-			->onlyMethods($requiredMethods)
-			->getMock();
-
-		$this->connection->setConfiguration([
-			'homeFolderNamingRule' => 'homeDirectory'
-		]);
-		$this->connection->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'homeFolderNamingRule') {
-					return 'attr:homeDirectory';
-				}
-				return $name;
-			});
-		$this->connection->expects($this->any())
-			->method('resolveRule')
-			->with('avatar')
-			->willReturn(['jpegphoto', 'thumbnailphoto']);
-
-		$record = [
-			strtolower($this->connection->ldapQuotaAttribute) => ['4096'],
-			strtolower($this->connection->ldapEmailAttribute) => ['alice@wonderland.org'],
-			strtolower($this->connection->ldapUserDisplayName) => ['Aaaaalice'],
-			strtolower($this->connection->ldapExtStorageHomeAttribute) => ['homeDirectory'],
-			'uid' => [$this->uid],
-			'homedirectory' => ['Alice\'s Folder'],
-			'memberof' => ['cn=groupOne', 'cn=groupTwo'],
-			'jpegphoto' => ['here be an image']
-		];
-
-		foreach ($requiredMethods as $method) {
-			$userMock->expects($this->once())
-				->method($method);
-		}
-		\OC_Hook::clear();//disconnect irrelevant hooks
-		$userMock->processAttributes($record);
-		/** @noinspection PhpUnhandledExceptionInspection */
-		\OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
-	}
-
-	public static function emptyHomeFolderAttributeValueProvider(): array {
-		return [
-			'empty' => [''],
-			'prefixOnly' => ['attr:'],
-		];
-	}
-
-	/**
-	 * @dataProvider emptyHomeFolderAttributeValueProvider
-	 */
-	public function testGetHomePathNotConfigured(string $attributeValue): void {
-		$this->connection->expects($this->any())
-			->method('__get')
-			->with($this->equalTo('homeFolderNamingRule'))
-			->willReturn($attributeValue);
-
-		$this->access->expects($this->never())
-			->method('readAttribute');
-
-		$this->config->expects($this->never())
-			->method('getAppValue');
-
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$this->assertFalse($this->user->getHomePath());
-	}
-
-	public function testGetHomePathConfiguredNotAvailableAllowed(): void {
-		$this->connection->expects($this->any())
-			->method('__get')
-			->with($this->equalTo('homeFolderNamingRule'))
-			->willReturn('attr:foobar');
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->willReturn(false);
-
-		$this->access->expects($this->once())
-			->method('username2dn')
-			->willReturn($this->dn);
-
-		// asks for "enforce_home_folder_naming_rule"
-		$this->config->expects($this->once())
-			->method('getAppValue')
-			->willReturn(false);
-
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$this->assertFalse($this->user->getHomePath());
-	}
-
-
-	public function testGetHomePathConfiguredNotAvailableNotAllowed(): void {
-		$this->expectException(\Exception::class);
-
-		$this->connection->expects($this->any())
-			->method('__get')
-			->with($this->equalTo('homeFolderNamingRule'))
-			->willReturn('attr:foobar');
-
-		$this->access->expects($this->once())
-			->method('readAttribute')
-			->willReturn(false);
-
-		$this->access->expects($this->once())
-			->method('username2dn')
-			->willReturn($this->dn);
-
-		// asks for "enforce_home_folder_naming_rule"
-		$this->config->expects($this->once())
-			->method('getAppValue')
-			->willReturn(true);
-
-		$this->user->getHomePath();
-	}
-
-	public static function displayNameProvider(): array {
-		return [
-			['Roland Deschain', '', 'Roland Deschain', false],
-			['Roland Deschain', '', 'Roland Deschain', true],
-			['Roland Deschain', 'gunslinger@darktower.com', 'Roland Deschain (gunslinger@darktower.com)', false],
-			['Roland Deschain', 'gunslinger@darktower.com', 'Roland Deschain (gunslinger@darktower.com)', true],
-		];
-	}
-
-	/**
-	 * @dataProvider displayNameProvider
-	 */
-	public function testComposeAndStoreDisplayName(string $part1, string $part2, string $expected, bool $expectTriggerChange): void {
-		$this->config->expects($this->once())
-			->method('setUserValue');
-		$oldName = $expectTriggerChange ? 'xxGunslingerxx' : null;
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with($this->user->getUsername(), 'user_ldap', 'displayName', null)
-			->willReturn($oldName);
-
-		$ncUserObj = $this->createMock(\OC\User\User::class);
-		if ($expectTriggerChange) {
-			$ncUserObj->expects($this->once())
-				->method('triggerChange')
-				->with('displayName', $expected);
-		} else {
-			$ncUserObj->expects($this->never())
-				->method('triggerChange');
-		}
-		$this->userManager->expects($this->once())
-			->method('get')
-			->willReturn($ncUserObj);
-
-		$displayName = $this->user->composeAndStoreDisplayName($part1, $part2);
-		$this->assertSame($expected, $displayName);
-	}
-
-	public function testComposeAndStoreDisplayNameNoOverwrite(): void {
-		$displayName = 'Randall Flagg';
-		$this->config->expects($this->never())
-			->method('setUserValue');
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->willReturn($displayName);
-
-		$this->userManager->expects($this->never())
-			->method('get'); // Implicit: no triggerChange can be called
-
-		$composedDisplayName = $this->user->composeAndStoreDisplayName($displayName);
-		$this->assertSame($composedDisplayName, $displayName);
-	}
-
-	public function testHandlePasswordExpiryWarningDefaultPolicy(): void {
-		$this->connection->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'ldapDefaultPPolicyDN') {
-					return 'cn=default,ou=policies,dc=foo,dc=bar';
-				}
-				if ($name === 'turnOnPasswordChange') {
-					return '1';
-				}
-				return $name;
-			});
-
-		$this->access->expects($this->any())
-			->method('search')
-			->willReturnCallback(function ($filter, $base) {
-				if ($base === $this->dn) {
-					return [
-						[
-							'pwdchangedtime' => [(new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis') . 'Z'],
-							'pwdgraceusetime' => [],
-						],
-					];
-				}
-				if ($base === 'cn=default,ou=policies,dc=foo,dc=bar') {
-					return [
-						[
-							'pwdmaxage' => ['2592000'],
-							'pwdexpirewarning' => ['2591999'],
-						],
-					];
-				}
-				return [];
-			});
-
-		$notification = $this->getMockBuilder(INotification::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$notification->expects($this->any())
-			->method('setApp')
-			->willReturn($notification);
-		$notification->expects($this->any())
-			->method('setUser')
-			->willReturn($notification);
-		$notification->expects($this->any())
-			->method('setObject')
-			->willReturn($notification);
-		$notification->expects($this->any())
-			->method('setDateTime')
-			->willReturn($notification);
-
-		$this->notificationManager->expects($this->exactly(2))
-			->method('createNotification')
-			->willReturn($notification);
-		$this->notificationManager->expects($this->exactly(1))
-			->method('notify');
-
-		\OC_Hook::clear();//disconnect irrelevant hooks
-		Util::connectHook('OC_User', 'post_login', $this->user, 'handlePasswordExpiry');
-		/** @noinspection PhpUnhandledExceptionInspection */
-		\OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
-	}
-
-	public function testHandlePasswordExpiryWarningCustomPolicy(): void {
-		$this->connection->expects($this->any())
-			->method('__get')
-			->willReturnCallback(function ($name) {
-				if ($name === 'ldapDefaultPPolicyDN') {
-					return 'cn=default,ou=policies,dc=foo,dc=bar';
-				}
-				if ($name === 'turnOnPasswordChange') {
-					return '1';
-				}
-				return $name;
-			});
-
-		$this->access->expects($this->any())
-			->method('search')
-			->willReturnCallback(function ($filter, $base) {
-				if ($base === $this->dn) {
-					return [
-						[
-							'pwdpolicysubentry' => ['cn=custom,ou=policies,dc=foo,dc=bar'],
-							'pwdchangedtime' => [(new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis') . 'Z'],
-							'pwdgraceusetime' => [],
-						]
-					];
-				}
-				if ($base === 'cn=custom,ou=policies,dc=foo,dc=bar') {
-					return [
-						[
-							'pwdmaxage' => ['2592000'],
-							'pwdexpirewarning' => ['2591999'],
-						]
-					];
-				}
-				return [];
-			});
-
-		$notification = $this->getMockBuilder(INotification::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$notification->expects($this->any())
-			->method('setApp')
-			->willReturn($notification);
-		$notification->expects($this->any())
-			->method('setUser')
-			->willReturn($notification);
-		$notification->expects($this->any())
-			->method('setObject')
-			->willReturn($notification);
-		$notification->expects($this->any())
-			->method('setDateTime')
-			->willReturn($notification);
-
-		$this->notificationManager->expects($this->exactly(2))
-			->method('createNotification')
-			->willReturn($notification);
-		$this->notificationManager->expects($this->exactly(1))
-			->method('notify');
-
-		\OC_Hook::clear();//disconnect irrelevant hooks
-		Util::connectHook('OC_User', 'post_login', $this->user, 'handlePasswordExpiry');
-		/** @noinspection PhpUnhandledExceptionInspection */
-		\OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
-	}
+    protected Access&MockObject $access;
+    protected Connection&MockObject $connection;
+    protected IConfig&MockObject $config;
+    protected INotificationManager&MockObject $notificationManager;
+    protected IUserManager&MockObject $userManager;
+    protected Image&MockObject $image;
+    protected IAvatarManager&MockObject $avatarManager;
+    protected LoggerInterface&MockObject $logger;
+    protected string $uid = 'alice';
+    protected string $dn = 'uid=alice,dc=foo,dc=bar';
+    protected User $user;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->connection = $this->getMockBuilder(Connection::class)
+            ->setConstructorArgs([$this->createMock(ILDAPWrapper::class)])
+            ->getMock();
+
+        $this->access = $this->createMock(Access::class);
+        $this->access->connection = $this->connection;
+        $this->access->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connection);
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->avatarManager = $this->createMock(IAvatarManager::class);
+        $this->image = $this->createMock(Image::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->notificationManager = $this->createMock(INotificationManager::class);
+
+        $this->user = new User(
+            $this->uid,
+            $this->dn,
+            $this->access,
+            $this->config,
+            $this->image,
+            $this->logger,
+            $this->avatarManager,
+            $this->userManager,
+            $this->notificationManager
+        );
+    }
+
+    public function testGetDNandUsername(): void {
+        $this->assertSame($this->dn, $this->user->getDN());
+        $this->assertSame($this->uid, $this->user->getUsername());
+    }
+
+    public function testUpdateEmailProvided(): void {
+        $this->connection->expects($this->once())
+            ->method('__get')
+            ->with($this->equalTo('ldapEmailAttribute'))
+            ->willReturn('email');
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('email'))
+            ->willReturn(['alice@foo.bar']);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->once())
+            ->method('setSystemEMailAddress')
+            ->with('alice@foo.bar');
+
+        $this->userManager->expects($this->any())
+            ->method('get')
+            ->willReturn($coreUser);
+
+        $this->user->updateEmail();
+    }
+
+    public function testUpdateEmailNotProvided(): void {
+        $this->connection->expects($this->once())
+            ->method('__get')
+            ->with($this->equalTo('ldapEmailAttribute'))
+            ->willReturn('email');
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('email'))
+            ->willReturn(false);
+
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $this->user->updateEmail();
+    }
+
+    public function testUpdateEmailNotConfigured(): void {
+        $this->connection->expects($this->once())
+            ->method('__get')
+            ->with($this->equalTo('ldapEmailAttribute'))
+            ->willReturn('');
+
+        $this->access->expects($this->never())
+            ->method('readAttribute');
+
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $this->user->updateEmail();
+    }
+
+    public function testUpdateQuotaAllProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '']
+            ]);
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('myquota'))
+            ->willReturn(['42 GB']);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->once())
+            ->method('setQuota')
+            ->with('42 GB');
+
+        $this->userManager->expects($this->atLeastOnce())
+            ->method('get')
+            ->with($this->uid)
+            ->willReturn($coreUser);
+
+        $this->user->updateQuota();
+    }
+
+    public function testUpdateQuotaToDefaultAllProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '']
+            ]);
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('myquota'))
+            ->willReturn(['default']);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->once())
+            ->method('setQuota')
+            ->with('default');
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with($this->uid)
+            ->willReturn($coreUser);
+
+        $this->user->updateQuota();
+    }
+
+    public function testUpdateQuotaToNoneAllProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '']
+            ]);
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('myquota'))
+            ->willReturn(['none']);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->once())
+            ->method('setQuota')
+            ->with('none');
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with($this->uid)
+            ->willReturn($coreUser);
+
+        $this->user->updateQuota();
+    }
+
+    public function testUpdateQuotaDefaultProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '25 GB'],
+            ]);
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('myquota'))
+            ->willReturn(false);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->once())
+            ->method('setQuota')
+            ->with('25 GB');
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with($this->uid)
+            ->willReturn($coreUser);
+
+        $this->user->updateQuota();
+    }
+
+    public function testUpdateQuotaIndividualProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '']
+            ]);
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('myquota'))
+            ->willReturn(['27 GB']);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->once())
+            ->method('setQuota')
+            ->with('27 GB');
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with($this->uid)
+            ->willReturn($coreUser);
+
+        $this->user->updateQuota();
+    }
+
+    public function testUpdateQuotaNoneProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '']
+            ]);
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('myquota'))
+            ->willReturn(false);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->never())
+            ->method('setQuota');
+
+        $this->userManager->expects($this->never())
+            ->method('get')
+            ->with($this->uid);
+
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $this->user->updateQuota();
+    }
+
+    public function testUpdateQuotaNoneConfigured(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', ''],
+                ['ldapQuotaDefault', '']
+            ]);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->never())
+            ->method('setQuota');
+
+        $this->userManager->expects($this->never())
+            ->method('get');
+
+        $this->access->expects($this->never())
+            ->method('readAttribute');
+
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $this->user->updateQuota();
+    }
+
+    public function testUpdateQuotaFromValue(): void {
+        $readQuota = '19 GB';
+
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '']
+            ]);
+
+        $this->access->expects($this->never())
+            ->method('readAttribute');
+
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())
+            ->method('setQuota')
+            ->with($readQuota);
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with($this->uid)
+            ->willReturn($user);
+
+        $this->user->updateQuota($readQuota);
+    }
+
+    /**
+     * Unparseable quota will fallback to use the LDAP default
+     */
+    public function testUpdateWrongQuotaAllProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '23 GB']
+            ]);
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('myquota'))
+            ->willReturn(['42 GBwos']);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->once())
+            ->method('setQuota')
+            ->with('23 GB');
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with($this->uid)
+            ->willReturn($coreUser);
+
+        $this->user->updateQuota();
+    }
+
+    /**
+     * No user quota and wrong default will set 'default' as quota
+     */
+    public function testUpdateWrongDefaultQuotaProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '23 GBwowowo']
+            ]);
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('myquota'))
+            ->willReturn(false);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->never())
+            ->method('setQuota');
+
+        $this->userManager->expects($this->never())
+            ->method('get');
+
+        $this->user->updateQuota();
+    }
+
+    /**
+     * Wrong user quota and wrong default will set 'default' as quota
+     */
+    public function testUpdateWrongQuotaAndDefaultAllProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', 'myquota'],
+                ['ldapQuotaDefault', '23 GBwowowo']
+            ]);
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('myquota'))
+            ->willReturn(['23 flush']);
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->never())
+            ->method('setQuota');
+
+        $this->userManager->expects($this->never())
+            ->method('get');
+
+        $this->user->updateQuota();
+    }
+
+    /**
+     * No quota attribute set and wrong default will set 'default' as quota
+     */
+    public function testUpdateWrongDefaultQuotaNotProvided(): void {
+        $this->connection->expects($this->exactly(2))
+            ->method('__get')
+            ->willReturnMap([
+                ['ldapQuotaAttribute', ''],
+                ['ldapQuotaDefault', '23 GBwowowo']
+            ]);
+
+        $this->access->expects($this->never())
+            ->method('readAttribute');
+
+        $coreUser = $this->createMock(IUser::class);
+        $coreUser->expects($this->never())
+            ->method('setQuota');
+
+        $this->userManager->expects($this->never())
+            ->method('get');
+
+        $this->user->updateQuota();
+    }
+
+    //the testUpdateAvatar series also implicitly tests getAvatarImage
+    public function XtestUpdateAvatarJpegPhotoProvided() {
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('jpegphoto'))
+            ->willReturn(['this is a photo']);
+
+        $this->image->expects($this->once())
+            ->method('loadFromBase64')
+            ->willReturn('imageResource');
+        $this->image->expects($this->once())
+            ->method('valid')
+            ->willReturn(true);
+        $this->image->expects($this->once())
+            ->method('width')
+            ->willReturn(128);
+        $this->image->expects($this->once())
+            ->method('height')
+            ->willReturn(128);
+        $this->image->expects($this->once())
+            ->method('centerCrop')
+            ->willReturn(true);
+        $this->image->expects($this->once())
+            ->method('data')
+            ->willReturn('this is a photo');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with($this->uid, 'user_ldap', 'lastAvatarChecksum', '')
+            ->willReturn('');
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with($this->uid, 'user_ldap', 'lastAvatarChecksum', md5('this is a photo'));
+
+        $avatar = $this->createMock(IAvatar::class);
+        $avatar->expects($this->once())
+            ->method('set')
+            ->with($this->image);
+
+        $this->avatarManager->expects($this->once())
+            ->method('getAvatar')
+            ->with($this->equalTo($this->uid))
+            ->willReturn($avatar);
+
+        $this->connection->expects($this->any())
+            ->method('resolveRule')
+            ->with('avatar')
+            ->willReturn(['jpegphoto', 'thumbnailphoto']);
+
+        $this->user->updateAvatar();
+    }
+
+    public function testUpdateAvatarKnownJpegPhotoProvided(): void {
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('jpegphoto'))
+            ->willReturn(['this is a photo']);
+
+        $this->image->expects($this->once())
+            ->method('loadFromBase64')
+            ->willReturn('imageResource');
+        $this->image->expects($this->never())
+            ->method('valid');
+        $this->image->expects($this->never())
+            ->method('width');
+        $this->image->expects($this->never())
+            ->method('height');
+        $this->image->expects($this->never())
+            ->method('centerCrop');
+        $this->image->expects($this->once())
+            ->method('data')
+            ->willReturn('this is a photo');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with($this->uid, 'user_ldap', 'lastAvatarChecksum', '')
+            ->willReturn(md5('this is a photo'));
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $avatar = $this->createMock(IAvatar::class);
+        $avatar->expects($this->never())
+            ->method('set');
+        $avatar->expects($this->any())
+            ->method('exists')
+            ->willReturn(true);
+        $avatar->expects($this->any())
+            ->method('isCustomAvatar')
+            ->willReturn(true);
+
+        $this->avatarManager->expects($this->any())
+            ->method('getAvatar')
+            ->with($this->uid)
+            ->willReturn($avatar);
+
+        $this->connection->expects($this->any())
+            ->method('resolveRule')
+            ->with('avatar')
+            ->willReturn(['jpegphoto', 'thumbnailphoto']);
+
+        $this->assertTrue($this->user->updateAvatar());
+    }
+
+    public function XtestUpdateAvatarThumbnailPhotoProvided() {
+        $this->access->expects($this->any())
+            ->method('readAttribute')
+            ->willReturnCallback(function ($dn, $attr) {
+                if ($dn === $this->dn
+                    && $attr === 'jpegphoto') {
+                    return false;
+                } elseif ($dn === $this->dn
+                    && $attr === 'thumbnailphoto') {
+                    return ['this is a photo'];
+                }
+                return null;
+            });
+
+        $this->image->expects($this->once())
+            ->method('loadFromBase64')
+            ->willReturn('imageResource');
+        $this->image->expects($this->once())
+            ->method('valid')
+            ->willReturn(true);
+        $this->image->expects($this->once())
+            ->method('width')
+            ->willReturn(128);
+        $this->image->expects($this->once())
+            ->method('height')
+            ->willReturn(128);
+        $this->image->expects($this->once())
+            ->method('centerCrop')
+            ->willReturn(true);
+        $this->image->expects($this->once())
+            ->method('data')
+            ->willReturn('this is a photo');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with($this->uid, 'user_ldap', 'lastAvatarChecksum', '')
+            ->willReturn('');
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with($this->uid, 'user_ldap', 'lastAvatarChecksum', md5('this is a photo'));
+
+        $avatar = $this->createMock(IAvatar::class);
+        $avatar->expects($this->once())
+            ->method('set')
+            ->with($this->image);
+
+        $this->avatarManager->expects($this->once())
+            ->method('getAvatar')
+            ->with($this->equalTo($this->uid))
+            ->willReturn($avatar);
+
+        $this->connection->expects($this->any())
+            ->method('resolveRule')
+            ->with('avatar')
+            ->willReturn(['jpegphoto', 'thumbnailphoto']);
+
+        $this->user->updateAvatar();
+    }
+
+    public function testUpdateAvatarCorruptPhotoProvided(): void {
+        $this->access->expects($this->any())
+            ->method('readAttribute')
+            ->willReturnCallback(function ($dn, $attr) {
+                if ($dn === $this->dn
+                    && $attr === 'jpegphoto') {
+                    return false;
+                } elseif ($dn === $this->dn
+                    && $attr === 'thumbnailphoto') {
+                    return ['this is a photo'];
+                }
+                return null;
+            });
+
+        $this->image->expects($this->once())
+            ->method('loadFromBase64')
+            ->willReturn(false);
+        $this->image->expects($this->never())
+            ->method('valid');
+        $this->image->expects($this->never())
+            ->method('width');
+        $this->image->expects($this->never())
+            ->method('height');
+        $this->image->expects($this->never())
+            ->method('centerCrop');
+        $this->image->expects($this->never())
+            ->method('data');
+
+        $this->config->expects($this->never())
+            ->method('getUserValue');
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $avatar = $this->createMock(IAvatar::class);
+        $avatar->expects($this->never())
+            ->method('set');
+
+        $this->avatarManager->expects($this->never())
+            ->method('getAvatar');
+
+        $this->connection->expects($this->any())
+            ->method('resolveRule')
+            ->with('avatar')
+            ->willReturn(['jpegphoto', 'thumbnailphoto']);
+
+        $this->user->updateAvatar();
+    }
+
+    public function XtestUpdateAvatarUnsupportedThumbnailPhotoProvided() {
+        $this->access->expects($this->any())
+            ->method('readAttribute')
+            ->willReturnCallback(function ($dn, $attr) {
+                if ($dn === $this->dn
+                    && $attr === 'jpegphoto') {
+                    return false;
+                } elseif ($dn === $this->dn
+                    && $attr === 'thumbnailphoto') {
+                    return ['this is a photo'];
+                }
+                return null;
+            });
+
+        $this->image->expects($this->once())
+            ->method('loadFromBase64')
+            ->willReturn('imageResource');
+        $this->image->expects($this->once())
+            ->method('valid')
+            ->willReturn(true);
+        $this->image->expects($this->once())
+            ->method('width')
+            ->willReturn(128);
+        $this->image->expects($this->once())
+            ->method('height')
+            ->willReturn(128);
+        $this->image->expects($this->once())
+            ->method('centerCrop')
+            ->willReturn(true);
+        $this->image->expects($this->once())
+            ->method('data')
+            ->willReturn('this is a photo');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with($this->uid, 'user_ldap', 'lastAvatarChecksum', '')
+            ->willReturn('');
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $avatar = $this->createMock(IAvatar::class);
+        $avatar->expects($this->once())
+            ->method('set')
+            ->with($this->image)
+            ->willThrowException(new \Exception());
+
+        $this->avatarManager->expects($this->once())
+            ->method('getAvatar')
+            ->with($this->equalTo($this->uid))
+            ->willReturn($avatar);
+
+        $this->connection->expects($this->any())
+            ->method('resolveRule')
+            ->with('avatar')
+            ->willReturn(['jpegphoto', 'thumbnailphoto']);
+
+        $this->assertFalse($this->user->updateAvatar());
+    }
+
+    public function testUpdateAvatarNotProvided(): void {
+        $this->access->expects($this->any())
+            ->method('readAttribute')
+            ->willReturnCallback(function ($dn, $attr) {
+                if ($dn === $this->dn
+                    && $attr === 'jpegPhoto') {
+                    return false;
+                } elseif ($dn === $this->dn
+                    && $attr === 'thumbnailPhoto') {
+                    return false;
+                }
+                return null;
+            });
+
+        $this->image->expects($this->never())
+            ->method('valid');
+        $this->image->expects($this->never())
+            ->method('width');
+        $this->image->expects($this->never())
+            ->method('height');
+        $this->image->expects($this->never())
+            ->method('centerCrop');
+        $this->image->expects($this->never())
+            ->method('data');
+
+        $this->config->expects($this->never())
+            ->method('getUserValue');
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $this->avatarManager->expects($this->never())
+            ->method('getAvatar');
+
+        $this->connection->expects($this->any())
+            ->method('resolveRule')
+            ->with('avatar')
+            ->willReturn(['jpegphoto', 'thumbnailphoto']);
+
+        $this->user->updateAvatar();
+    }
+
+    public static function extStorageHomeDataProvider(): array {
+        return [
+            [ 'myFolder', null ],
+            [ '', null, false ],
+            [ 'myFolder', 'myFolder' ],
+        ];
+    }
+
+    /**
+     * @dataProvider extStorageHomeDataProvider
+     */
+    public function testUpdateExtStorageHome(string $expected, ?string $valueFromLDAP = null, bool $isSet = true): void {
+        if ($valueFromLDAP === null) {
+            $this->connection->expects($this->once())
+                ->method('__get')
+                ->willReturnMap([
+                    ['ldapExtStorageHomeAttribute', 'homeDirectory'],
+                ]);
+
+            $return = [];
+            if ($isSet) {
+                $return[] = $expected;
+            }
+            $this->access->expects($this->once())
+                ->method('readAttribute')
+                ->with($this->dn, 'homeDirectory')
+                ->willReturn($return);
+        }
+
+        if ($expected !== '') {
+            $this->config->expects($this->once())
+                ->method('setUserValue')
+                ->with($this->uid, 'user_ldap', 'extStorageHome', $expected);
+        } else {
+            $this->config->expects($this->once())
+                ->method('deleteUserValue')
+                ->with($this->uid, 'user_ldap', 'extStorageHome');
+        }
+
+        $actual = $this->user->updateExtStorageHome($valueFromLDAP);
+        $this->assertSame($expected, $actual);
+    }
+
+    public function testMarkLogin(): void {
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with($this->equalTo($this->uid),
+                $this->equalTo('user_ldap'),
+                $this->equalTo(User::USER_PREFKEY_FIRSTLOGIN),
+                $this->equalTo(1))
+            ->willReturn(true);
+
+        $this->user->markLogin();
+    }
+
+    public function testGetAvatarImageProvided(): void {
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn),
+                $this->equalTo('jpegphoto'))
+            ->willReturn(['this is a photo']);
+        $this->connection->expects($this->any())
+            ->method('resolveRule')
+            ->with('avatar')
+            ->willReturn(['jpegphoto', 'thumbnailphoto']);
+
+        $photo = $this->user->getAvatarImage();
+        $this->assertSame('this is a photo', $photo);
+        //make sure readAttribute is not called again but the already fetched
+        //photo is returned
+        $this->user->getAvatarImage();
+    }
+
+    public function testGetAvatarImageDisabled(): void {
+        $this->access->expects($this->never())
+            ->method('readAttribute')
+            ->with($this->equalTo($this->dn), $this->anything());
+        $this->connection->expects($this->any())
+            ->method('resolveRule')
+            ->with('avatar')
+            ->willReturn([]);
+
+        $this->assertFalse($this->user->getAvatarImage());
+    }
+
+    public static function imageDataProvider(): array {
+        return [
+            [ false, false ],
+            [ 'corruptData', false ],
+            [ 'validData', true ],
+        ];
+    }
+
+    public function testProcessAttributes(): void {
+        $requiredMethods = [
+            'updateQuota',
+            'updateEmail',
+            'composeAndStoreDisplayName',
+            'storeLDAPUserName',
+            'getHomePath',
+            'updateAvatar',
+            'updateExtStorageHome',
+        ];
+
+        /** @var User&MockObject $userMock */
+        $userMock = $this->getMockBuilder(User::class)
+            ->setConstructorArgs([
+                $this->uid,
+                $this->dn,
+                $this->access,
+                $this->config,
+                $this->image,
+                $this->logger,
+                $this->avatarManager,
+                $this->userManager,
+                $this->notificationManager
+            ])
+            ->onlyMethods($requiredMethods)
+            ->getMock();
+
+        $this->connection->setConfiguration([
+            'homeFolderNamingRule' => 'homeDirectory'
+        ]);
+        $this->connection->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'homeFolderNamingRule') {
+                    return 'attr:homeDirectory';
+                }
+                return $name;
+            });
+        $this->connection->expects($this->any())
+            ->method('resolveRule')
+            ->with('avatar')
+            ->willReturn(['jpegphoto', 'thumbnailphoto']);
+
+        $record = [
+            strtolower($this->connection->ldapQuotaAttribute) => ['4096'],
+            strtolower($this->connection->ldapEmailAttribute) => ['alice@wonderland.org'],
+            strtolower($this->connection->ldapUserDisplayName) => ['Aaaaalice'],
+            strtolower($this->connection->ldapExtStorageHomeAttribute) => ['homeDirectory'],
+            'uid' => [$this->uid],
+            'homedirectory' => ['Alice\'s Folder'],
+            'memberof' => ['cn=groupOne', 'cn=groupTwo'],
+            'jpegphoto' => ['here be an image']
+        ];
+
+        foreach ($requiredMethods as $method) {
+            $userMock->expects($this->once())
+                ->method($method);
+        }
+        \OC_Hook::clear();//disconnect irrelevant hooks
+        $userMock->processAttributes($record);
+        /** @noinspection PhpUnhandledExceptionInspection */
+        \OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
+    }
+
+    public static function emptyHomeFolderAttributeValueProvider(): array {
+        return [
+            'empty' => [''],
+            'prefixOnly' => ['attr:'],
+        ];
+    }
+
+    /**
+     * @dataProvider emptyHomeFolderAttributeValueProvider
+     */
+    public function testGetHomePathNotConfigured(string $attributeValue): void {
+        $this->connection->expects($this->any())
+            ->method('__get')
+            ->with($this->equalTo('homeFolderNamingRule'))
+            ->willReturn($attributeValue);
+
+        $this->access->expects($this->never())
+            ->method('readAttribute');
+
+        $this->config->expects($this->never())
+            ->method('getAppValue');
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->assertFalse($this->user->getHomePath());
+    }
+
+    public function testGetHomePathConfiguredNotAvailableAllowed(): void {
+        $this->connection->expects($this->any())
+            ->method('__get')
+            ->with($this->equalTo('homeFolderNamingRule'))
+            ->willReturn('attr:foobar');
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->willReturn(false);
+
+        $this->access->expects($this->once())
+            ->method('username2dn')
+            ->willReturn($this->dn);
+
+        // asks for "enforce_home_folder_naming_rule"
+        $this->config->expects($this->once())
+            ->method('getAppValue')
+            ->willReturn(false);
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->assertFalse($this->user->getHomePath());
+    }
+
+
+    public function testGetHomePathConfiguredNotAvailableNotAllowed(): void {
+        $this->expectException(\Exception::class);
+
+        $this->connection->expects($this->any())
+            ->method('__get')
+            ->with($this->equalTo('homeFolderNamingRule'))
+            ->willReturn('attr:foobar');
+
+        $this->access->expects($this->once())
+            ->method('readAttribute')
+            ->willReturn(false);
+
+        $this->access->expects($this->once())
+            ->method('username2dn')
+            ->willReturn($this->dn);
+
+        // asks for "enforce_home_folder_naming_rule"
+        $this->config->expects($this->once())
+            ->method('getAppValue')
+            ->willReturn(true);
+
+        $this->user->getHomePath();
+    }
+
+    public static function displayNameProvider(): array {
+        return [
+            ['Roland Deschain', '', 'Roland Deschain', false],
+            ['Roland Deschain', '', 'Roland Deschain', true],
+            ['Roland Deschain', 'gunslinger@darktower.com', 'Roland Deschain (gunslinger@darktower.com)', false],
+            ['Roland Deschain', 'gunslinger@darktower.com', 'Roland Deschain (gunslinger@darktower.com)', true],
+        ];
+    }
+
+    /**
+     * @dataProvider displayNameProvider
+     */
+    public function testComposeAndStoreDisplayName(string $part1, string $part2, string $expected, bool $expectTriggerChange): void {
+        $this->config->expects($this->once())
+            ->method('setUserValue');
+        $oldName = $expectTriggerChange ? 'xxGunslingerxx' : null;
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with($this->user->getUsername(), 'user_ldap', 'displayName', null)
+            ->willReturn($oldName);
+
+        $ncUserObj = $this->createMock(\OC\User\User::class);
+        if ($expectTriggerChange) {
+            $ncUserObj->expects($this->once())
+                ->method('triggerChange')
+                ->with('displayName', $expected);
+        } else {
+            $ncUserObj->expects($this->never())
+                ->method('triggerChange');
+        }
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->willReturn($ncUserObj);
+
+        $displayName = $this->user->composeAndStoreDisplayName($part1, $part2);
+        $this->assertSame($expected, $displayName);
+    }
+
+    public function testComposeAndStoreDisplayNameNoOverwrite(): void {
+        $displayName = 'Randall Flagg';
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->willReturn($displayName);
+
+        $this->userManager->expects($this->never())
+            ->method('get'); // Implicit: no triggerChange can be called
+
+        $composedDisplayName = $this->user->composeAndStoreDisplayName($displayName);
+        $this->assertSame($composedDisplayName, $displayName);
+    }
+
+    public function testHandlePasswordExpiryWarningDefaultPolicy(): void {
+        $this->connection->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'ldapDefaultPPolicyDN') {
+                    return 'cn=default,ou=policies,dc=foo,dc=bar';
+                }
+                if ($name === 'turnOnPasswordChange') {
+                    return '1';
+                }
+                return $name;
+            });
+
+        $this->access->expects($this->any())
+            ->method('search')
+            ->willReturnCallback(function ($filter, $base) {
+                if ($base === $this->dn) {
+                    return [
+                        [
+                            'pwdchangedtime' => [(new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis') . 'Z'],
+                            'pwdgraceusetime' => [],
+                        ],
+                    ];
+                }
+                if ($base === 'cn=default,ou=policies,dc=foo,dc=bar') {
+                    return [
+                        [
+                            'pwdmaxage' => ['2592000'],
+                            'pwdexpirewarning' => ['2591999'],
+                        ],
+                    ];
+                }
+                return [];
+            });
+
+        $notification = $this->getMockBuilder(INotification::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $notification->expects($this->any())
+            ->method('setApp')
+            ->willReturn($notification);
+        $notification->expects($this->any())
+            ->method('setUser')
+            ->willReturn($notification);
+        $notification->expects($this->any())
+            ->method('setObject')
+            ->willReturn($notification);
+        $notification->expects($this->any())
+            ->method('setDateTime')
+            ->willReturn($notification);
+
+        $this->notificationManager->expects($this->exactly(2))
+            ->method('createNotification')
+            ->willReturn($notification);
+        $this->notificationManager->expects($this->exactly(1))
+            ->method('notify');
+
+        \OC_Hook::clear();//disconnect irrelevant hooks
+        Util::connectHook('OC_User', 'post_login', $this->user, 'handlePasswordExpiry');
+        /** @noinspection PhpUnhandledExceptionInspection */
+        \OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
+    }
+
+    public function testHandlePasswordExpiryWarningCustomPolicy(): void {
+        $this->connection->expects($this->any())
+            ->method('__get')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'ldapDefaultPPolicyDN') {
+                    return 'cn=default,ou=policies,dc=foo,dc=bar';
+                }
+                if ($name === 'turnOnPasswordChange') {
+                    return '1';
+                }
+                return $name;
+            });
+
+        $this->access->expects($this->any())
+            ->method('search')
+            ->willReturnCallback(function ($filter, $base) {
+                if ($base === $this->dn) {
+                    return [
+                        [
+                            'pwdpolicysubentry' => ['cn=custom,ou=policies,dc=foo,dc=bar'],
+                            'pwdchangedtime' => [(new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis') . 'Z'],
+                            'pwdgraceusetime' => [],
+                        ]
+                    ];
+                }
+                if ($base === 'cn=custom,ou=policies,dc=foo,dc=bar') {
+                    return [
+                        [
+                            'pwdmaxage' => ['2592000'],
+                            'pwdexpirewarning' => ['2591999'],
+                        ]
+                    ];
+                }
+                return [];
+            });
+
+        $notification = $this->getMockBuilder(INotification::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $notification->expects($this->any())
+            ->method('setApp')
+            ->willReturn($notification);
+        $notification->expects($this->any())
+            ->method('setUser')
+            ->willReturn($notification);
+        $notification->expects($this->any())
+            ->method('setObject')
+            ->willReturn($notification);
+        $notification->expects($this->any())
+            ->method('setDateTime')
+            ->willReturn($notification);
+
+        $this->notificationManager->expects($this->exactly(2))
+            ->method('createNotification')
+            ->willReturn($notification);
+        $this->notificationManager->expects($this->exactly(1))
+            ->method('notify');
+
+        \OC_Hook::clear();//disconnect irrelevant hooks
+        Util::connectHook('OC_User', 'post_login', $this->user, 'handlePasswordExpiry');
+        /** @noinspection PhpUnhandledExceptionInspection */
+        \OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -568,7 +568,7 @@ 
 	public function XtestUpdateAvatarThumbnailPhotoProvided() {
 		$this->access->expects($this->any())
 			->method('readAttribute')
-			->willReturnCallback(function ($dn, $attr) {
+			->willReturnCallback(function($dn, $attr) {
 				if ($dn === $this->dn
 					&& $attr === 'jpegphoto') {
 					return false;
@@ -627,7 +627,7 @@ 
 	public function testUpdateAvatarCorruptPhotoProvided(): void {
 		$this->access->expects($this->any())
 			->method('readAttribute')
-			->willReturnCallback(function ($dn, $attr) {
+			->willReturnCallback(function($dn, $attr) {
 				if ($dn === $this->dn
 					&& $attr === 'jpegphoto') {
 					return false;
@@ -675,7 +675,7 @@ 
 	public function XtestUpdateAvatarUnsupportedThumbnailPhotoProvided() {
 		$this->access->expects($this->any())
 			->method('readAttribute')
-			->willReturnCallback(function ($dn, $attr) {
+			->willReturnCallback(function($dn, $attr) {
 				if ($dn === $this->dn
 					&& $attr === 'jpegphoto') {
 					return false;
@@ -734,7 +734,7 @@ 
 	public function testUpdateAvatarNotProvided(): void {
 		$this->access->expects($this->any())
 			->method('readAttribute')
-			->willReturnCallback(function ($dn, $attr) {
+			->willReturnCallback(function($dn, $attr) {
 				if ($dn === $this->dn
 					&& $attr === 'jpegPhoto') {
 					return false;
@@ -774,9 +774,9 @@ 
 
 	public static function extStorageHomeDataProvider(): array {
 		return [
-			[ 'myFolder', null ],
-			[ '', null, false ],
-			[ 'myFolder', 'myFolder' ],
+			['myFolder', null],
+			['', null, false],
+			['myFolder', 'myFolder'],
 		];
 	}
 
@@ -859,9 +859,9 @@ 
 
 	public static function imageDataProvider(): array {
 		return [
-			[ false, false ],
-			[ 'corruptData', false ],
-			[ 'validData', true ],
+			[false, false],
+			['corruptData', false],
+			['validData', true],
 		];
 	}
 
@@ -897,7 +897,7 @@ 
 		]);
 		$this->connection->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'homeFolderNamingRule') {
 					return 'attr:homeDirectory';
 				}
@@ -923,7 +923,7 @@ 
 			$userMock->expects($this->once())
 				->method($method);
 		}
-		\OC_Hook::clear();//disconnect irrelevant hooks
+		\OC_Hook::clear(); //disconnect irrelevant hooks
 		$userMock->processAttributes($record);
 		/** @noinspection PhpUnhandledExceptionInspection */
 		\OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
@@ -1059,7 +1059,7 @@ 
 	public function testHandlePasswordExpiryWarningDefaultPolicy(): void {
 		$this->connection->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'ldapDefaultPPolicyDN') {
 					return 'cn=default,ou=policies,dc=foo,dc=bar';
 				}
@@ -1071,11 +1071,11 @@ 
 
 		$this->access->expects($this->any())
 			->method('search')
-			->willReturnCallback(function ($filter, $base) {
+			->willReturnCallback(function($filter, $base) {
 				if ($base === $this->dn) {
 					return [
 						[
-							'pwdchangedtime' => [(new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis') . 'Z'],
+							'pwdchangedtime' => [(new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis').'Z'],
 							'pwdgraceusetime' => [],
 						],
 					];
@@ -1113,7 +1113,7 @@ 
 		$this->notificationManager->expects($this->exactly(1))
 			->method('notify');
 
-		\OC_Hook::clear();//disconnect irrelevant hooks
+		\OC_Hook::clear(); //disconnect irrelevant hooks
 		Util::connectHook('OC_User', 'post_login', $this->user, 'handlePasswordExpiry');
 		/** @noinspection PhpUnhandledExceptionInspection */
 		\OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
@@ -1122,7 +1122,7 @@ 
 	public function testHandlePasswordExpiryWarningCustomPolicy(): void {
 		$this->connection->expects($this->any())
 			->method('__get')
-			->willReturnCallback(function ($name) {
+			->willReturnCallback(function($name) {
 				if ($name === 'ldapDefaultPPolicyDN') {
 					return 'cn=default,ou=policies,dc=foo,dc=bar';
 				}
@@ -1134,12 +1134,12 @@ 
 
 		$this->access->expects($this->any())
 			->method('search')
-			->willReturnCallback(function ($filter, $base) {
+			->willReturnCallback(function($filter, $base) {
 				if ($base === $this->dn) {
 					return [
 						[
 							'pwdpolicysubentry' => ['cn=custom,ou=policies,dc=foo,dc=bar'],
-							'pwdchangedtime' => [(new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis') . 'Z'],
+							'pwdchangedtime' => [(new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis').'Z'],
 							'pwdgraceusetime' => [],
 						]
 					];
@@ -1177,7 +1177,7 @@ 
 		$this->notificationManager->expects($this->exactly(1))
 			->method('notify');
 
-		\OC_Hook::clear();//disconnect irrelevant hooks
+		\OC_Hook::clear(); //disconnect irrelevant hooks
 		Util::connectHook('OC_User', 'post_login', $this->user, 'handlePasswordExpiry');
 		/** @noinspection PhpUnhandledExceptionInspection */
 		\OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);

apps/user_ldap/tests/User/OfflineUserTest.php

Indentation +41 added lines, -41 removed lines

@@ -17,51 +17,51 @@
 use Test\TestCase;
 
 class OfflineUserTest extends TestCase {
-	protected UserMapping&MockObject $mapping;
-	protected string $uid;
-	protected IConfig&MockObject $config;
-	protected IManager&MockObject $shareManager;
-	protected OfflineUser $offlineUser;
+    protected UserMapping&MockObject $mapping;
+    protected string $uid;
+    protected IConfig&MockObject $config;
+    protected IManager&MockObject $shareManager;
+    protected OfflineUser $offlineUser;
 
-	public function setUp(): void {
-		$this->uid = 'deborah';
-		$this->config = $this->createMock(IConfig::class);
-		$this->mapping = $this->createMock(UserMapping::class);
-		$this->shareManager = $this->createMock(IManager::class);
+    public function setUp(): void {
+        $this->uid = 'deborah';
+        $this->config = $this->createMock(IConfig::class);
+        $this->mapping = $this->createMock(UserMapping::class);
+        $this->shareManager = $this->createMock(IManager::class);
 
-		$this->offlineUser = new OfflineUser(
-			$this->uid,
-			$this->config,
-			$this->mapping,
-			$this->shareManager
-		);
-	}
+        $this->offlineUser = new OfflineUser(
+            $this->uid,
+            $this->config,
+            $this->mapping,
+            $this->shareManager
+        );
+    }
 
-	public static function shareOwnerProvider(): array {
-		return [
-			[[], false],
-			[[IShare::TYPE_USER], true],
-			[[IShare::TYPE_GROUP, IShare::TYPE_LINK], true],
-			[[IShare::TYPE_EMAIL, IShare::TYPE_REMOTE, IShare::TYPE_CIRCLE], true],
-			[[IShare::TYPE_GUEST, IShare::TYPE_REMOTE_GROUP, IShare::TYPE_ROOM], true],
-		];
-	}
+    public static function shareOwnerProvider(): array {
+        return [
+            [[], false],
+            [[IShare::TYPE_USER], true],
+            [[IShare::TYPE_GROUP, IShare::TYPE_LINK], true],
+            [[IShare::TYPE_EMAIL, IShare::TYPE_REMOTE, IShare::TYPE_CIRCLE], true],
+            [[IShare::TYPE_GUEST, IShare::TYPE_REMOTE_GROUP, IShare::TYPE_ROOM], true],
+        ];
+    }
 
-	/**
-	 * @dataProvider shareOwnerProvider
-	 */
-	public function testHasActiveShares(array $existingShareTypes, bool $expected): void {
-		$shareMock = $this->createMock(IShare::class);
+    /**
+     * @dataProvider shareOwnerProvider
+     */
+    public function testHasActiveShares(array $existingShareTypes, bool $expected): void {
+        $shareMock = $this->createMock(IShare::class);
 
-		$this->shareManager->expects($this->atLeastOnce())
-			->method('getSharesBy')
-			->willReturnCallback(function (string $uid, int $shareType) use ($existingShareTypes, $shareMock) {
-				if (in_array($shareType, $existingShareTypes)) {
-					return [$shareMock];
-				}
-				return [];
-			});
+        $this->shareManager->expects($this->atLeastOnce())
+            ->method('getSharesBy')
+            ->willReturnCallback(function (string $uid, int $shareType) use ($existingShareTypes, $shareMock) {
+                if (in_array($shareType, $existingShareTypes)) {
+                    return [$shareMock];
+                }
+                return [];
+            });
 
-		$this->assertSame($expected, $this->offlineUser->getHasActiveShares());
-	}
+        $this->assertSame($expected, $this->offlineUser->getHasActiveShares());
+    }
 }

apps/user_ldap/tests/User/ManagerTest.php

Indentation +175 added lines, -175 removed lines

@@ -31,179 +31,179 @@
  * @package OCA\User_LDAP\Tests\User
  */
 class ManagerTest extends \Test\TestCase {
-	protected Access&MockObject $access;
-	protected IConfig&MockObject $config;
-	protected LoggerInterface&MockObject $logger;
-	protected IAvatarManager&MockObject $avatarManager;
-	protected Image&MockObject $image;
-	protected IDBConnection&MockObject $dbc;
-	protected IUserManager&MockObject $ncUserManager;
-	protected INotificationManager&MockObject $notificationManager;
-	protected ILDAPWrapper&MockObject $ldapWrapper;
-	protected Connection $connection;
-	protected IManager&MockObject $shareManager;
-	protected Manager $manager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->access = $this->createMock(Access::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->avatarManager = $this->createMock(IAvatarManager::class);
-		$this->image = $this->createMock(Image::class);
-		$this->ncUserManager = $this->createMock(IUserManager::class);
-		$this->notificationManager = $this->createMock(INotificationManager::class);
-		$this->ldapWrapper = $this->createMock(ILDAPWrapper::class);
-		$this->shareManager = $this->createMock(IManager::class);
-
-		$this->connection = new Connection($this->ldapWrapper, '', null);
-
-		$this->access->expects($this->any())
-			->method('getConnection')
-			->willReturn($this->connection);
-
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$this->manager = new Manager(
-			$this->config,
-			$this->logger,
-			$this->avatarManager,
-			$this->image,
-			$this->ncUserManager,
-			$this->notificationManager,
-			$this->shareManager
-		);
-
-		$this->manager->setLdapAccess($this->access);
-	}
-
-	public static function dnProvider(): array {
-		return [
-			['cn=foo,dc=foobar,dc=bar'],
-			['uid=foo,o=foobar,c=bar'],
-			['ab=cde,f=ghei,mno=pq'],
-		];
-	}
-
-	/**
-	 * @dataProvider dnProvider
-	 */
-	public function testGetByDNExisting(string $inputDN): void {
-		$uid = '563418fc-423b-1033-8d1c-ad5f418ee02e';
-
-		$this->access->expects($this->once())
-			->method('stringResemblesDN')
-			->with($this->equalTo($inputDN))
-			->willReturn(true);
-		$this->access->expects($this->once())
-			->method('dn2username')
-			->with($this->equalTo($inputDN))
-			->willReturn($uid);
-		$this->access->expects($this->never())
-			->method('username2dn');
-
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$this->manager->get($inputDN);
-
-		// Now we fetch the user again. If this leads to a failing test,
-		// runtime caching the manager is broken.
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$user = $this->manager->get($inputDN);
-
-		$this->assertInstanceOf(User::class, $user);
-	}
-
-	public function testGetByDNNotExisting(): void {
-		$inputDN = 'cn=gone,dc=foobar,dc=bar';
-
-		$this->access->expects($this->once())
-			->method('stringResemblesDN')
-			->with($this->equalTo($inputDN))
-			->willReturn(true);
-		$this->access->expects($this->once())
-			->method('dn2username')
-			->with($this->equalTo($inputDN))
-			->willReturn(false);
-		$this->access->expects($this->once())
-			->method('username2dn')
-			->with($this->equalTo($inputDN))
-			->willReturn(false);
-
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$user = $this->manager->get($inputDN);
-
-		$this->assertNull($user);
-	}
-
-	public function testGetByUidExisting(): void {
-		$dn = 'cn=foo,dc=foobar,dc=bar';
-		$uid = '563418fc-423b-1033-8d1c-ad5f418ee02e';
-
-		$this->access->expects($this->never())
-			->method('dn2username');
-		$this->access->expects($this->once())
-			->method('username2dn')
-			->with($this->equalTo($uid))
-			->willReturn($dn);
-		$this->access->expects($this->once())
-			->method('stringResemblesDN')
-			->with($this->equalTo($uid))
-			->willReturn(false);
-
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$this->manager->get($uid);
-
-		// Now we fetch the user again. If this leads to a failing test,
-		// runtime caching the manager is broken.
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$user = $this->manager->get($uid);
-
-		$this->assertInstanceOf(User::class, $user);
-	}
-
-	public function testGetByUidNotExisting(): void {
-		$uid = 'gone';
-
-		$this->access->expects($this->never())
-			->method('dn2username');
-		$this->access->expects($this->exactly(1))
-			->method('username2dn')
-			->with($this->equalTo($uid))
-			->willReturn(false);
-
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$user = $this->manager->get($uid);
-
-		$this->assertNull($user);
-	}
-
-	public static function attributeRequestProvider(): array {
-		return [
-			[false],
-			[true],
-		];
-	}
-
-	/**
-	 * @dataProvider attributeRequestProvider
-	 */
-	public function testGetAttributes($minimal): void {
-		$this->connection->setConfiguration([
-			'ldapEmailAttribute' => 'MAIL',
-			'ldapUserAvatarRule' => 'default',
-			'ldapQuotaAttribute' => '',
-			'ldapUserDisplayName2' => 'Mail',
-		]);
-
-		$attributes = $this->manager->getAttributes($minimal);
-
-		$this->assertContains('dn', $attributes);
-		$this->assertContains(strtolower($this->access->getConnection()->ldapEmailAttribute), $attributes);
-		$this->assertNotContains($this->access->getConnection()->ldapEmailAttribute, $attributes); #cases check
-		$this->assertNotContains('', $attributes);
-		$this->assertSame(!$minimal, in_array('jpegphoto', $attributes));
-		$this->assertSame(!$minimal, in_array('thumbnailphoto', $attributes));
-		$valueCounts = array_count_values($attributes);
-		$this->assertSame(1, $valueCounts['mail']);
-	}
+    protected Access&MockObject $access;
+    protected IConfig&MockObject $config;
+    protected LoggerInterface&MockObject $logger;
+    protected IAvatarManager&MockObject $avatarManager;
+    protected Image&MockObject $image;
+    protected IDBConnection&MockObject $dbc;
+    protected IUserManager&MockObject $ncUserManager;
+    protected INotificationManager&MockObject $notificationManager;
+    protected ILDAPWrapper&MockObject $ldapWrapper;
+    protected Connection $connection;
+    protected IManager&MockObject $shareManager;
+    protected Manager $manager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->access = $this->createMock(Access::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->avatarManager = $this->createMock(IAvatarManager::class);
+        $this->image = $this->createMock(Image::class);
+        $this->ncUserManager = $this->createMock(IUserManager::class);
+        $this->notificationManager = $this->createMock(INotificationManager::class);
+        $this->ldapWrapper = $this->createMock(ILDAPWrapper::class);
+        $this->shareManager = $this->createMock(IManager::class);
+
+        $this->connection = new Connection($this->ldapWrapper, '', null);
+
+        $this->access->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connection);
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->manager = new Manager(
+            $this->config,
+            $this->logger,
+            $this->avatarManager,
+            $this->image,
+            $this->ncUserManager,
+            $this->notificationManager,
+            $this->shareManager
+        );
+
+        $this->manager->setLdapAccess($this->access);
+    }
+
+    public static function dnProvider(): array {
+        return [
+            ['cn=foo,dc=foobar,dc=bar'],
+            ['uid=foo,o=foobar,c=bar'],
+            ['ab=cde,f=ghei,mno=pq'],
+        ];
+    }
+
+    /**
+     * @dataProvider dnProvider
+     */
+    public function testGetByDNExisting(string $inputDN): void {
+        $uid = '563418fc-423b-1033-8d1c-ad5f418ee02e';
+
+        $this->access->expects($this->once())
+            ->method('stringResemblesDN')
+            ->with($this->equalTo($inputDN))
+            ->willReturn(true);
+        $this->access->expects($this->once())
+            ->method('dn2username')
+            ->with($this->equalTo($inputDN))
+            ->willReturn($uid);
+        $this->access->expects($this->never())
+            ->method('username2dn');
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->manager->get($inputDN);
+
+        // Now we fetch the user again. If this leads to a failing test,
+        // runtime caching the manager is broken.
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $user = $this->manager->get($inputDN);
+
+        $this->assertInstanceOf(User::class, $user);
+    }
+
+    public function testGetByDNNotExisting(): void {
+        $inputDN = 'cn=gone,dc=foobar,dc=bar';
+
+        $this->access->expects($this->once())
+            ->method('stringResemblesDN')
+            ->with($this->equalTo($inputDN))
+            ->willReturn(true);
+        $this->access->expects($this->once())
+            ->method('dn2username')
+            ->with($this->equalTo($inputDN))
+            ->willReturn(false);
+        $this->access->expects($this->once())
+            ->method('username2dn')
+            ->with($this->equalTo($inputDN))
+            ->willReturn(false);
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $user = $this->manager->get($inputDN);
+
+        $this->assertNull($user);
+    }
+
+    public function testGetByUidExisting(): void {
+        $dn = 'cn=foo,dc=foobar,dc=bar';
+        $uid = '563418fc-423b-1033-8d1c-ad5f418ee02e';
+
+        $this->access->expects($this->never())
+            ->method('dn2username');
+        $this->access->expects($this->once())
+            ->method('username2dn')
+            ->with($this->equalTo($uid))
+            ->willReturn($dn);
+        $this->access->expects($this->once())
+            ->method('stringResemblesDN')
+            ->with($this->equalTo($uid))
+            ->willReturn(false);
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->manager->get($uid);
+
+        // Now we fetch the user again. If this leads to a failing test,
+        // runtime caching the manager is broken.
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $user = $this->manager->get($uid);
+
+        $this->assertInstanceOf(User::class, $user);
+    }
+
+    public function testGetByUidNotExisting(): void {
+        $uid = 'gone';
+
+        $this->access->expects($this->never())
+            ->method('dn2username');
+        $this->access->expects($this->exactly(1))
+            ->method('username2dn')
+            ->with($this->equalTo($uid))
+            ->willReturn(false);
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $user = $this->manager->get($uid);
+
+        $this->assertNull($user);
+    }
+
+    public static function attributeRequestProvider(): array {
+        return [
+            [false],
+            [true],
+        ];
+    }
+
+    /**
+     * @dataProvider attributeRequestProvider
+     */
+    public function testGetAttributes($minimal): void {
+        $this->connection->setConfiguration([
+            'ldapEmailAttribute' => 'MAIL',
+            'ldapUserAvatarRule' => 'default',
+            'ldapQuotaAttribute' => '',
+            'ldapUserDisplayName2' => 'Mail',
+        ]);
+
+        $attributes = $this->manager->getAttributes($minimal);
+
+        $this->assertContains('dn', $attributes);
+        $this->assertContains(strtolower($this->access->getConnection()->ldapEmailAttribute), $attributes);
+        $this->assertNotContains($this->access->getConnection()->ldapEmailAttribute, $attributes); #cases check
+        $this->assertNotContains('', $attributes);
+        $this->assertSame(!$minimal, in_array('jpegphoto', $attributes));
+        $this->assertSame(!$minimal, in_array('thumbnailphoto', $attributes));
+        $valueCounts = array_count_values($attributes);
+        $this->assertSame(1, $valueCounts['mail']);
+    }
 }

apps/user_ldap/tests/UserLDAPPluginTest.php

Indentation +204 added lines, -204 removed lines

@@ -11,280 +11,280 @@
 use OCA\User_LDAP\UserPluginManager;
 
 class UserLDAPPluginTest extends \Test\TestCase {
-	private function getUserPluginManager(): UserPluginManager {
-		return new UserPluginManager();
-	}
+    private function getUserPluginManager(): UserPluginManager {
+        return new UserPluginManager();
+    }
 
-	public function testImplementsActions(): void {
-		$pluginManager = $this->getUserPluginManager();
+    public function testImplementsActions(): void {
+        $pluginManager = $this->getUserPluginManager();
 
-		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions'])
-			->getMock();
+        $plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions'])
+            ->getMock();
 
-		$plugin->expects($this->any())
-			->method('respondToActions')
-			->willReturn(Backend::CREATE_USER);
+        $plugin->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(Backend::CREATE_USER);
 
-		$plugin2 = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions'])
-			->getMock();
+        $plugin2 = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions'])
+            ->getMock();
 
-		$plugin2->expects($this->any())
-			->method('respondToActions')
-			->willReturn(Backend::PROVIDE_AVATAR);
+        $plugin2->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(Backend::PROVIDE_AVATAR);
 
-		$pluginManager->register($plugin);
-		$pluginManager->register($plugin2);
+        $pluginManager->register($plugin);
+        $pluginManager->register($plugin2);
 
-		$this->assertEquals($pluginManager->getImplementedActions(), Backend::CREATE_USER | Backend::PROVIDE_AVATAR);
-		$this->assertTrue($pluginManager->implementsActions(Backend::CREATE_USER));
-		$this->assertTrue($pluginManager->implementsActions(Backend::PROVIDE_AVATAR));
-	}
+        $this->assertEquals($pluginManager->getImplementedActions(), Backend::CREATE_USER | Backend::PROVIDE_AVATAR);
+        $this->assertTrue($pluginManager->implementsActions(Backend::CREATE_USER));
+        $this->assertTrue($pluginManager->implementsActions(Backend::PROVIDE_AVATAR));
+    }
 
-	public function testCreateUser(): void {
-		$pluginManager = $this->getUserPluginManager();
+    public function testCreateUser(): void {
+        $pluginManager = $this->getUserPluginManager();
 
-		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions', 'createUser'])
-			->getMock();
+        $plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions', 'createUser'])
+            ->getMock();
 
-		$plugin->expects($this->any())
-			->method('respondToActions')
-			->willReturn(Backend::CREATE_USER);
+        $plugin->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(Backend::CREATE_USER);
 
-		$plugin->expects($this->once())
-			->method('createUser')
-			->with(
-				$this->equalTo('user'),
-				$this->equalTo('password')
-			);
+        $plugin->expects($this->once())
+            ->method('createUser')
+            ->with(
+                $this->equalTo('user'),
+                $this->equalTo('password')
+            );
 
-		$pluginManager->register($plugin);
-		$pluginManager->createUser('user', 'password');
-	}
+        $pluginManager->register($plugin);
+        $pluginManager->createUser('user', 'password');
+    }
 
 
-	public function testCreateUserNotRegistered(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('No plugin implements createUser in this LDAP Backend.');
+    public function testCreateUserNotRegistered(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('No plugin implements createUser in this LDAP Backend.');
 
-		$pluginManager = $this->getUserPluginManager();
-		$pluginManager->createUser('foo', 'bar');
-	}
+        $pluginManager = $this->getUserPluginManager();
+        $pluginManager->createUser('foo', 'bar');
+    }
 
-	public function testSetPassword(): void {
-		$pluginManager = $this->getUserPluginManager();
+    public function testSetPassword(): void {
+        $pluginManager = $this->getUserPluginManager();
 
-		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions', 'setPassword'])
-			->getMock();
+        $plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions', 'setPassword'])
+            ->getMock();
 
-		$plugin->expects($this->any())
-			->method('respondToActions')
-			->willReturn(Backend::SET_PASSWORD);
+        $plugin->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(Backend::SET_PASSWORD);
 
-		$plugin->expects($this->once())
-			->method('setPassword')
-			->with(
-				$this->equalTo('user'),
-				$this->equalTo('password')
-			);
+        $plugin->expects($this->once())
+            ->method('setPassword')
+            ->with(
+                $this->equalTo('user'),
+                $this->equalTo('password')
+            );
 
-		$pluginManager->register($plugin);
-		$pluginManager->setPassword('user', 'password');
-	}
+        $pluginManager->register($plugin);
+        $pluginManager->setPassword('user', 'password');
+    }
 
 
-	public function testSetPasswordNotRegistered(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('No plugin implements setPassword in this LDAP Backend.');
+    public function testSetPasswordNotRegistered(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('No plugin implements setPassword in this LDAP Backend.');
 
-		$pluginManager = $this->getUserPluginManager();
-		$pluginManager->setPassword('foo', 'bar');
-	}
+        $pluginManager = $this->getUserPluginManager();
+        $pluginManager->setPassword('foo', 'bar');
+    }
 
-	public function testGetHome(): void {
-		$pluginManager = $this->getUserPluginManager();
+    public function testGetHome(): void {
+        $pluginManager = $this->getUserPluginManager();
 
-		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions', 'getHome'])
-			->getMock();
+        $plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions', 'getHome'])
+            ->getMock();
 
-		$plugin->expects($this->any())
-			->method('respondToActions')
-			->willReturn(Backend::GET_HOME);
+        $plugin->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(Backend::GET_HOME);
 
-		$plugin->expects($this->once())
-			->method('getHome')
-			->with(
-				$this->equalTo('uid')
-			);
+        $plugin->expects($this->once())
+            ->method('getHome')
+            ->with(
+                $this->equalTo('uid')
+            );
 
-		$pluginManager->register($plugin);
-		$pluginManager->getHome('uid');
-	}
+        $pluginManager->register($plugin);
+        $pluginManager->getHome('uid');
+    }
 
 
-	public function testGetHomeNotRegistered(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('No plugin implements getHome in this LDAP Backend.');
+    public function testGetHomeNotRegistered(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('No plugin implements getHome in this LDAP Backend.');
 
-		$pluginManager = $this->getUserPluginManager();
-		$pluginManager->getHome('foo');
-	}
+        $pluginManager = $this->getUserPluginManager();
+        $pluginManager->getHome('foo');
+    }
 
-	public function testGetDisplayName(): void {
-		$pluginManager = $this->getUserPluginManager();
+    public function testGetDisplayName(): void {
+        $pluginManager = $this->getUserPluginManager();
 
-		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions', 'getDisplayName'])
-			->getMock();
+        $plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions', 'getDisplayName'])
+            ->getMock();
 
-		$plugin->expects($this->any())
-			->method('respondToActions')
-			->willReturn(Backend::GET_DISPLAYNAME);
+        $plugin->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(Backend::GET_DISPLAYNAME);
 
-		$plugin->expects($this->once())
-			->method('getDisplayName')
-			->with(
-				$this->equalTo('uid')
-			);
+        $plugin->expects($this->once())
+            ->method('getDisplayName')
+            ->with(
+                $this->equalTo('uid')
+            );
 
-		$pluginManager->register($plugin);
-		$pluginManager->getDisplayName('uid');
-	}
+        $pluginManager->register($plugin);
+        $pluginManager->getDisplayName('uid');
+    }
 
 
-	public function testGetDisplayNameNotRegistered(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('No plugin implements getDisplayName in this LDAP Backend.');
+    public function testGetDisplayNameNotRegistered(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('No plugin implements getDisplayName in this LDAP Backend.');
 
-		$pluginManager = $this->getUserPluginManager();
-		$pluginManager->getDisplayName('foo');
-	}
+        $pluginManager = $this->getUserPluginManager();
+        $pluginManager->getDisplayName('foo');
+    }
 
-	public function testSetDisplayName(): void {
-		$pluginManager = $this->getUserPluginManager();
+    public function testSetDisplayName(): void {
+        $pluginManager = $this->getUserPluginManager();
 
-		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions', 'setDisplayName'])
-			->getMock();
+        $plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions', 'setDisplayName'])
+            ->getMock();
 
-		$plugin->expects($this->any())
-			->method('respondToActions')
-			->willReturn(Backend::SET_DISPLAYNAME);
+        $plugin->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(Backend::SET_DISPLAYNAME);
 
-		$plugin->expects($this->once())
-			->method('setDisplayName')
-			->with(
-				$this->equalTo('user'),
-				$this->equalTo('password')
-			);
+        $plugin->expects($this->once())
+            ->method('setDisplayName')
+            ->with(
+                $this->equalTo('user'),
+                $this->equalTo('password')
+            );
 
-		$pluginManager->register($plugin);
-		$pluginManager->setDisplayName('user', 'password');
-	}
+        $pluginManager->register($plugin);
+        $pluginManager->setDisplayName('user', 'password');
+    }
 
 
-	public function testSetDisplayNameNotRegistered(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('No plugin implements setDisplayName in this LDAP Backend.');
+    public function testSetDisplayNameNotRegistered(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('No plugin implements setDisplayName in this LDAP Backend.');
 
-		$pluginManager = $this->getUserPluginManager();
-		$pluginManager->setDisplayName('foo', 'bar');
-	}
+        $pluginManager = $this->getUserPluginManager();
+        $pluginManager->setDisplayName('foo', 'bar');
+    }
 
-	public function testCanChangeAvatar(): void {
-		$pluginManager = $this->getUserPluginManager();
+    public function testCanChangeAvatar(): void {
+        $pluginManager = $this->getUserPluginManager();
 
-		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions', 'canChangeAvatar'])
-			->getMock();
+        $plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions', 'canChangeAvatar'])
+            ->getMock();
 
-		$plugin->expects($this->any())
-			->method('respondToActions')
-			->willReturn(Backend::PROVIDE_AVATAR);
+        $plugin->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(Backend::PROVIDE_AVATAR);
 
-		$plugin->expects($this->once())
-			->method('canChangeAvatar')
-			->with(
-				$this->equalTo('uid')
-			);
+        $plugin->expects($this->once())
+            ->method('canChangeAvatar')
+            ->with(
+                $this->equalTo('uid')
+            );
 
-		$pluginManager->register($plugin);
-		$pluginManager->canChangeAvatar('uid');
-	}
+        $pluginManager->register($plugin);
+        $pluginManager->canChangeAvatar('uid');
+    }
 
 
-	public function testCanChangeAvatarNotRegistered(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('No plugin implements canChangeAvatar in this LDAP Backend.');
+    public function testCanChangeAvatarNotRegistered(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('No plugin implements canChangeAvatar in this LDAP Backend.');
 
-		$pluginManager = $this->getUserPluginManager();
-		$pluginManager->canChangeAvatar('foo');
-	}
+        $pluginManager = $this->getUserPluginManager();
+        $pluginManager->canChangeAvatar('foo');
+    }
 
-	public function testCountUsers(): void {
-		$pluginManager = $this->getUserPluginManager();
+    public function testCountUsers(): void {
+        $pluginManager = $this->getUserPluginManager();
 
-		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions', 'countUsers'])
-			->getMock();
+        $plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions', 'countUsers'])
+            ->getMock();
 
-		$plugin->expects($this->any())
-			->method('respondToActions')
-			->willReturn(Backend::COUNT_USERS);
+        $plugin->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(Backend::COUNT_USERS);
 
-		$plugin->expects($this->once())
-			->method('countUsers');
+        $plugin->expects($this->once())
+            ->method('countUsers');
 
-		$pluginManager->register($plugin);
-		$pluginManager->countUsers();
-	}
+        $pluginManager->register($plugin);
+        $pluginManager->countUsers();
+    }
 
 
-	public function testCountUsersNotRegistered(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('No plugin implements countUsers in this LDAP Backend.');
+    public function testCountUsersNotRegistered(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('No plugin implements countUsers in this LDAP Backend.');
 
-		$pluginManager = $this->getUserPluginManager();
-		$pluginManager->countUsers();
-	}
+        $pluginManager = $this->getUserPluginManager();
+        $pluginManager->countUsers();
+    }
 
-	public function testDeleteUser(): void {
-		$pluginManager = $this->getUserPluginManager();
+    public function testDeleteUser(): void {
+        $pluginManager = $this->getUserPluginManager();
 
-		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions', 'canDeleteUser','deleteUser'])
-			->getMock();
+        $plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
+            ->onlyMethods(['respondToActions', 'canDeleteUser','deleteUser'])
+            ->getMock();
 
-		$plugin->expects($this->any())
-			->method('respondToActions')
-			->willReturn(0);
+        $plugin->expects($this->any())
+            ->method('respondToActions')
+            ->willReturn(0);
 
-		$plugin->expects($this->any())
-			->method('canDeleteUser')
-			->willReturn(true);
+        $plugin->expects($this->any())
+            ->method('canDeleteUser')
+            ->willReturn(true);
 
-		$plugin->expects($this->once())
-			->method('deleteUser')
-			->with(
-				$this->equalTo('uid')
-			);
+        $plugin->expects($this->once())
+            ->method('deleteUser')
+            ->with(
+                $this->equalTo('uid')
+            );
 
-		$this->assertFalse($pluginManager->canDeleteUser());
-		$pluginManager->register($plugin);
-		$this->assertTrue($pluginManager->canDeleteUser());
-		$pluginManager->deleteUser('uid');
-	}
+        $this->assertFalse($pluginManager->canDeleteUser());
+        $pluginManager->register($plugin);
+        $this->assertTrue($pluginManager->canDeleteUser());
+        $pluginManager->deleteUser('uid');
+    }
 
 
-	public function testDeleteUserNotRegistered(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('No plugin implements deleteUser in this LDAP Backend.');
+    public function testDeleteUserNotRegistered(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('No plugin implements deleteUser in this LDAP Backend.');
 
-		$pluginManager = $this->getUserPluginManager();
-		$pluginManager->deleteUser('foo');
-	}
+        $pluginManager = $this->getUserPluginManager();
+        $pluginManager->deleteUser('foo');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -256,7 +256,7 @@
 		$pluginManager = $this->getUserPluginManager();
 
 		$plugin = $this->getMockBuilder(LDAPUserPluginDummy::class)
-			->onlyMethods(['respondToActions', 'canDeleteUser','deleteUser'])
+			->onlyMethods(['respondToActions', 'canDeleteUser', 'deleteUser'])
 			->getMock();
 
 		$plugin->expects($this->any())

apps/user_ldap/tests/Settings/SectionTest.php

Indentation +41 added lines, -41 removed lines

@@ -14,45 +14,45 @@
 use Test\TestCase;
 
 class SectionTest extends TestCase {
-	private IURLGenerator&MockObject $url;
-	private IL10N&MockObject $l;
-	private Section $section;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->url = $this->createMock(IURLGenerator::class);
-		$this->l = $this->createMock(IL10N::class);
-
-		$this->section = new Section(
-			$this->url,
-			$this->l
-		);
-	}
-
-	public function testGetID(): void {
-		$this->assertSame('ldap', $this->section->getID());
-	}
-
-	public function testGetName(): void {
-		$this->l
-			->expects($this->once())
-			->method('t')
-			->with('LDAP/AD integration')
-			->willReturn('LDAP/AD integration');
-
-		$this->assertSame('LDAP/AD integration', $this->section->getName());
-	}
-
-	public function testGetPriority(): void {
-		$this->assertSame(25, $this->section->getPriority());
-	}
-
-	public function testGetIcon(): void {
-		$this->url->expects($this->once())
-			->method('imagePath')
-			->with('user_ldap', 'app-dark.svg')
-			->willReturn('icon');
-
-		$this->assertSame('icon', $this->section->getIcon());
-	}
+    private IURLGenerator&MockObject $url;
+    private IL10N&MockObject $l;
+    private Section $section;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->url = $this->createMock(IURLGenerator::class);
+        $this->l = $this->createMock(IL10N::class);
+
+        $this->section = new Section(
+            $this->url,
+            $this->l
+        );
+    }
+
+    public function testGetID(): void {
+        $this->assertSame('ldap', $this->section->getID());
+    }
+
+    public function testGetName(): void {
+        $this->l
+            ->expects($this->once())
+            ->method('t')
+            ->with('LDAP/AD integration')
+            ->willReturn('LDAP/AD integration');
+
+        $this->assertSame('LDAP/AD integration', $this->section->getName());
+    }
+
+    public function testGetPriority(): void {
+        $this->assertSame(25, $this->section->getPriority());
+    }
+
+    public function testGetIcon(): void {
+        $this->url->expects($this->once())
+            ->method('imagePath')
+            ->with('user_ldap', 'app-dark.svg')
+            ->willReturn('icon');
+
+        $this->assertSame('icon', $this->section->getIcon());
+    }
 }