Changeset 2481

Timestamp:

07/29/2008 08:43:12 PM (5 months ago)

Author:

knut

Message:

fixed #890

Location:

trunk/framework

Files:

• Data/ActiveRecord/TActiveRecordManager.php (modified) (1 diff)
• Data/SqlMap/TSqlMapConfig.php (modified) (4 diffs)
• I18N/core/CultureInfo.php (modified) (3 diffs)
• I18N/core/DateFormat.php (modified) (2 diffs)
• I18N/core/DateTimeFormatInfo.php (modified) (1 diff)
• I18N/core/HTTPNegotiator.php (modified) (2 diffs)
• I18N/core/MessageSource_XLIFF.php (modified) (2 diffs)
• I18N/core/MessageSource_gettext.php (modified) (2 diffs)
• I18N/core/NumberFormat.php (modified) (2 diffs)
• I18N/core/NumberFormatInfo.php (modified) (1 diff)
• PradoBase.php (modified) (1 diff)
• Util/TSimpleDateFormatter.php (modified) (5 diffs)
• Web/Javascripts/TJavaScript.php (modified) (2 diffs)
• Web/UI/TClientScriptManager.php (modified) (3 diffs)
• prado-cli.php (modified) (1 diff)

trunk/framework/Data/ActiveRecord/TActiveRecordManager.php

@@ -94 +94 @@
         public function getRecordGateway()
         {
-                if(is_null($this->_gateway))
+                if($this->_gateway === null) {
                         $this->_gateway = $this->createRecordGateway();
+                }
                 return $this->_gateway;
         }

trunk/framework/Data/SqlMap/TSqlMapConfig.php

@@ -48 +48 @@
         {
                 $cache = $this->getApplication()->getCache();
-                if(!is_null($cache))
+                if($cache !== null) {
                         $cache->delete($this->getCacheKey());
+                }       
         }
 
@@ -61 +62 @@
                 {
                         $cache = $this->getApplication()->getCache();
-                        if(!is_null($cache))
+                        if($cache !== null) {
                                 return $cache->set($this->getCacheKey(), $manager);
+                        }
                 }
                 return false;
