Completed
Branch master (07b0df)
by judicael
05:36 queued 02:38
created
bundles/tests/Demo/app/Controller/Exemple1Test.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
                 $this->assertTrue(false);
62 62
             }
63 63
         }
64
-        catch(\Exception $e) {
64
+        catch (\Exception $e) {
65 65
             $this->assertTrue(false);
66 66
         }
67 67
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -56,12 +56,10 @@
 block discarded – undo
56 56
             if ($content) {
57 57
 
58 58
                 $this->assertTrue(true);
59
-            }
60
-            else {
59
+            } else {
61 60
                 $this->assertTrue(false);
62 61
             }
63
-        }
64
-        catch(\Exception $e) {
62
+        } catch(\Exception $e) {
65 63
             $this->assertTrue(false);
66 64
         }
67 65
 
Please login to merge, or discard this patch.
bundles/lib/Ldap.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -79,11 +79,11 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
     public function getGroups() : array
81 81
     {
82
-        $rSearch = ldap_search( $this->_rConnect , $this->_sBase , "objectclass=group" , array("cn") );
82
+        $rSearch = ldap_search($this->_rConnect, $this->_sBase, "objectclass=group", array("cn"));
83 83
         $aEntries = ldap_get_entries($this->_rConnect, $rSearch);
84 84
         $aGroups = array();
85 85
 
86
-        for ( $i = 0 ; $i < $aEntries["count"] ; $i++ ) {
86
+        for ($i = 0; $i < $aEntries["count"]; $i++) {
87 87
             
88 88
             $aGroups[] = utf8_encode($aEntries[$i]["dn"]);
89 89
         }
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 		    
192 192
 			$aResultSet[$i] = array_intersect_key($aEntries[$i], $aMask);
193 193
 
194
-			foreach($aResultSet[$i] as &$aValues) {
194
+			foreach ($aResultSet[$i] as &$aValues) {
195 195
 			    
196 196
 				unset($aValues['count']);
197 197
 			}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -113,8 +113,7 @@
 block discarded – undo
113 113
 	 */
114 114
 	public function unbind() : bool
115 115
 	{
116
-	    if ($this->_bConnected) { return $this->_bConnected = ldap_unbind($this->_rConnect); }
117
-	    else { return true; }
116
+	    if ($this->_bConnected) { return $this->_bConnected = ldap_unbind($this->_rConnect); } else { return true; }
118 117
 	}
119 118
 
120 119
 	/**
Please login to merge, or discard this patch.
bundles/lib/Image.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	    $ImageChoisie = imagecreatefromjpeg($_FILES['ImageNews']['tmp_name']);
53 53
         $TailleImageChoisie = getimagesize($_FILES['ImageNews']['tmp_name']);
54 54
 
55
-        $rNewImage = imagecreatetruecolor($iWidth , $iHeight);
55
+        $rNewImage = imagecreatetruecolor($iWidth, $iHeight);
56 56
 
57 57
         if ($bKeepDimension === false) {
58 58
         
@@ -89,6 +89,6 @@  discard block
 block discarded – undo
89 89
         $NomImageExploitable = time();
90 90
       
91 91
         header('Content-Type: image/jpeg');
92
-        imagejpeg($rNewImage , null, 100);
92
+        imagejpeg($rNewImage, null, 100);
93 93
 	}
94 94
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -57,8 +57,7 @@  discard block
 block discarded – undo
57 57
         if ($bKeepDimension === false) {
58 58
         
59 59
             imagecopyresampled($rNewImage, $rActualImage, 0, 0, 0, 0, $iWidth, $iHeight, $aSize[0], $aSize[1]);
60
-        }
61
-        else {
60
+        } else {
62 61
         
63 62
             if ($aSize[0] > $aSize[1]) {
64 63
 
@@ -68,8 +67,7 @@  discard block
 block discarded – undo
68 67
                 $iHeight = round($iWidth * $fCoef);
69 68
                 $iDestY = round(($iWidth - $iHeight) / 2);
70 69
                 $iDestX = 0;
71
-            }
72
-            else {
70
+            } else {
73 71
 
74 72
                 $rWhite = imagecolorallocate($rNewImage, 255, 255, 255);
75 73
                 imagefilledrectangle($rNewImage, 0, 0, $iWidth, $iHeight, $rWhite);
Please login to merge, or discard this patch.
bundles/lib/Cache.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
 	 * @param  int $iTimeout expiration of cache
92 92
 	 * @return bool
93 93
 	 */
94
-	public static function get(string $sName, int &$iFlags = null, int $iTimeout = 0) : bool
94
+	public static function get(string $sName, int&$iFlags = null, int $iTimeout = 0) : bool
95 95
 	{
96 96
 		return self::_getCacheObject()->get($sName, $iFlags, $iTimeout);
97 97
 	}
Please login to merge, or discard this patch.
Braces   +7 added lines, -17 removed lines patch added patch discarded remove patch
@@ -60,11 +60,7 @@  discard block
 block discarded – undo
60 60
 	 */
61 61
 	public static function setCacheType(string $sCacheName)
62 62
 	{
63
-		if ($sCacheName === 'file') { self::$_sTypeOfCache = 'file'; }
64
-		else if ($sCacheName === 'memcache') { self::$_sTypeOfCache = 'memcache'; }
65
-		else if ($sCacheName === 'apc') { self::$_sTypeOfCache = 'apc'; }
66
-		else if ($sCacheName === 'redis') { self::$_sTypeOfCache = 'redis'; }
67
-		else { self::$_sTypeOfCache = 'mock'; }
63
+		if ($sCacheName === 'file') { self::$_sTypeOfCache = 'file'; } else if ($sCacheName === 'memcache') { self::$_sTypeOfCache = 'memcache'; } else if ($sCacheName === 'apc') { self::$_sTypeOfCache = 'apc'; } else if ($sCacheName === 'redis') { self::$_sTypeOfCache = 'redis'; } else { self::$_sTypeOfCache = 'mock'; }
68 64
 	}
69 65
 
70 66
 	/**
@@ -132,31 +128,26 @@  discard block
 block discarded – undo
132 128
 			if (!isset(self::$_aCache['file'])) { self::$_aCache['file'] = new CacheFile; }
133 129
 
134 130
 			return self::$_aCache['file'];
135
-		}
136
-		else if (self::$_sTypeOfCache === 'memcache') {
131
+		} else if (self::$_sTypeOfCache === 'memcache') {
137 132
   		  
138 133
 			if (!isset(self::$_aCache['memcache'])) { 
139 134
 			    
140 135
 			    $oDbConf = Config::get('Memcache')->configuration;
141 136
 			    
142
-			    if (isset($oDbConf->port)) { $sPort = $oDbConf->port; }
143
-			    else { $sPort = null; }
137
+			    if (isset($oDbConf->port)) { $sPort = $oDbConf->port; } else { $sPort = null; }
144 138
 			    
145
-			    if (isset($oDbConf->timeout)) { $iTimeout = $oDbConf->timeout; }
146
-			    else { $iTimeout = null; }
139
+			    if (isset($oDbConf->timeout)) { $iTimeout = $oDbConf->timeout; } else { $iTimeout = null; }
147 140
 			    
148 141
 			    self::$_aCache['memcache'] = new CacheMemcache($oDbConf->host, $sPort, $iTimeout); 
149 142
 			}
150 143
 
151 144
 			return self::$_aCache['memcache'];
152
-		}
153
-		else if (self::$_sTypeOfCache === 'apc') {
145
+		} else if (self::$_sTypeOfCache === 'apc') {
154 146
 
155 147
 			if (!isset(self::$_aCache['apc'])) { self::$_aCache['apc'] = new Apc; }
156 148
 
157 149
 			return self::$_aCache['apc'];
158
-		}
159
-		else if (self::$_sTypeOfCache === 'redis') {
150
+		} else if (self::$_sTypeOfCache === 'redis') {
160 151
 		    
161 152
 			if (!isset(self::$_aCache['redis'])) {
162 153
 			    
@@ -165,8 +156,7 @@  discard block
 block discarded – undo
165 156
 			}
166 157
 
167 158
 			return self::$_aCache['redis'];
168
-		}
169
-		else if (self::$_sTypeOfCache === 'mock') {
159
+		} else if (self::$_sTypeOfCache === 'mock') {
170 160
 		    
171 161
 			if (!isset(self::$_aCache['mock'])) { self::$_aCache['mock'] = new Mock; }
172 162
 
Please login to merge, or discard this patch.
bundles/lib/Asset.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	    $aJavascript = func_get_args();
45 45
 	    $aReturns = array();
46 46
 	    
47
-	    foreach($aJavascript as $aJsCombination) {
47
+	    foreach ($aJavascript as $aJsCombination) {
48 48
 	        
49 49
 	        $sJsPath = $sDefaultPath;
50 50
 	        
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	    $aCss = func_get_args();
80 80
 	    $aReturns = array();
81 81
 	    
82
-	    foreach($aCss as $aCssCombination) {
82
+	    foreach ($aCss as $aCssCombination) {
83 83
 	        
84 84
 	        $sCssPath = $sDefaultPath;
85 85
 	        
Please login to merge, or discard this patch.
bundles/lib/Response.php 1 patch
Braces   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -227,9 +227,7 @@
 block discarded – undo
227 227
 	 */
228 228
 	public function translate($mContent)
229 229
 	{
230
-		if (self::$_sKindOfReturn === 'yaml') { return Yaml::translate($mContent); }
231
-		else if (self::$_sKindOfReturn === 'mock') { return Mock::translate($mContent); }
232
-		else { return Json::translate($mContent); }
230
+		if (self::$_sKindOfReturn === 'yaml') { return Yaml::translate($mContent); } else if (self::$_sKindOfReturn === 'mock') { return Mock::translate($mContent); } else { return Json::translate($mContent); }
233 231
 	}
234 232
 
235 233
 	/**
Please login to merge, or discard this patch.
bundles/lib/Request.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 
196 196
 	        $aSeparatePut = explode('&', $sData);
197 197
 	        
198
-	        foreach($aSeparatePut as $sOne) {
198
+	        foreach ($aSeparatePut as $sOne) {
199 199
 	            
200 200
 	            $aOnePut = explode('=', $sOne);
201 201
 	            $aPut[$aOnePut[0]] = $aOnePut[1];
@@ -214,9 +214,9 @@  discard block
 block discarded – undo
214 214
 	 */
215 215
 	public static function setStatus($iCode)
216 216
 	{
217
-		if ($iCode === 200) { header('HTTP/1.1 200 Ok');  }
218
-		else if ($iCode === 201) { header('HTTP/1.1 201 Created');  }
219
-		else if ($iCode === 204) { header("HTTP/1.0 204 No Content");  }
217
+		if ($iCode === 200) { header('HTTP/1.1 200 Ok'); }
218
+		else if ($iCode === 201) { header('HTTP/1.1 201 Created'); }
219
+		else if ($iCode === 204) { header("HTTP/1.0 204 No Content"); }
220 220
 		else if ($iCode === 403) { header('HTTP/1.1 403 Forbidden'); }
221 221
 		else if ($iCode === 404) { header('HTTP/1.1 404 Not Found'); }
222 222
 	}
Please login to merge, or discard this patch.
Braces   +9 added lines, -21 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@  discard block
 block discarded – undo
69 69
 			if (array_key_exists('HTTP_X_REQUESTED_WITH', $_SERVER) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
70 70
 
71 71
 				return true;
72
-			}
73
-			else {
72
+			} else {
74 73
 
75 74
 				return false;
76 75
 			}
@@ -85,8 +84,7 @@  discard block
 block discarded – undo
85 84
 	 */
86 85
 	public static function isHttpRequest()
87 86
 	{
88
-		if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) { return true; }
89
-		else { return false; }
87
+		if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) { return true; } else { return false; }
90 88
 	}
91 89
 
92 90
 	/**
@@ -97,8 +95,7 @@  discard block
 block discarded – undo
97 95
 	 */
98 96
 	public static function isHttpsRequest()
99 97
 	{
100
-		if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') { return true; }
101
-		else { return false; }
98
+		if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') { return true; } else { return false; }
102 99
 	}
103 100
 
104 101
 	/**
@@ -111,8 +108,7 @@  discard block
 block discarded – undo
111 108
 	{
112 109
 		$sSapiType = php_sapi_name();
113 110
 
114
-		if (substr($sSapiType, 0, 3) == 'cgi' || defined('STDIN')) { return true; }
115
-		else { return false; }
111
+		if (substr($sSapiType, 0, 3) == 'cgi' || defined('STDIN')) { return true; } else { return false; }
116 112
 	}
117 113
 
118 114
 	/**
@@ -137,8 +133,7 @@  discard block
 block discarded – undo
137 133
 	 */
138 134
 	public static function getParameters()
139 135
 	{
140
-		if (isset($_GET)) { return $_GET; }
141
-		else { return array(); }
136
+		if (isset($_GET)) { return $_GET; } else { return array(); }
142 137
 	}
143 138
 
144 139
 	/**
@@ -149,8 +144,7 @@  discard block
 block discarded – undo
149 144
 	 */
150 145
 	public static function getPostParameters()
151 146
 	{
152
-		if (isset($_POST)) { return $_POST; }
153
-		else { return array(); }
147
+		if (isset($_POST)) { return $_POST; } else { return array(); }
154 148
 	}
155 149
 
156 150
 	/**
@@ -161,8 +155,7 @@  discard block
 block discarded – undo
161 155
 	 */
162 156
 	public function isPost()
163 157
 	{
164
-		if (isset($_POST) && count($_POST) > 0) { return true; }
165
-		else { return false; }
158
+		if (isset($_POST) && count($_POST) > 0) { return true; } else { return false; }
166 159
 	}
167 160
 
168 161
 	/**
@@ -214,11 +207,7 @@  discard block
 block discarded – undo
214 207
 	 */
215 208
 	public static function setStatus($iCode)
216 209
 	{
217
-		if ($iCode === 200) { header('HTTP/1.1 200 Ok');  }
218
-		else if ($iCode === 201) { header('HTTP/1.1 201 Created');  }
219
-		else if ($iCode === 204) { header("HTTP/1.0 204 No Content");  }
220
-		else if ($iCode === 403) { header('HTTP/1.1 403 Forbidden'); }
221
-		else if ($iCode === 404) { header('HTTP/1.1 404 Not Found'); }
210
+		if ($iCode === 200) { header('HTTP/1.1 200 Ok');  } else if ($iCode === 201) { header('HTTP/1.1 201 Created');  } else if ($iCode === 204) { header("HTTP/1.0 204 No Content");  } else if ($iCode === 403) { header('HTTP/1.1 403 Forbidden'); } else if ($iCode === 404) { header('HTTP/1.1 404 Not Found'); }
222 211
 	}
223 212
 
224 213
     /**
@@ -236,8 +225,7 @@  discard block
 block discarded – undo
236 225
      */
237 226
     public function getLanguages() : array
238 227
     {
239
-        if (!self::isCliRequest()) { return explode(',', preg_replace('/^([^;]);?.*$/', '$1', $_SERVER['HTTP_ACCEPT_LANGUAGE'])); }
240
-        else { return array(); }
228
+        if (!self::isCliRequest()) { return explode(',', preg_replace('/^([^;]);?.*$/', '$1', $_SERVER['HTTP_ACCEPT_LANGUAGE'])); } else { return array(); }
241 229
     }
242 230
 
243 231
 	/**
Please login to merge, or discard this patch.
bundles/lib/Cache/CacheInterface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 	 * @param  int $iFlags flags
50 50
 	 * @param  int $iTimeout expiration of cache
51 51
 	 */
52
-	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0);
52
+	public function get(string $sName, int&$iFlags = null, int $iTimeout = 0);
53 53
 
54 54
 	/**
55 55
 	 * delete a value
Please login to merge, or discard this patch.
bundles/lib/I18n.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,8 +51,7 @@
 block discarded – undo
51 51
                 
52 52
                 $fCallBack = function($sValue) use ($oJson)
53 53
                 {    
54
-                    if (isset($oJson->$sValue)) { return $oJson->$sValue; }
55
-                    else { return ''; }
54
+                    if (isset($oJson->$sValue)) { return $oJson->$sValue; } else { return ''; }
56 55
                 };
57 56
             }
58 57
             
Please login to merge, or discard this patch.