Changeset 984

Timestamp:

10/25/07 15:07:14 (10 months ago)

Author:

mikey

Message:

various code improvements

Files:

• trunk/experiments/people/mikey/prototype/stubPrototype.php (modified) (3 diffs)
• trunk/src/main/php/info/phing/tasks/stubJsMinTask.php (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/events/stubEventDispatcher.php (modified) (9 diffs)
• trunk/src/main/php/net/stubbles/ipo/request/stubRequestValueError.php (modified) (3 diffs)
• trunk/src/main/php/net/stubbles/ipo/session/resourcemanager/stubSessionResourceManager.php (modified) (5 diffs)
• trunk/src/main/php/net/stubbles/php/string/stubMd5Encoder.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/rdbms/querybuilder/stubDatabaseMySQLQueryBuilder.php (modified) (13 diffs)
• trunk/src/main/php/net/stubbles/reflection/annotations/stubAnnotationFactory.php (modified) (8 diffs)
• trunk/src/main/php/net/stubbles/reflection/stubReflectionFunction.php (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/reflection/stubReflectionMethod.php (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/service/jsonrpc/stubJsonRpcProcessor.php (modified) (11 diffs)
• trunk/src/main/php/net/stubbles/star/StarClassRegistry.php (modified) (9 diffs)
• trunk/src/main/php/net/stubbles/util/net/http/stubHTTPResponse.php (modified) (6 diffs)
• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisConfig.php (modified) (5 diffs)
• trunk/src/main/php/net/stubbles/websites/rasmus/stubRasmusProcessor.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/websites/variantmanager/types/stubAbstractVariant.php (modified) (8 diffs)

trunk/experiments/people/mikey/prototype/stubPrototype.php

@@ -191 +191 @@
-        $modifiers = explode(' ', $modifier);
-        foreach ($modifiers as $checkModifier) {
-   
-   
-   
+    
+    
+    
-        }
-        
@@ -212 +212 @@
-        if (count($arguments) > 0) {
-            $paramString = '';
-$arguments as $key => $argument
-  
+array_keys($arguments) as $key
+   
-            }
-            
@@ -306 +306 @@
-        
-        foreach ($this->methods as $methodName => $methodData) {
-   
-   
-   
-   
+    
+    
+    
+    
-        }
-

trunk/src/main/php/info/phing/tasks/stubJsMinTask.php

@@ -101 +101 @@
-        }
-        
-        $error = false;
-        foreach ($this->filesets as $fs) {
-            try {
@@ -116 +115 @@
-                        file_put_contents($target, JSMin::minify(file_get_contents($fullPath . '/' . $file)));
-                    } catch (JSMinException $jsme) {
-                        $error = true;
-                        $this->log("Could not minify file $file: " . $jsme->getMessage(), Project::MSG_ERR);
-                    }

trunk/src/main/php/net/stubbles/events/stubEventDispatcher.php

@@ -77 +77 @@
-    public static function getInstance($name = '__global')
-    {
-
+=
-            self::$instances[$name] = new self($name);
-        }
@@ -91 +91 @@
-    public static function destroyInstance($name)
-    {
-
+=
-            foreach (self::$instances as $eventDispatcher) {
-                if ($eventDispatcher->hasParentDispatcher()) {
-
+=
-                        $eventDispatcher->removeParentDispatcher();
-                    }
@@ -161 +161 @@
-    {
-        $notified = $this->propagateQueuedEvents($eventListener, $eventName);
-
+=
-            return;
-        }
-        
-
+=
-            $this->listeners[$eventName] = array();
-        }
@@ -180 +180 @@
-    public function remove(stubEventListener $eventListener, $eventName)
-    {
- false || count($this->listeners[$eventName]) 
+= false || count($this->listeners[$eventName]) =
-            return;
-        }
-        
-
+=
-            unset($this->listeners[$eventName][get_class($eventListener)]);
-        }
@@ -197 +197 @@
-    public function has(stubEventListener $eventListener, $eventName)
-    {
- false || count($this->listeners[$eventName]) 
+= false || count($this->listeners[$eventName]) =
-            return false;
-        }
@@ -233 +233 @@
-    {
-        $eventName = $event->getName();
-
+=
-            foreach ($this->listeners[$eventName] as $eventListenerClassName => $eventListener) {
-this->listeners[$eventName][$eventListenerClassName]
+eventListener
-                
- $this->listeners[$eventName][$eventListenerClassName]
+= $eventListener
-                    unset($this->listeners[$eventName][$eventListenerClassName]);
-                }
@@ -247 +247 @@
-        }
-        
-
+=
-            $this->queue[] = $event;
-        }
-        
-
+=
-            $this->parentDispatcher->triggerEvent($event, $queue);
-        }
@@ -307 +307 @@
-            // if event listener is restricted to a special event
-            // and this event is not the special event skip this event
- $eventName && $event->getName() !
+= $eventName && $event->getName() !=
-                continue;
-            }
@@ -314 +314 @@
-            $notified++;
-            
-
+=
-                unset($this->queue[$key]);
-            }
-            
-
+=
-                break;
-            }

