Completed
Pull Request — 3.3 (#155)
by Thibault
04:23
created
src/Mouf/Database/TDBM/Filters/GreaterFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
 	 * @param string $columnName
86 86
 	 * @param string $value
87 87
 	 */
88
-	public function __construct($tableName=null, $columnName=null, $value=null) {
88
+	public function __construct($tableName = null, $columnName = null, $value = null) {
89 89
 		$this->tableName = $tableName;
90 90
 		$this->columnName = $columnName;
91 91
 		$this->value = $value;
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/LessFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
 	 * @param string $columnName
86 86
 	 * @param string $value
87 87
 	 */
88
-	public function __construct($tableName=null, $columnName=null, $value=null) {
88
+	public function __construct($tableName = null, $columnName = null, $value = null) {
89 89
 		$this->tableName = $tableName;
90 90
 		$this->columnName = $columnName;
91 91
 		$this->value = $value;
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/DifferentFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
 	 * @param string $columnName
86 86
 	 * @param string $value
87 87
 	 */
88
-	public function __construct($tableName=null, $columnName=null, $value=null) {
88
+	public function __construct($tableName = null, $columnName = null, $value = null) {
89 89
 		$this->tableName = $tableName;
90 90
 		$this->columnName = $columnName;
91 91
 		$this->value = $value;
Please login to merge, or discard this patch.
src/views/installStep2.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 <div class="control-group">
46 46
 	<label class="control-label">Store dates / timestamps in UTC:</label>
47 47
 	<div class="controls">
48
-		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc?'checked="checked"':"" ?>></input>
48
+		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc ? 'checked="checked"' : "" ?>></input>
49 49
 		<span class="help-block">Select this option if you want timestamps to be stored in UTC.
50 50
 		If your application supports several time zones, you should select this option to store all dates in
51 51
 		the same time zone.</span>
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Controllers/TdbmController.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
 		}
63 63
 				
64 64
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
65
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
65
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
66 66
 
67 67
 			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
68
-            if ($autoloadNamespaces) {
68
+			if ($autoloadNamespaces) {
69 69
 				$this->autoloadDetected = true;
70 70
 				$rootNamespace = $autoloadNamespaces[0];
71 71
 				$this->daoNamespace = $rootNamespace."Dao";
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 		
136 136
 		$tdbmService = new InstanceProxy($name);
137 137
 		/* @var $tdbmService TDBMService */
138
-        $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $keepSupport, $storeInUtc);
138
+		$tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $keepSupport, $storeInUtc);
139 139
 
140 140
 
141 141
 		$moufManager->declareComponent($daofactoryinstancename, $daonamespace."\\".$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	 * @Action
42 42
 	 * //@Admin
43 43
 	 */
44
-	public function defaultAction($name, $selfedit="false") {
44
+	public function defaultAction($name, $selfedit = "false") {
45 45
 		$this->initController($name, $selfedit);
46 46
 		
47 47
 		// Fill variables
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 	 * @param string $name
91 91
 	 * @param bool $selfedit
92 92
 	 */
93
-	public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $keepSupport = 0, $storeInUtc = 0,$selfedit="false") {
93
+	public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $keepSupport = 0, $storeInUtc = 0, $selfedit = "false") {
94 94
 		$this->initController($name, $selfedit);
95 95
 
96 96
 		self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $keepSupport, $storeInUtc);
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 * This function generates the DAOs and Beans for the TDBM service passed in parameter. 
104 104
 	 * 
105 105
 	 */
106
-	public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit="false", $keepSupport = null, $storeInUtc = null) {
106
+	public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = "false", $keepSupport = null, $storeInUtc = null) {
107 107
 		$moufManager->setVariable("tdbmDefaultDaoNamespace_".$name, $daonamespace);
108 108
 		$moufManager->setVariable("tdbmDefaultBeanNamespace_".$name, $beannamespace);
109 109
 		$moufManager->setVariable("tdbmDefaultDaoFactoryName_".$name, $daofactoryclassname);
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Controllers/TdbmInstallController.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -110,12 +110,12 @@  discard block
 block discarded – undo
110 110
 		$this->beanNamespace = $this->moufManager->getVariable("tdbmDefaultBeanNamespace_tdbmService");
111 111
 		
112 112
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
113
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
113
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
114 114
 
115
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
115
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
116 116
 			if ($autoloadNamespaces) {
117 117
 				$this->autoloadDetected = true;
118
-                $rootNamespace = $autoloadNamespaces[0];
118
+				$rootNamespace = $autoloadNamespaces[0];
119 119
 				$this->daoNamespace = $rootNamespace."Dao";
120 120
 				$this->beanNamespace = $rootNamespace."Dao\\Bean";
121 121
 			} else {
@@ -131,17 +131,17 @@  discard block
 block discarded – undo
131 131
 		$this->template->toHtml();
132 132
 	}
133 133
 	
134
-    /**
135
-     * This action generates the TDBM instance, then the DAOs and Beans.
136
-     *
137
-     * @Action
138
-     * @param string $daonamespace
139
-     * @param string $beannamespace
140
-     * @param int $keepSupport
141
-     * @param int $storeInUtc
142
-     * @param string $selfedit
143
-     */
144
-    public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $selfedit="false") {
134
+	/**
135
+	 * This action generates the TDBM instance, then the DAOs and Beans.
136
+	 *
137
+	 * @Action
138
+	 * @param string $daonamespace
139
+	 * @param string $beannamespace
140
+	 * @param int $keepSupport
141
+	 * @param int $storeInUtc
142
+	 * @param string $selfedit
143
+	 */
144
+	public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $selfedit="false") {
145 145
 		$this->selfedit = $selfedit;
146 146
 		
147 147
 		if ($selfedit == "true") {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
141 141
      * @param int $storeInUtc
142 142
      * @param string $selfedit
143 143
      */
144
-    public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $selfedit="false") {
144
+    public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $selfedit = "false") {
145 145
 		$this->selfedit = $selfedit;
146 146
 		
147 147
 		if ($selfedit == "true") {
Please login to merge, or discard this patch.