stevenbuehner / HtpasswdManager

src/HtpasswdManager/Controller/UserController.php

Doc Comments +1 added lines, -2 removed lines

@@ -152,7 +152,7 @@ 
 	 * Returns true if valid, of not it returns a String with information about the reason
 	 *
 	 * @param string $username        	
-	 * @return boolean string
+	 * @return string|boolean string
 	 */
 	private function isUsernameValid($username) {
 		if (strlen ( $username ) <= 2)
@@ -167,7 +167,6 @@ 
 	/**
 	 * Returns true if valid, of not it returns a String with information about the reason
 	 *
-	 * @param string $username        	
 	 * @return boolean string
 	 */
 	private function isPasswordValid($password) {

src/HtpasswdManager/Service/HtpasswdService.php

Doc Comments +3 added lines

@@ -108,6 +108,9 @@
 		return $usernameDeleted;
 	}
 
+	/**
+	 * @param string $newContent
+	 */
 	private function replaceHtPasswdContent($newContent) {
 		// file_put_contents ( $this->filename, $newContent );
 		$fp = fopen ( $this->filename, 'w' );

src/HtpasswdManager/Test/HtpasswdServiceTest.php

Doc Comments +3 added lines

@@ -140,6 +140,9 @@
         $this->assertFalse($service->userExists('not Existant'), "User 'not Existant' should not exist");
     }
 
+    /**
+     * @param string $filename
+     */
     protected function getNumberOfLines($filename) {
         $cont  = file_get_contents($filename);
         $lines = explode("\n", $cont);

Indentation +108 added lines, -108 removed lines

@@ -5,153 +5,153 @@
 
 class HtpasswdServiceTest extends \PHPUnit_Framework_TestCase {
 
-    protected $testDataDir;
+	protected $testDataDir;
 
-    public function setUp() {
-        $this->testDataDir = __DIR__ . '/TestData';
+	public function setUp() {
+		$this->testDataDir = __DIR__ . '/TestData';
 
-        parent::setUp();
-    }
+		parent::setUp();
+	}
 
 
-    public function testCreateFileIfNotExistant() {
-        $testFile = $this->testDataDir . '/notExistant';
+	public function testCreateFileIfNotExistant() {
+		$testFile = $this->testDataDir . '/notExistant';
 
-        if (true === file_exists($testFile)) {
-            unlink($testFile);
-        }
+		if (true === file_exists($testFile)) {
+			unlink($testFile);
+		}
 
-        $this->assertFileNotExists($testFile);
+		$this->assertFileNotExists($testFile);
 
-        $service = new HtpasswdService($testFile);
-        $this->assertFileExists($testFile);
+		$service = new HtpasswdService($testFile);
+		$this->assertFileExists($testFile);
 
-        // Cleanup
-        unlink($testFile);
-    }
+		// Cleanup
+		unlink($testFile);
+	}
 
-    public function testGetUserList_Empty() {
-        $testFile = $this->testDataDir . '/htaccess_UserServiceTest_empty';
+	public function testGetUserList_Empty() {
+		$testFile = $this->testDataDir . '/htaccess_UserServiceTest_empty';
 
-        if (true === file_exists($testFile)) {
-            unlink($testFile);
-        }
-        $this->assertFileNotExists($testFile);
-        touch($testFile);
-        $this->assertFileExists($testFile);
+		if (true === file_exists($testFile)) {
+			unlink($testFile);
+		}
+		$this->assertFileNotExists($testFile);
+		touch($testFile);
+		$this->assertFileExists($testFile);
 
-        $service = new HtpasswdService($testFile);
+		$service = new HtpasswdService($testFile);
 
-        $userList = $service->getUserList();
-        $this->assertEquals($expected = [ ], $userList, "UserList");
+		$userList = $service->getUserList();
+		$this->assertEquals($expected = [ ], $userList, "UserList");
 
-        // Cleanup
-        unlink($testFile);
-    }
+		// Cleanup
+		unlink($testFile);
+	}
 
-    public function testGetUserList_Filled() {
-        $testFile = $this->testDataDir . '/htaccess_UserServiceTest';
-        $this->assertFileExists($testFile);
+	public function testGetUserList_Filled() {
+		$testFile = $this->testDataDir . '/htaccess_UserServiceTest';
+		$this->assertFileExists($testFile);
 
-        $service = new HtpasswdService($testFile);
+		$service = new HtpasswdService($testFile);
 
-        $userList = $service->getUserList();
-        $this->assertEquals(
-            $expected = [ 'steven' => '$apr1$UF1l/6iv$tT3IJUH.QL82HAraXetNo0',
-                          'blub'   => '$apr1$jVosh5nC$q6KJ5EZNU6thOPETMQw8O/'
-            ], $userList, "UserList");
-    }
+		$userList = $service->getUserList();
+		$this->assertEquals(
+			$expected = [ 'steven' => '$apr1$UF1l/6iv$tT3IJUH.QL82HAraXetNo0',
+						  'blub'   => '$apr1$jVosh5nC$q6KJ5EZNU6thOPETMQw8O/'
+			], $userList, "UserList");
+	}
 
-    public function testAddUser() {
-        $testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest';
-        $testFile         = $this->testDataDir . '/htaccess_UserServiceTest_addUser';
-        $this->assertFileExists($testFileTemplate);
+	public function testAddUser() {
+		$testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest';
+		$testFile         = $this->testDataDir . '/htaccess_UserServiceTest_addUser';
+		$this->assertFileExists($testFileTemplate);
 
-        if (true === file_exists($testFile)) {
-            unlink($testFile);
-        }
-        $this->assertFileNotExists($testFile);
+		if (true === file_exists($testFile)) {
+			unlink($testFile);
+		}
+		$this->assertFileNotExists($testFile);
 
-        copy($testFileTemplate, $testFile);
-        $this->assertFileExists($testFile);
+		copy($testFileTemplate, $testFile);
+		$this->assertFileExists($testFile);
 
-        $service  = new HtpasswdService($testFile);
-        $userList = $service->getUserList();
-        $this->assertCount(2, $userList);
-        $this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines");
+		$service  = new HtpasswdService($testFile);
+		$userList = $service->getUserList();
+		$this->assertCount(2, $userList);
+		$this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines");
 
 
-        $service->addUser('test', 'test');
+		$service->addUser('test', 'test');
 
-        $userList = $service->getUserList();
-        $this->assertCount(3, $userList);
-        $this->assertEquals($expected = [ 'steven', 'blub', 'test' ],
-            array_keys($userList));
-        $this->assertEquals(3, $this->getNumberOfLines($testFile), "Number of Lines");
+		$userList = $service->getUserList();
+		$this->assertCount(3, $userList);
+		$this->assertEquals($expected = [ 'steven', 'blub', 'test' ],
+			array_keys($userList));
+		$this->assertEquals(3, $this->getNumberOfLines($testFile), "Number of Lines");
 
 
-        // Cleanup
-        unlink($testFile);
-    }
+		// Cleanup
+		unlink($testFile);
+	}
 
 
-    public function testdeleteUser() {
-        $testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest';
-        $testFile         = $this->testDataDir . '/htaccess_UserServiceTest_addUser';
-        $this->assertFileExists($testFileTemplate);
+	public function testdeleteUser() {
+		$testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest';
+		$testFile         = $this->testDataDir . '/htaccess_UserServiceTest_addUser';
+		$this->assertFileExists($testFileTemplate);
 
-        if (true === file_exists($testFile)) {
-            unlink($testFile);
-        }
-        $this->assertFileNotExists($testFile);
+		if (true === file_exists($testFile)) {
+			unlink($testFile);
+		}
+		$this->assertFileNotExists($testFile);
 
-        copy($testFileTemplate, $testFile);
-        $this->assertFileExists($testFile);
+		copy($testFileTemplate, $testFile);
+		$this->assertFileExists($testFile);
 
-        $service  = new HtpasswdService($testFile);
-        $userList = $service->getUserList();
-        $this->assertCount(2, $userList);
-        $this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines");
+		$service  = new HtpasswdService($testFile);
+		$userList = $service->getUserList();
+		$this->assertCount(2, $userList);
+		$this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines");
 
 
-        $service->deleteUser('steven');
-        $userList = $service->getUserList();
-        $this->assertCount(1, $userList);
-        $this->assertEquals($expected = [ 'blub' ],
-            array_keys($userList));
-        $this->assertEquals(1, $this->getNumberOfLines($testFile), "Number of Lines");
+		$service->deleteUser('steven');
+		$userList = $service->getUserList();
+		$this->assertCount(1, $userList);
+		$this->assertEquals($expected = [ 'blub' ],
+			array_keys($userList));
+		$this->assertEquals(1, $this->getNumberOfLines($testFile), "Number of Lines");
 
 
-        // Cleanup
-        unlink($testFile);
-    }
+		// Cleanup
+		unlink($testFile);
+	}
 
-    public function testUserExists() {
-        $testFile = $this->testDataDir . '/htaccess_UserServiceTest';
-        $this->assertFileExists($testFile);
+	public function testUserExists() {
+		$testFile = $this->testDataDir . '/htaccess_UserServiceTest';
+		$this->assertFileExists($testFile);
 
-        $service  = new HtpasswdService($testFile);
-        $userList = $service->getUserList();
+		$service  = new HtpasswdService($testFile);
+		$userList = $service->getUserList();
 
-        $this->assertTrue($service->userExists('steven'), 'User should exist');
-        $this->assertTrue($service->userExists('blub'), 'User should exist');
-        $this->assertFalse($service->userExists(''), "User '' should not exist");
-        $this->assertFalse($service->userExists('notExistant'), "User 'notExistant' should not exist");
-        $this->assertFalse($service->userExists('not Existant'), "User 'not Existant' should not exist");
-    }
+		$this->assertTrue($service->userExists('steven'), 'User should exist');
+		$this->assertTrue($service->userExists('blub'), 'User should exist');
+		$this->assertFalse($service->userExists(''), "User '' should not exist");
+		$this->assertFalse($service->userExists('notExistant'), "User 'notExistant' should not exist");
+		$this->assertFalse($service->userExists('not Existant'), "User 'not Existant' should not exist");
+	}
 
-    protected function getNumberOfLines($filename) {
-        $cont  = file_get_contents($filename);
-        $lines = explode("\n", $cont);
+	protected function getNumberOfLines($filename) {
+		$cont  = file_get_contents($filename);
+		$lines = explode("\n", $cont);
 
-        // Remove emtpy lines
-        foreach ($lines as $i => $line) {
-            if (empty(trim($line))) {
-                unset($lines[$i]);
-            }
-        }
+		// Remove emtpy lines
+		foreach ($lines as $i => $line) {
+			if (empty(trim($line))) {
+				unset($lines[$i]);
+			}
+		}
 
-        return count($lines);
-    }
+		return count($lines);
+	}
 
 }
\ No newline at end of file

src/HtpasswdManager/Test/Bootstrap/Bootstrap.php

Indentation +42 added lines, -42 removed lines

@@ -12,48 +12,48 @@
  * Test bootstrap, for setting up autoloading
  */
 class Bootstrap {
-    protected static $serviceManager;
-
-    public static function init() {
-        static::initAutoloader();
-    }
-
-    protected static function initAutoloader() {
-        $vendorPath = static::findParentPath('vendor');
-
-        if (file_exists($vendorPath . '/autoload.php')) {
-            include $vendorPath . '/autoload.php';
-        }
-
-        if (!class_exists('Zend\Loader\AutoloaderFactory')) {
-            throw new RuntimeException(
-                'Unable to load ZF2. Run `php composer.phar install`'
-            );
-        }
-
-        AutoloaderFactory::factory(array(
-            'Zend\Loader\StandardAutoloader' => array(
-                'autoregister_zf' => true,
-                'namespaces'      => array(
-                    __NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__,
-                ),
-            ),
-        ));
-    }
-
-    protected static function findParentPath($path) {
-        $dir         = __DIR__;
-        $previousDir = '.';
-        while (!is_dir($dir . '/' . $path)) {
-            $dir = dirname($dir);
-            if ($previousDir === $dir) {
-                return false;
-            }
-            $previousDir = $dir;
-        }
-
-        return $dir . '/' . $path;
-    }
+	protected static $serviceManager;
+
+	public static function init() {
+		static::initAutoloader();
+	}
+
+	protected static function initAutoloader() {
+		$vendorPath = static::findParentPath('vendor');
+
+		if (file_exists($vendorPath . '/autoload.php')) {
+			include $vendorPath . '/autoload.php';
+		}
+
+		if (!class_exists('Zend\Loader\AutoloaderFactory')) {
+			throw new RuntimeException(
+				'Unable to load ZF2. Run `php composer.phar install`'
+			);
+		}
+
+		AutoloaderFactory::factory(array(
+			'Zend\Loader\StandardAutoloader' => array(
+				'autoregister_zf' => true,
+				'namespaces'      => array(
+					__NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__,
+				),
+			),
+		));
+	}
+
+	protected static function findParentPath($path) {
+		$dir         = __DIR__;
+		$previousDir = '.';
+		while (!is_dir($dir . '/' . $path)) {
+			$dir = dirname($dir);
+			if ($previousDir === $dir) {
+				return false;
+			}
+			$previousDir = $dir;
+		}
+
+		return $dir . '/' . $path;
+	}
 }
 
 Bootstrap::init();
\ No newline at end of file