trunk/src/main/php/net/stubbles/ipo/request/stubRequestValueError.php

@@ -92 +92 @@
-    public function getMessage($locale)
-    {
-
+=
-            $message = $this->messages[$locale];
-            foreach ($this->values as $key => $value) {
@@ -132 +132 @@
-    protected function flattenValue($value)
-    {
-
+=
-            $value = join(', ', $value);
-
+=
-            if (method_exists($value, '__toString') == false) {
-                $value = get_class($value);
@@ -158 +158 @@
-    public function setValues(array $values)
-    {
-$this->values as $key => $value
-
+array_keys($this->values) as $key
+=
-                throw new stubRequestValueErrorException('Value for key ' . $key . ' is missing.');
-            }

trunk/src/main/php/net/stubbles/ipo/session/resourcemanager/stubSessionResourceManager.php

@@ -76 +76 @@
-    public function get(stubReflectionClass $type) {
-        $typeName = $type->getName();
-$this->resourceDefinitions as $interface => $implementation
+array_keys($this->resourceDefinitions) as $interface
-            $localName = substr($interface, strrpos($interface, '.')+1);
-            if ($localName === $typeName) {
@@ -97 +97 @@
-        $implementation = $this->getImplementation($interface);
-
-
+ === true
-            return $this->resources[$implementation];
-        }
-
-        $sessionKey = 'net.stubbles.ipo.session.resourcemanager#'.$implementation;
-
+ === true
-            $this->resources[$implementation] = $this->session->getValue($sessionKey);
-            return $this->resources[$implementation];
@@ -123 +123 @@
-     */
-    protected function getFullQualifiedInterfaceName($interface) {
-
+ === true
-            return $interface;
-        }
-        if ($interface instanceof stubReflectionClass) {
-!$interface->isInterface()
+$interface->isInterface() === false
-                throw new stubIllegalArgumentException($interface->getFullQualifiedClassName . ' is no interface.');
-            }
@@ -154 +154 @@
-     */
-    protected function getImplementation($interface) {
-!isset($this->resourceDefinitions[$interface])
+isset($this->resourceDefinitions[$interface]) === false
-            throw new stubException('Resource ' . $interface . ' is not availabale.');
-        }
@@ -179 +179 @@
-     */
-    public function registerBindings(stubBinder $binder) {
-$this->resourceDefinitions as $interface => $impl
-+
+array_keys($this->resourceDefinitions) as $interface
+ + 
-            $binder->bind($localName)->toProvider($this);
-        }

trunk/src/main/php/net/stubbles/php/string/stubMd5Encoder.php

@@ -36 +36 @@
-    public function decode($string)
-    {
-an md5-encoded string
+md5-encoded string ' . $string . '
-    }
-

trunk/src/main/php/net/stubbles/rdbms/querybuilder/stubDatabaseMySQLQueryBuilder.php

@@ -63 +63 @@
-    {
-        $selectQuery = 'SELECT * FROM `' . $select->getBaseTableName() . '`';
-
+=
-            $joins = $select->getJoins();
-            foreach ($joins as $join) {
-                $selectQuery .= ' ' . $join->getType();
-
+=
-                $selectQuery .= 'JOIN `' . $join->getName() . '`';
-
+=
-                    $selectQuery .= ' ' . $join->getConditionType() . ' ';
-
+=
-                        $selectQuery .= '(' . $join->getCondition() . ')';
-                    } else {
@@ -80 +80 @@
-        }
-        
-
+=
-            $selectQuery .= ' WHERE ' . $select->getCriterion()->toSQL();
-        }
@@ -98 +98 @@
-        $queries = array();
-        foreach ($tableRows as $tableName => $tableRow) {
-
+=
-                throw new stubIllegalArgumentException('Table row for table ' . $tableName . ' is not an instance of net.stubbles.querybuilder.stubDatabaseTableRow.');
-            }
@@ -112 +112 @@
-                if (null === $columnValue) {
-                    $queries[$tableName] .= 'NULL';
-
+=
-                    $queries[$tableName] .= $columnValue;
-                } else {
@@ -138 +138 @@
-        $queries    = array();
-        foreach ($tableRows as $tableName => $tableRow) {
-
+=
-                throw new stubIllegalArgumentException('Table row for table ' . $tableName . ' is not an instance of net.stubbles.querybuilder.stubDatabaseTableRow.');
-            }
@@ -144 +144 @@
-            $tableName           = $tableRow->getTableName();
-            $queries[$tableName] = 'UPDATE `' . $tableName . '` SET ';
-            $where               = array();
-            $counter             = 0;
-            foreach ($tableRow->getColumns() as $columnName => $columnValue) {
@@ -154 +153 @@
-                if (null === $columnValue) {
-                    $queries[$tableName] .= 'NULL';
-
+=
-                    $queries[$tableName] .= $columnValue;
-                } else {
@@ -163 +162 @@
-            }
-            
-
+=
-                $queries[$tableName] .= ' WHERE ' . $tableRow->getCriterion()->toSQL();
-            }
@@ -191 +190 @@
-    public function createTable(stubDatabaseTableDescription $tableDescription)
-    {
-    
-    
-
+
+
+=
-            throw new stubDatabaseQueryBuilderException('A table must contain at least one column, but description for table ' . $tableDescription->getName() . ' does not contain any column.');
-        }
@@ -207 +206 @@
-            $counter++;
-            $query   .= '  ' . $column->getName() . ' ' . strtoupper($column->getType());
-
+=
-                $query   .= '(' . $column->getSize() . ')';
-            }
-            
-
-
+=
+=
-                    $query .= ' CHARACTER SET ' . $column->getCharacterSet();
-                }
-                
-
+=
-                    $query .= ' COLLATE ' . $column->getCollation();
-                }
-
+=
-                if ($column->isUnsigned() == true) {
-                    $query .= ' UNSIGNED';
@@ -229 +228 @@
-            }
-            
- true && $column->getDefaultValue() 
+= true && $column->getDefaultValue() =
-                $query .= ' DEFAULT NULL';
-            } else {
@@ -241 +240 @@
-            }
-            
-
+=
-                if ($this->isNumericColumn($column->getType()) === true) {
-                    $query .= ' AUTO_INCREMENT';
@@ -247 +246 @@
-                
-                $primaryKeys[] = $column->getName();
-
+=
-                $keys[] = $column->getName();
-            }

trunk/src/main/php/net/stubbles/reflection/annotations/stubAnnotationFactory.php

@@ -52 +52 @@
-    public static function create($comment, $annotationName, $target, $targetName, $fileName)
-    {
-
-$cachedAnnotation = 
+ === true
+
-        }
-
-        $hash = md5($fileName . $comment . $target . $targetName);
-
-
+=
+=
-                stubClassLoader::load('net.stubbles.reflection.annotations.parser.stubAnnotationStateParser');
-                self::$parser = new stubAnnotationStateParser();
@@ -66 +66 @@
-        }
-
-
+=
-            throw new ReflectionException('Can not find annotation ' . $annotationName);
-        }
@@ -73 +73 @@
-        $annotation      = new $annotationClass();
-
-
+=
-            throw new ReflectionException('The annotation: ' . $annotationName . ' is not an instance of net.stubbles.reflection.annotations.stubAnnotation.');
-        }
-        
-
+=
-            $annotationType = self::findAnnotationClass($annotationName, true);
-
+=
-                throw new ReflectionException('The annotation: ' . $annotationName . ' is not an instance of ' . $annotationType . '.');
-            }
-        }
-        
-
+=
-            throw new ReflectionException('The annotation: ' . $annotationName . ' is not applicable for the given type.');
-        }
@@ -103 +103 @@
-    public static function isApplicable(stubAnnotation $annotation, $target)
-    {
-
+=
-    }
-
@@ -117 +117 @@
-        $refClass = new ReflectionClass($annotation);
-        foreach ($data as $name => $value) {
-
+=
-                $refClass->getMethod('set' . ucfirst($name))->invoke($annotation, $value);
-
+=
-                $refClass->getProperty($name)->setValue($annotation, $value);
-            } else {
@@ -141 +141 @@
-    public static function has($comment, $annotationName, $target, $targetName, $fileName)
-    {
-        $annotation = null;
-        try {
-            $annotation = self::create($comment, $annotationName, $target, $targetName, $fileName);
-        } catch (ReflectionException $e) {
+            $annotation = null;
-        }
-
@@ -172 +172 @@
-    private static function findAnnotationClass($annotationClass, $allowInterface = false)
-    {
-
+=
-            return $annotationClass;
-        }
-        
- $allowInterface && interface_exists($annotationClass, false) 
+= $allowInterface && interface_exists($annotationClass, false) =
-            return $annotationClass;
-        }
@@ -182 +182 @@
-        $annotationClassname = $annotationClass  . 'Annotation';
-        foreach (self::$prefixes as $prefix) {
-
+=
-                return $prefix . $annotationClassname;
-            }
-            
- $allowInterface && interface_exists($prefix . $annotationClassname, false) 
+= $allowInterface && interface_exists($prefix . $annotationClassname, false) =
-                return $prefix . $annotationClassname;
-            }