@@ -76 +78 @@
                 {
                         $cache = $this->getApplication()->getCache();
-                        if(!is_null($cache))
+                        if($cache !== null)
                         {
                                 $manager = $cache->get($this->getCacheKey());
@@ -105 +107 @@
                 {
                         $file = Prado::getPathOfNamespace($value,self::CONFIG_FILE_EXT);
-                        if(is_null($file) || !is_file($file))
+                        if($file === null || !is_file($file))
                                 throw new TConfigurationException('sqlmap_configfile_invalid',$value);
                         else

trunk/framework/I18N/core/CultureInfo.php

@@ -376 +376 @@
         function getDateTimeFormat()
         {
-                if(is_null($this->dateTimeFormat))
+                if($this->dateTimeFormat === null)
                 {
                         $calendar = $this->getCalendar();
@@ -456 +456 @@
         {
                 static $invariant;
-                if(is_null($invariant))
+                if($invariant === null)
                         $invariant = new CultureInfo();
                 return $invariant;
@@ -479 +479 @@
         function getNumberFormat()
         {
-                if(is_null($this->numberFormat))
+                if($this->numberFormat === null)
                 {
                         $elements = $this->findInfo('NumberElements');

trunk/framework/I18N/core/DateFormat.php

@@ -92 +92 @@
         function __construct($formatInfo=null)
         {
-                if(is_null($formatInfo))
+                if($formatInfo === null)
                         $this->formatInfo = DateTimeFormatInfo::getInvariantInfo();
                 else if($formatInfo instanceof CultureInfo)
@@ -116 +116 @@
                         $time = @strtotime($time);
 
-                if(is_null($pattern))
+                if($pattern === null)
                         $pattern = 'F';
 

trunk/framework/I18N/core/DateTimeFormatInfo.php

@@ -153 +153 @@
     {
         static $invariant;
-                if(is_null($invariant))
+                if($invariant === null)
         {
             $culture = CultureInfo::getInvariantCulture();

trunk/framework/I18N/core/HTTPNegotiator.php

@@ -52 +52 @@
         function getLanguages()
         {
-                if(!is_null($this->languages))
+                if($this->languages !== null) {
                         return $this->languages;
+                }
 
                 $this->languages = array();
@@ -108 +109 @@
         function getCharsets()
         {
-        if(!is_null($this->charsets))
+        if($this->charsets !== null) {
                         return $this->charsets;
+                }
 
                 $this->charsets = array();

trunk/framework/I18N/core/MessageSource_XLIFF.php

@@ -252 +252 @@
         private function getVariants($catalogue='messages')
         {
-                if(is_null($catalogue))
+                if($catalogue === null) {
                         $catalogue = 'messages';
+                }
 
                 foreach($this->getCatalogueList($catalogue) as $variant)
@@ -479 +480 @@
         protected function createMessageTemplate($catalogue)
         {
-                if(is_null($catalogue))
+                if($catalogue === null) {
                         $catalogue = 'messages';
+                }
                 $variants = $this->getCatalogueList($catalogue);
                 $variant = array_shift($variants);

trunk/framework/I18N/core/MessageSource_gettext.php

@@ -187 +187 @@
         private function getVariants($catalogue='messages')
         {
-                if(is_null($catalogue))
+                if($catalogue === null) {
                         $catalogue = 'messages';
+                }
 
                 foreach($this->getCatalogueList($catalogue) as $variant)
@@ -424 +425 @@
         protected function createMessageTemplate($catalogue)
         {
-                if(is_null($catalogue))
+                if($catalogue === null) {
                         $catalogue = 'messages';
+                }
                 $variants = $this->getCatalogueList($catalogue);
                 $variant = array_shift($variants);

trunk/framework/I18N/core/NumberFormat.php

@@ -91 +91 @@
         function __construct($formatInfo=null)
         {
-                if(is_null($formatInfo))
+                if($formatInfo === null)
                         $this->formatInfo = NumberFormatInfo::getInvariantInfo();
                 else if($formatInfo instanceof CultureInfo)
@@ -144 +144 @@
                 //replace currency sign
                 $symbol = @$this->formatInfo->getCurrencySymbol($currency);
-                if(is_null($symbol))
+                if($symbol === null) {
                         $symbol = $currency;
+                }
 
                 $result = str_replace('€',$symbol, $result);

trunk/framework/I18N/core/NumberFormatInfo.php

@@ -156 +156 @@
     {
         static $invariant;
-                if(is_null($invariant))
+                if($invariant === null)
         {
             $culture = CultureInfo::getInvariantCulture();

trunk/framework/PradoBase.php

@@ -415 +415 @@
                                         else if (is_bool($item))
                                                 echo $item ? 'true' : 'false';
-                                        else if (is_null($item))
+                                        else if ($item === null)
                                                 echo 'NULL';
                                         else if (is_resource($item))

trunk/framework/Util/TSimpleDateFormatter.php

@@ -190 +190 @@
         public function isValidDate($value)
         {
-                if(is_null($value))
+                if($value === null) {
                         return false;
-                else
-                        return !is_null($this->parse($value, false));
+                } else {
+                        return $this->parse($value, false) !== null;
+                }
         }
 
@@ -255 +256 @@
                                 if ($token=='y')    { $x=2;$y=4; }
                                 $year = $this->getInteger($value,$i_val,$x,$y);
-                                if(is_null($year))
+                                if($year === null)
                                         return null;
                                         //throw new TInvalidDataValueException('Invalid year', $value);
@@ -274 +275 @@
                                                                         $this->length($token),2);
                                 $iMonth = intval($month);
-                                if(is_null($month) || $iMonth < 1 || $iMonth > 12 )
+                                if($month === null || $iMonth < 1 || $iMonth > 12 )
                                         return null;
                                         //throw new TInvalidDataValueException('Invalid month', $value);
@@ -285 +286 @@
                                                                         $this->length($token), 2);
                                 $iDay = intval($day);
-                                if(is_null($day) || $iDay < 1 || $iDay >31)
+                                if($day === null || $iDay < 1 || $iDay >31)
                                         return null;
                                         //throw new TInvalidDataValueException('Invalid day', $value);
@@ -302 +303 @@
                 if ($i_val != $this->length($value))
                         throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-                if(!$defaultToCurrentTime && (is_null($month) || is_null($day) || is_null($year)))
+                if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
                         return null;
                 else

trunk/framework/Web/Javascripts/TJavaScript.php

@@ -209 +209 @@
         public static function jsonEncode($value)
         {
-                if(is_null(self::$_json))
+                if(self::$_json === null)
                         self::$_json = Prado::createComponent('System.Web.Javascripts.TJSON');
                 return self::$_json->encode($value);
@@ -222 +222 @@
         public static function jsonDecode($value)
         {
-                if(is_null(self::$_json))
+                if(self::$_json === null)
                         self::$_json = Prado::createComponent('System.Web.Javascripts.TJSON');
                 return self::$_json->decode($value);

trunk/framework/Web/UI/TClientScriptManager.php

@@ -116 +116 @@
                 if(!isset($this->_registeredPradoScripts[$name]))
                 {
-                        if(is_null(self::$_pradoScripts))
+                        if(self::$_pradoScripts === null)
                         {
                                 $packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH.'/packages.php';
@@ -208 +208 @@
                 if(strpos($base, $assets->getBaseUrl())===false)
                 {
-                        if(!is_null($dir = Prado::getPathOfNameSpace($base)))
+                        if(($dir = Prado::getPathOfNameSpace($base)) !== null) {
                                 $base = $dir;
+                        }
                         return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
                 }
@@ -260 +261 @@
         public function registerPostBackControl($class,$options)
         {
-                if(is_null($class)) return;
+                if($class === null) {
+                        return;
+                }
                 if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
                         $options['FormID']=$form->getClientID();

trunk/framework/prado-cli.php

@@ -80 +80 @@
         {
                 static $instance;
-                if(is_null($instance))
+                if($instance === null)
                         $instance = new self;
                 return $instance;