trunk/src/main/php/net/stubbles/reflection/stubReflectionFunction.php

@@ -78 +78 @@
-    {
-        if ($compare instanceof self) {
-
+=
-        }
-        
@@ -143 +143 @@
-        $returnType  = trim($returnParts[0]);
-        try {
-return
+$reflectionType =
-        } catch (stubIllegalArgumentException $iae) {
-return
+$reflectionType =
-        }
+        
+        return $reflectionType;
-    }
-}

trunk/src/main/php/net/stubbles/reflection/stubReflectionMethod.php

@@ -86 +86 @@
-    {
-        if ($compare instanceof self) {
- $this->className && $compare->methodName 
+= $this->className && $compare->methodName =
-        }
-        
@@ -163 +163 @@
-        $returnType  = trim($returnParts[0]);
-        try {
-return
+$reflectionType =
-        } catch (stubIllegalArgumentException $iae) {
-return
+$reflectionType =
-        }
+        
+        return $reflectionType;
-    }
-}

trunk/src/main/php/net/stubbles/service/jsonrpc/stubJsonRpcProcessor.php

@@ -78 +78 @@
-        $this->loadServiceConfig($this->getServiceFilePath());
-
-
+ === true
-            $proxyClassvalidator = new stubRegexValidator('/^[A-Za-z,0-9_\.]+$/');
-            $classes = $this->request->getValidatedValue($proxyClassvalidator, '__generateProxy', stubRequest::SOURCE_PARAM);
-$classes === '__all'
+'__all' === $classes
-                $this->generateProxies();
-            } else {
-                $this->generateProxies(explode(',', $classes));
-            }
-
+ === true
-            $smdClassvalidator = new stubRegexValidator('/^[A-Za-z0-9_\.]+$/');
-            $class = $this->request->getValidatedValue($smdClassvalidator, '__smd', stubRequest::SOURCE_PARAM);
@@ -106 +106 @@
-    {
-        $configFile = stubConfig::getConfigPath() . '/xml/' . stubRegistry::getConfig(self::KEY_SERVICE_FILE,'json-rpc-service.xml');
-!file_exists($configFile) || !is_readable($configFile)
+file_exists($configFile) === false || is_readable($configFile) === false
-            stubClassLoader::load('net.stubbles.lang.exceptions.stubFileNotFoundException');
-            throw new stubFileNotFoundException($configFile);
@@ -122 +122 @@
-    {
-        $cacheFile = stubConfig::getCachePath() . '/jsonrpc_' . md5($serviceConfigFile) . '.cache';
-
+ === true
-            $cacheData = unserialize(file_get_contents($cacheFile));
-            $this->classMap      = $cacheData['classMap'];
-            $this->serviceConfig = $cacheData['serviceConfig'];
- true
+
-        }
-
@@ -163 +163 @@
-        $generator = new stubJsonRpcProxyGenerator($serviceUrl);
-        foreach ($this->classMap as $jsClass => $serviceConfig) {
-&& !in_array($jsClass, $classes)
+=== true && in_array($jsClass, $classes) === false
-                continue;
-            }
@@ -170 +170 @@
-                $this->response->write($generator->generateJavascriptProxy($serviceConfig['className'], $jsClass));
-            } catch (Exception $e) {
-$this->serviceConfig['use-firebug'] === true
+true === $this->serviceConfig['use-firebug']
-                    $this->response->write("console.error('Generation of proxy for {$serviceConfig['className']} failed.');\n");
-                    $this->response->write($this->convertStringToFirebug($e->__toString()));
@@ -188 +188 @@
-        $tmp        = parse_url($this->request->getURI());
-        $serviceUrl = '//' . $tmp['path'];
-
+ === true
-            $processor   = $this->request->getValidatedValue(new stubPassThruValidator(), 'processor', stubRequest::SOURCE_PARAM);
-            $serviceUrl .= '?processor=' . $processor;
@@ -194 +194 @@
-        }
-        $generator = new stubSmdGenerator($serviceUrl);
+        $classInfo = $this->classMap[$class];
-        try {
-            $classInfo = $this->classMap[$class];
-            $this->response->write($generator->generateSmd($classInfo['className'], $class));
-        } catch (Exception $e) {
-$this->serviceConfig['use-firebug'] === true
-serviceConfig
+true === $this->serviceConfig['use-firebug']
+classInfo
-                $this->response->write($this->convertStringToFirebug($e->__toString()));
-            }
@@ -234 +234 @@
-        $requestJsonObj = $this->request->getValidatedRawData(new stubPassThruValidator());
-        $phpJsonObj     = json_decode($requestJsonObj);
-!is_object($phpJsonObj)
+is_object($phpJsonObj) === false
-            $this->response->writeFault(null, 'Invalid request.');
-            return;
-        }
-
-!isset($phpJsonObj->id)
+isset($phpJsonObj->id) === false
-            $this->response->writeFault(null, 'Invalid request: No id given.');
-            return;
-        }
-
-!isset($phpJsonObj->method)
+isset($phpJsonObj->method) === false
-            $this->response->writeFault($phpJsonObj->id, 'Invalid request: No method given.');
-            return;
-        }
-
-!isset($phpJsonObj->params)
+isset($phpJsonObj->params) === false
-            $this->response->writeFault($phpJsonObj->id, 'Invalid request: No params given.');
-            return;
@@ -256 +256 @@
-        try {
-            $className = null;
-
+ === true
-                $className = $this->request->getValidatedValue(new stubPassThruValidator(), '__class');
-            }
@@ -303 +303 @@
-    protected function getClassAndMethod($methodName, $className = null)
-    {
-$className === null
+null === $className
-            if (!preg_match(self::CLASS_AND_METHOD_PATTERN, $methodName)) {
-                throw new stubException('Invalid request: method-Pattern has to be <className>.<methodName>.');
@@ -310 +310 @@
-            list($className, $methodName) = explode('.', $methodName);
-        }
-!isset($this->classMap[$className])
+isset($this->classMap[$className]) === false
-            throw new stubException('Unknown class ' . $className . '.');
-        }
-
-        $clazz = new stubReflectionClass($this->classMap[$className]['className']);
-
+=
-            throw new stubException('Unknown method ' . $className . '.' . $methodName . '.');
-        }
-
-        $method = $clazz->getMethod($methodName);
-!$method->hasAnnotation('WebMethod')
+$method->hasAnnotation('WebMethod') === false
-            throw new stubException('Method ' . $className . '.' . $methodName . ' is no WebMethod.');
-        }

trunk/src/main/php/net/stubbles/star/StarClassRegistry.php

@@ -63 +63 @@
-        }
-        
-
+=
-            return self::$classes[$fqClassName];
-        }
@@ -82 +82 @@
-        }
-        
-
+=
-            return 'star://' . self::$classes[$fqClassName] . '?' . $fqClassName;
-        }
@@ -104 +104 @@
-        foreach (self::$files as $file => $contents) {
-            foreach ($contents as $content) {
-
+=
-                    $uris[] = 'star://' . $file . '?' . $resource;
-                    continue 2;
@@ -126 +126 @@
-        }
-        
-
+=
-            return self::$files[$file];
-        }
@@ -153 +153 @@
-
-        if (count(self::$libPathes) == 0) {
-
+=
-                $path = str_replace('star://', '', str_replace('?net.stubbles.star.StarClassRegistry', '', __FILE__));
-                self::$libPathes[dirname($path)] = true;
@@ -162 +162 @@
-
-        foreach (self::$libPathes as $libPath => $recursive) {
-
+=
-                $cache = unserialize(file_get_contents($libPath . '/.cache'));
-                self::$files    = array_merge(self::$files, $cache['files']);
@@ -179 +179 @@
-            $cache['classes'] = array();
-            foreach ($dirIt as $file) {
- false || substr($file->getPathname(), -14) == 'starReader.php' || (substr($file->getPathname(), -5) != '.star' && substr($file->getPathname(), -4) !
+= false || substr($file->getPathname(), -14) === 'starReader.php' || (substr($file->getPathname(), -5) !== '.star' && substr($file->getPathname(), -4) !=
-                    continue;
-                }
@@ -192 +192 @@
-                $cache['files'][$file->getPathname()] = $classes;
-
-$archiveData['index'] as $fqClassName => $storeData
+array_keys($archiveData['index']) as $fqClassName
-                    self::$classes[$fqClassName]    = $file->getPathname();
-                    $cache['classes'][$fqClassName] = $file->getPathname();
@@ -199 +199 @@
-
-            $cacheFile = $libPath . '/.cache';
-!is_writable($libPath) && !is_writable($cacheFile)
+is_writable($libPath) === false && is_writable($cacheFile) === false
-                throw new StarException("Unable to write starRegistry cache file to {$cacheFile}.");
-            }
+            
-            file_put_contents($cacheFile, serialize($cache));
-            self::$initDone = true;

trunk/src/main/php/net/stubbles/util/net/http/stubHTTPResponse.php

@@ -117 +117 @@
-            $header = '';
-            $line   = '';
- false && stubHTTPConnection::END_OF_LINE !
+= false && stubHTTPConnection::END_OF_LINE !=
-                $line    = $this->socket->read();
-                $header .= $line;
@@ -123 +123 @@
-            
-            $this->headers = stubHeaderList::fromString($header);
-
+=
-                $readLength = $this->headers->get('Content-Length');
-            } else {
@@ -131 +131 @@
-            if (self::STATUS_CLASS_SUCCESS == $this->getType(self::TYPE_STATUS_CLASS)) {
-                // if server sends chunked data
- true && $this->headers->get('Transfer-Encoding') 
+