request)): ?>no routerequest->getPresenterName() . ':' . (isset($this->request->params[Presenter::ACTION_KEY]) ? $this->request->params[Presenter::ACTION_KEY] : Presenter::DEFAULT_ACTION) . (isset($this->request->params[Presenter::SIGNAL_KEY]) ? " {$this->request->params[Presenter::SIGNAL_KEY]}!" : ''); endif ?>
+
+error
+ array('Oops...', 'Your browser sent a request that this server could not understand or process.'), + 403 => array('Access Denied', 'You do not have permission to view this page. Please try contact the web site administrator if you believe you should be able to view this page.'), + 404 => array('Page Not Found', 'The page you requested could not be found. It is possible that the address is incorrect, or that the page no longer exists. Please use a search engine to find what you are looking for.'), + 405 => array('Method Not Allowed', 'The requested method is not allowed for the URL.'), + 410 => array('Page Not Found', 'The page you requested has been taken off the site. We apologize for the inconvenience.'), + 500 => array('Server Error', 'We\'re sorry! The server encountered an internal error and was unable to complete your request. Please try again later.'), +); +$message = isset($messages[$code]) ? $messages[$code] : $messages[0]; + +?> + + + + + +error
diff --git a/libs/Nette/Caching/Cache.php b/libs/Nette/Caching/Cache.php index 8e22a7a..d746acb 100644 --- a/libs/Nette/Caching/Cache.php +++ b/libs/Nette/Caching/Cache.php @@ -1,368 +1,428 @@ -storage = $storage; - $this->namespace = $namespace . self::NAMESPACE_SEPARATOR; - } - - - - /** - * Returns cache storage. - * @return IStorage - */ - public function getStorage() - { - return $this->storage; - } - - - - /** - * Returns cache namespace. - * @return string - */ - public function getNamespace() - { - return (string) substr($this->namespace, 0, -1); - } - - - - /** - * Returns new nested cache object. - * @param string - * @return Cache - */ - public function derive($namespace) - { - $derived = new static($this->storage, $this->namespace . $namespace); - return $derived; - } - - - - /** - * Discards the internal cache. - * @return void - */ - public function release() - { - $this->key = $this->data = NULL; - } - - - - /** - * Retrieves the specified item from the cache or returns NULL if the key is not found. - * @param mixed key - * @return mixed|NULL - */ - public function load($key) - { - $key = is_scalar($key) ? (string) $key : serialize($key); - if ($this->key === $key) { - return $this->data; - } - $this->key = $key; - $this->data = $this->storage->read($this->namespace . md5($key)); - return $this->data; - } - - - - /** - * Writes item into the cache. - * Dependencies are: - * - Cache::PRIORITY => (int) priority - * - Cache::EXPIRATION => (timestamp) expiration - * - Cache::SLIDING => (bool) use sliding expiration? - * - Cache::TAGS => (array) tags - * - Cache::FILES => (array|string) file names - * - Cache::ITEMS => (array|string) cache items - * - Cache::CONSTS => (array|string) cache items - * - * @param mixed key - * @param mixed value - * @param array dependencies - * @return mixed value itself - * @throws Nette\InvalidArgumentException - */ - public function save($key, $data, array $dp = NULL) - { - $this->key = is_scalar($key) ? (string) $key : serialize($key); - $key = $this->namespace . md5($this->key); - - // convert expire into relative amount of seconds - if (isset($dp[Cache::EXPIRATION])) { - $dp[Cache::EXPIRATION] = Nette\DateTime::from($dp[Cache::EXPIRATION])->format('U') - time(); - } - - // convert FILES into CALLBACKS - if (isset($dp[self::FILES])) { - //clearstatcache(); - foreach ((array) $dp[self::FILES] as $item) { - $dp[self::CALLBACKS][] = array(array(__CLASS__, 'checkFile'), $item, @filemtime($item)); // @ - stat may fail - } - unset($dp[self::FILES]); - } - - // add namespaces to items - if (isset($dp[self::ITEMS])) { - $dp[self::ITEMS] = (array) $dp[self::ITEMS]; - foreach ($dp[self::ITEMS] as $k => $item) { - $dp[self::ITEMS][$k] = $this->namespace . md5(is_scalar($item) ? $item : serialize($item)); - } - } - - // convert CONSTS into CALLBACKS - if (isset($dp[self::CONSTS])) { - foreach ((array) $dp[self::CONSTS] as $item) { - $dp[self::CALLBACKS][] = array(array(__CLASS__, 'checkConst'), $item, constant($item)); - } - unset($dp[self::CONSTS]); - } - - if ($data instanceof Nette\Callback || $data instanceof \Closure) { - Nette\Utils\CriticalSection::enter(); - $data = $data->__invoke(); - Nette\Utils\CriticalSection::leave(); - } - - if (is_object($data)) { - $dp[self::CALLBACKS][] = array(array(__CLASS__, 'checkSerializationVersion'), get_class($data), - Nette\Reflection\ClassType::from($data)->getAnnotation('serializationVersion')); - } - - $this->data = $data; - if ($data === NULL) { - $this->storage->remove($key); - } else { - $this->storage->write($key, $data, (array) $dp); - } - return $data; - } - - - - /** - * Removes items from the cache by conditions. - * Conditions are: - * - Cache::PRIORITY => (int) priority - * - Cache::TAGS => (array) tags - * - Cache::ALL => TRUE - * - * @param array - * @return void - */ - public function clean(array $conds = NULL) - { - $this->release(); - $this->storage->clean((array) $conds); - } - - - - /** - * Caches results of function/method calls. - * @param mixed - * @return mixed - */ - public function call($function) - { - $key = func_get_args(); - if ($this->load($key) === NULL) { - array_shift($key); - return $this->save($this->key, call_user_func_array($function, $key)); - } else { - return $this->data; - } - } - - - - /** - * Starts the output cache. - * @param mixed key - * @return OutputHelper|NULL - */ - public function start($key) - { - if ($this->offsetGet($key) === NULL) { - return new OutputHelper($this, $key); - } else { - echo $this->data; - } - } - - - - /********************* interface ArrayAccess ****************d*g**/ - - - - /** - * Inserts (replaces) item into the cache (\ArrayAccess implementation). - * @param mixed key - * @param mixed - * @return void - * @throws Nette\InvalidArgumentException - */ - public function offsetSet($key, $data) - { - $this->save($key, $data); - } - - - - /** - * Retrieves the specified item from the cache or NULL if the key is not found (\ArrayAccess implementation). - * @param mixed key - * @return mixed|NULL - * @throws Nette\InvalidArgumentException - */ - public function offsetGet($key) - { - return $this->load($key); - } - - - - /** - * Exists item in cache? (\ArrayAccess implementation). - * @param mixed key - * @return bool - * @throws Nette\InvalidArgumentException - */ - public function offsetExists($key) - { - return $this->load($key) !== NULL; - } - - - - /** - * Removes the specified item from the cache. - * @param mixed key - * @return void - * @throws Nette\InvalidArgumentException - */ - public function offsetUnset($key) - { - $this->save($key, NULL); - } - - - - /********************* dependency checkers ****************d*g**/ - - - - /** - * Checks CALLBACKS dependencies. - * @param array - * @return bool - */ - public static function checkCallbacks($callbacks) - { - foreach ($callbacks as $callback) { - $func = array_shift($callback); - if (!call_user_func_array($func, $callback)) { - return FALSE; - } - } - return TRUE; - } - - - - /** - * Checks CONSTS dependency. - * @param string - * @param mixed - * @return bool - */ - private static function checkConst($const, $value) - { - return defined($const) && constant($const) === $value; - } - - - - /** - * Checks FILES dependency. - * @param string - * @param int - * @return bool - */ - private static function checkFile($file, $time) - { - return @filemtime($file) == $time; // @ - stat may fail - } - - - - /** - * Checks object @serializationVersion label. - * @param string - * @param mixed - * @return bool - */ - private static function checkSerializationVersion($class, $value) - { - return Nette\Reflection\ClassType::from($class)->getAnnotation('serializationVersion') === $value; - } - -} +storage = $storage; + $this->namespace = $namespace . self::NAMESPACE_SEPARATOR; + } + + + + /** + * Returns cache storage. + * @return IStorage + */ + public function getStorage() + { + return $this->storage; + } + + + + /** + * Returns cache namespace. + * @return string + */ + public function getNamespace() + { + return (string) substr($this->namespace, 0, -1); + } + + + + /** + * Returns new nested cache object. + * @param string + * @return Cache + */ + public function derive($namespace) + { + $derived = new static($this->storage, $this->namespace . $namespace); + return $derived; + } + + + + /** + * Reads the specified item from the cache or generate it. + * @param mixed key + * @param callable + * @return mixed|NULL + */ + public function load($key, $fallback = NULL) + { + $data = $this->storage->read($this->generateKey($key)); + if ($data === NULL && $fallback) { + return $this->save($key, new Nette\Callback($fallback)); + } + return $data; + } + + + + /** + * Writes item into the cache. + * Dependencies are: + * - Cache::PRIORITY => (int) priority + * - Cache::EXPIRATION => (timestamp) expiration + * - Cache::SLIDING => (bool) use sliding expiration? + * - Cache::TAGS => (array) tags + * - Cache::FILES => (array|string) file names + * - Cache::ITEMS => (array|string) cache items + * - Cache::CONSTS => (array|string) cache items + * + * @param mixed key + * @param mixed value + * @param array dependencies + * @return mixed value itself + * @throws Nette\InvalidArgumentException + */ + public function save($key, $data, array $dp = NULL) + { + $this->release(); + $key = $this->generateKey($key); + + if ($data instanceof Nette\Callback || $data instanceof \Closure) { + $this->storage->lock($key); + $data = Nette\Callback::create($data)->invokeArgs(array(&$dp)); + } + + if ($data === NULL) { + $this->storage->remove($key); + } else { + $this->storage->write($key, $data, $this->completeDependencies($dp, $data)); + return $data; + } + } + + + + private function completeDependencies($dp, $data) + { + if (is_object($data)) { + $dp[self::CALLBACKS][] = array(array(__CLASS__, 'checkSerializationVersion'), get_class($data), + Nette\Reflection\ClassType::from($data)->getAnnotation('serializationVersion')); + } + + // convert expire into relative amount of seconds + if (isset($dp[Cache::EXPIRATION])) { + $dp[Cache::EXPIRATION] = Nette\DateTime::from($dp[Cache::EXPIRATION])->format('U') - time(); + } + + // convert FILES into CALLBACKS + if (isset($dp[self::FILES])) { + //clearstatcache(); + foreach (array_unique((array) $dp[self::FILES]) as $item) { + $dp[self::CALLBACKS][] = array(array(__CLASS__, 'checkFile'), $item, @filemtime($item)); // @ - stat may fail + } + unset($dp[self::FILES]); + } + + // add namespaces to items + if (isset($dp[self::ITEMS])) { + $dp[self::ITEMS] = array_unique((array) $dp[self::ITEMS]); + foreach ($dp[self::ITEMS] as $k => $item) { + $dp[self::ITEMS][$k] = $this->generateKey($item); + } + } + + // convert CONSTS into CALLBACKS + if (isset($dp[self::CONSTS])) { + foreach (array_unique((array) $dp[self::CONSTS]) as $item) { + $dp[self::CALLBACKS][] = array(array(__CLASS__, 'checkConst'), $item, constant($item)); + } + unset($dp[self::CONSTS]); + } + + if (!is_array($dp)) { + $dp = array(); + } + return $dp; + } + + + + /** + * Removes item from the cache. + * @param mixed key + * @return void + */ + public function remove($key) + { + $this->save($key, NULL); + } + + + + /** + * Removes items from the cache by conditions. + * Conditions are: + * - Cache::PRIORITY => (int) priority + * - Cache::TAGS => (array) tags + * - Cache::ALL => TRUE + * + * @param array + * @return void + */ + public function clean(array $conds = NULL) + { + $this->release(); + $this->storage->clean((array) $conds); + } + + + + /** + * Caches results of function/method calls. + * @param mixed + * @return mixed + */ + public function call($function) + { + $key = func_get_args(); + return $this->load($key, function() use ($function, $key) { + array_shift($key); + return Nette\Callback::create($function)->invokeArgs($key); + }); + } + + + + /** + * Caches results of function/method calls. + * @param mixed + * @param array dependencies + * @return Closure + */ + public function wrap($function, array $dp = NULL) + { + $cache = $this; + return function() use ($cache, $function, $dp) { + $key = array($function, func_get_args()); + $data = $cache->load($key); + if ($data === NULL) { + $data = $cache->save($key, Nette\Callback::create($function)->invokeArgs($key[1]), $dp); + } + return $data; + }; + } + + + + /** + * Starts the output cache. + * @param mixed key + * @return OutputHelper|NULL + */ + public function start($key) + { + $data = $this->load($key); + if ($data === NULL) { + return new OutputHelper($this, $key); + } + echo $data; + } + + + + /** + * Generates internal cache key. + * + * @param string + * @return string + */ + protected function generateKey($key) + { + return $this->namespace . md5(is_scalar($key) ? $key : serialize($key)); + } + + + + /********************* interface ArrayAccess ****************d*g**/ + + + + /** + * Inserts (replaces) item into the cache (\ArrayAccess implementation). + * @param mixed key + * @param mixed + * @return void + * @throws Nette\InvalidArgumentException + */ + public function offsetSet($key, $data) + { + $this->save($key, $data); + } + + + + /** + * Retrieves the specified item from the cache or NULL if the key is not found (\ArrayAccess implementation). + * @param mixed key + * @return mixed|NULL + * @throws Nette\InvalidArgumentException + */ + public function offsetGet($key) + { + $key = is_scalar($key) ? (string) $key : serialize($key); + if ($this->key !== $key) { + $this->key = $key; + $this->data = $this->load($key); + } + return $this->data; + } + + + + /** + * Exists item in cache? (\ArrayAccess implementation). + * @param mixed key + * @return bool + * @throws Nette\InvalidArgumentException + */ + public function offsetExists($key) + { + $this->release(); + return $this->offsetGet($key) !== NULL; + } + + + + /** + * Removes the specified item from the cache. + * @param mixed key + * @return void + * @throws Nette\InvalidArgumentException + */ + public function offsetUnset($key) + { + $this->save($key, NULL); + } + + + + /** + * Discards the internal cache used by ArrayAccess. + * @return void + */ + public function release() + { + $this->key = $this->data = NULL; + } + + + + /********************* dependency checkers ****************d*g**/ + + + + /** + * Checks CALLBACKS dependencies. + * @param array + * @return bool + */ + public static function checkCallbacks($callbacks) + { + foreach ($callbacks as $callback) { + $func = array_shift($callback); + if (!call_user_func_array($func, $callback)) { + return FALSE; + } + } + return TRUE; + } + + + + /** + * Checks CONSTS dependency. + * @param string + * @param mixed + * @return bool + */ + private static function checkConst($const, $value) + { + return defined($const) && constant($const) === $value; + } + + + + /** + * Checks FILES dependency. + * @param string + * @param int + * @return bool + */ + private static function checkFile($file, $time) + { + return @filemtime($file) == $time; // @ - stat may fail + } + + + + /** + * Checks object @serializationVersion label. + * @param string + * @param mixed + * @return bool + */ + private static function checkSerializationVersion($class, $value) + { + return Nette\Reflection\ClassType::from($class)->getAnnotation('serializationVersion') === $value; + } + +} diff --git a/libs/Nette/Caching/IStorage.php b/libs/Nette/Caching/IStorage.php index e01b0ae..cf67751 100644 --- a/libs/Nette/Caching/IStorage.php +++ b/libs/Nette/Caching/IStorage.php @@ -1,56 +1,63 @@ -cache = $cache; - $this->key = $key; - ob_start(); - } - - - - /** - * Stops and saves the cache. - * @return void - */ - public function end() - { - if ($this->cache === NULL) { - throw new Nette\InvalidStateException('Output cache has already been saved.'); - } - $this->cache->save($this->key, ob_get_flush(), $this->dependencies); - $this->cache = NULL; - } - -} +cache = $cache; + $this->key = $key; + ob_start(); + } + + + + /** + * Stops and saves the cache. + * @param array dependencies + * @return void + */ + public function end(array $dp = NULL) + { + if ($this->cache === NULL) { + throw new Nette\InvalidStateException('Output cache has already been saved.'); + } + $this->cache->save($this->key, ob_get_flush(), (array) $dp + (array) $this->dependencies); + $this->cache = NULL; + } + +} diff --git a/libs/Nette/Caching/Storages/DevNullStorage.php b/libs/Nette/Caching/Storages/DevNullStorage.php index f26cbaf..1d6dfd1 100644 --- a/libs/Nette/Caching/Storages/DevNullStorage.php +++ b/libs/Nette/Caching/Storages/DevNullStorage.php @@ -1,70 +1,81 @@ - 0, - self::PRIORITY => 1, - self::ENTRIES => 2, - self::DATA => 3, - ); - - - - /** - * @param string Directory location with journal file - * @return void - */ - public function __construct($dir) - { - $this->file = $dir . '/' . self::FILE; - - // Create jorunal file when not exists - if (!file_exists($this->file)) { - $init = @fopen($this->file, 'xb'); // intentionally @ - if (!$init) { - clearstatcache(); - if (!file_exists($this->file)) { - throw new Nette\InvalidStateException("Cannot create journal file $this->file."); - } - } else { - $writen = fwrite($init, pack('N2', self::FILE_MAGIC, $this->lastNode)); - fclose($init); - if ($writen !== self::INT32_SIZE * 2) { - throw new Nette\InvalidStateException("Cannot write journal header."); - } - } - } - - $this->handle = fopen($this->file, 'r+b'); - - if (!$this->handle) { - throw new Nette\InvalidStateException("Cannot open journal file '$this->file'."); - } - - if (!flock($this->handle, LOCK_SH)) { - throw new Nette\InvalidStateException('Cannot acquire shared lock on journal.'); - } - - $header = stream_get_contents($this->handle, 2 * self::INT32_SIZE, 0); - - flock($this->handle, LOCK_UN); - - list(, $fileMagic, $this->lastNode) = unpack('N2', $header); - - if ($fileMagic !== self::FILE_MAGIC) { - fclose($this->handle); - $this->handle = false; - throw new Nette\InvalidStateException("Malformed journal file '$this->file'."); - } - } - - - - /** - * @return void - */ - public function __destruct() - { - if ($this->handle) { - $this->headerCommit(); - flock($this->handle, LOCK_UN); // Since PHP 5.3.3 is manual unlock necesary - fclose($this->handle); - $this->handle = false; - } - } - - - - /** - * Writes entry information into the journal. - * @param string - * @param array - * @return void - */ - public function write($key, array $dependencies) - { - $this->lock(); - - $priority = !isset($dependencies[Cache::PRIORITY]) ? FALSE : (int) $dependencies[Cache::PRIORITY]; - $tags = empty($dependencies[Cache::TAGS]) ? FALSE : (array) $dependencies[Cache::TAGS]; - - $exists = FALSE; - $keyHash = crc32($key); - list($entriesNodeId, $entriesNode) = $this->findIndexNode(self::ENTRIES, $keyHash); - - if (isset($entriesNode[$keyHash])) { - $entries = $this->mergeIndexData($entriesNode[$keyHash]); - foreach ($entries as $link => $foo) { - $dataNode = $this->getNode($link >> self::BITROT); - if ($dataNode[$link][self::KEY] === $key) { - if ($dataNode[$link][self::TAGS] == $tags && $dataNode[$link][self::PRIORITY] === $priority) { // intentionally ==, the order of tags does not matter - if ($dataNode[$link][self::DELETED]) { - $dataNode[$link][self::DELETED] = FALSE; - $this->saveNode($link >> self::BITROT, $dataNode); - } - $exists = TRUE; - } else { // Alredy exists, but with other tags or priority - $toDelete = array(); - foreach ($dataNode[$link][self::TAGS] as $tag) { - $toDelete[self::TAGS][$tag][$link] = TRUE; - } - if ($dataNode[$link][self::PRIORITY] !== FALSE) { - $toDelete[self::PRIORITY][$dataNode[$link][self::PRIORITY]][$link] = TRUE; - } - $toDelete[self::ENTRIES][$keyHash][$link] = TRUE; - $this->cleanFromIndex($toDelete); - $entriesNode = $this->getNode($entriesNodeId); // Node was changed, get again - unset($dataNode[$link]); - $this->saveNode($link >> self::BITROT, $dataNode); - } - break; - } - } - } - - if ($exists === FALSE) { - // Magical constants - $requiredSize = strlen($key) + 75; - if ($tags) { - foreach ($tags as $tag) { - $requiredSize += strlen($tag) + 13; - } - } - $requiredSize += $priority ? 10 : 1; - - $freeDataNode = $this->findFreeDataNode($requiredSize); - $data = $this->getNode($freeDataNode); - - if ($data === FALSE) { - $data = array( - self::INFO => array( - self::LAST_INDEX => ($freeDataNode << self::BITROT), - self::TYPE => self::DATA, - ) - ); - } - - $dataNodeKey = ++$data[self::INFO][self::LAST_INDEX]; - $data[$dataNodeKey] = array( - self::KEY => $key, - self::TAGS => $tags ? $tags : array(), - self::PRIORITY => $priority, - self::DELETED => FALSE, - ); - - $this->saveNode($freeDataNode, $data); - - // Save to entries tree, ... - $entriesNode[$keyHash][$dataNodeKey] = 1; - $this->saveNode($entriesNodeId, $entriesNode); - - // ...tags tree... - if ($tags) { - foreach ($tags as $tag) { - list($nodeId, $node) = $this->findIndexNode(self::TAGS, $tag); - $node[$tag][$dataNodeKey] = 1; - $this->saveNode($nodeId, $node); - } - } - - // ...and priority tree. - if ($priority) { - list($nodeId, $node) = $this->findIndexNode(self::PRIORITY, $priority); - $node[$priority][$dataNodeKey] = 1; - $this->saveNode($nodeId, $node); - } - } - - $this->commit(); - $this->unlock(); - } - - - - /** - * Cleans entries from journal. - * @param array - * @return array of removed items or NULL when performing a full cleanup - */ - public function clean(array $conditions) - { - $this->lock(); - - if (!empty($conditions[Cache::ALL])) { - $this->nodeCache = $this->nodeChanged = $this->dataNodeFreeSpace = array(); - $this->deleteAll(); - $this->unlock(); - return; - } - - $toDelete = array( - self::TAGS => array(), - self::PRIORITY => array(), - self::ENTRIES => array() - ); - - $entries = array(); - - if (!empty($conditions[Cache::TAGS])) { - $entries = $this->cleanTags((array) $conditions[Cache::TAGS], $toDelete); - } - - if (isset($conditions[Cache::PRIORITY])) { - $this->arrayAppend($entries, $this->cleanPriority((int) $conditions[Cache::PRIORITY], $toDelete)); - } - - $this->deletedLinks = array(); - $this->cleanFromIndex($toDelete); - - $this->commit(); - $this->unlock(); - - return $entries; - } - - - - /** - * Cleans entries from journal by tags. - * @param array - * @return array of removed items - */ - private function cleanTags(array $tags, array &$toDelete) - { - $entries = array(); - - foreach ($tags as $tag) { - list($nodeId, $node) = $this->findIndexNode(self::TAGS, $tag); - - if (isset($node[$tag])) { - $ent = $this->cleanLinks($this->mergeIndexData($node[$tag]), $toDelete); - $this->arrayAppend($entries, $ent); - } - } - - return $entries; - } - - - - /** - * Cleans entries from journal by priority. - * @param integer - * @param array - * @return array of removed items - */ - private function cleanPriority($priority, array &$toDelete) - { - list($nodeId, $node) = $this->findIndexNode(self::PRIORITY, $priority); - - ksort($node); - - $allData = array(); - - foreach ($node as $prior => $data) { - if ($prior === self::INFO) { - continue; - } elseif ($prior > $priority) { - break; - } - - $this->arrayAppendKeys($allData, $this->mergeIndexData($data)); - } - - $nodeInfo = $node[self::INFO]; - while ($nodeInfo[self::PREV_NODE] !== -1) { - $nodeId = $nodeInfo[self::PREV_NODE]; - $node = $this->getNode($nodeId); - - if ($node === FALSE) { - if (self::$debug) { - throw new Nette\InvalidStateException("Cannot load node number $nodeId."); - } - break; - } - - $nodeInfo = $node[self::INFO]; - unset($node[self::INFO]); - - foreach ($node as $prior => $data) { - $this->arrayAppendKeys($allData, $this->mergeIndexData($data)); - } - } - - return $this->cleanLinks($allData, $toDelete); - } - - - - /** - * Cleans links from $data. - * @param array - * @param array - * @return array of removed items - */ - private function cleanLinks(array $data, array &$toDelete) - { - $return = array(); - - $data = array_keys($data); - sort($data); - $max = count($data); - $data[] = 0; - $i = 0; - - while ($i < $max) { - $searchLink = $data[$i]; - - if (isset($this->deletedLinks[$searchLink])) { - ++$i; - continue; - } - - $nodeId = $searchLink >> self::BITROT; - $node = $this->getNode($nodeId); - - if ($node === FALSE) { - if (self::$debug) { - throw new Nette\InvalidStateException('Cannot load node number ' . ($nodeId) . '.'); - } - ++$i; - continue; - } - - do { - $link = $data[$i]; - - if (!isset($node[$link])) { - if (self::$debug) { - throw new Nette\InvalidStateException("Link with ID $searchLink is not in node ". ($nodeId) . '.'); - } - continue; - } elseif (isset($this->deletedLinks[$link])) { - continue; - } - - $nodeLink = &$node[$link]; - if (!$nodeLink[self::DELETED]) { - $nodeLink[self::DELETED] = TRUE; - $return[] = $nodeLink[self::KEY]; - } else { - foreach ($nodeLink[self::TAGS] as $tag) { - $toDelete[self::TAGS][$tag][$link] = TRUE; - } - if ($nodeLink[self::PRIORITY] !== FALSE) { - $toDelete[self::PRIORITY][$nodeLink[self::PRIORITY]][$link] = TRUE; - } - $toDelete[self::ENTRIES][crc32($nodeLink[self::KEY])][$link] = TRUE; - unset($node[$link]); - $this->deletedLinks[$link] = TRUE; - } - } while (($data[++$i] >> self::BITROT) === $nodeId); - - $this->saveNode($nodeId, $node); - } - - return $return; - } - - - - /** - * Remove links to deleted keys from index. - * @param array - */ - private function cleanFromIndex(array $toDeleteFromIndex) - { - foreach ($toDeleteFromIndex as $type => $toDelete) { - ksort($toDelete); - - while (!empty($toDelete)) { - reset($toDelete); - $searchKey = key($toDelete); - list($masterNodeId, $masterNode) = $this->findIndexNode($type, $searchKey); - - if (!isset($masterNode[$searchKey])) { - if (self::$debug) { - throw new Nette\InvalidStateException('Bad index.'); - } - unset($toDelete[$searchKey]); - continue; - } - - foreach ($toDelete as $key => $links) { - if (isset($masterNode[$key])) { - foreach ($links as $link => $foo) { - if (isset($masterNode[$key][$link])) { - unset($masterNode[$key][$link], $links[$link]); - } - } - - if (!empty($links) && isset($masterNode[$key][self::INDEX_DATA])) { - $this->cleanIndexData($masterNode[$key][self::INDEX_DATA], $links, $masterNode[$key]); - } - - if (empty($masterNode[$key])) { - unset($masterNode[$key]); - } - unset($toDelete[$key]); - } else { - break; - } - } - $this->saveNode($masterNodeId, $masterNode); - } - } - } - - - - /** - * Merge data with index data in other nodes. - * @param array - * @return array of merged items - */ - private function mergeIndexData(array $data) - { - while (isset($data[self::INDEX_DATA])) { - $id = $data[self::INDEX_DATA]; - unset($data[self::INDEX_DATA]); - $childNode = $this->getNode($id); - - if ($childNode === FALSE) { - if (self::$debug) { - throw new Nette\InvalidStateException("Cannot load node number $id."); - } - break; - } - - $this->arrayAppendKeys($data, $childNode[self::INDEX_DATA]); - } - - return $data; - } - - - - /** - * Cleans links from other nodes. - * @param int - * @param array - * @param array - * @return void - */ - private function cleanIndexData($nextNodeId, array $links, &$masterNodeLink) - { - $prev = -1; - - while ($nextNodeId && !empty($links)) { - $nodeId = $nextNodeId; - $node = $this->getNode($nodeId); - - if ($node === FALSE) { - if (self::$debug) { - throw new Nette\InvalidStateException("Cannot load node number $nodeId."); - } - break; - } - - foreach ($links as $link => $foo) { - if (isset($node[self::INDEX_DATA][$link])) { - unset($node[self::INDEX_DATA][$link], $links[$link]); - } - } - - if (isset($node[self::INDEX_DATA][self::INDEX_DATA])) { - $nextNodeId = $node[self::INDEX_DATA][self::INDEX_DATA]; - } else { - $nextNodeId = FALSE; - } - - if (empty($node[self::INDEX_DATA]) || (count($node[self::INDEX_DATA]) === 1 && $nextNodeId)) { - if ($prev === -1) { - if ($nextNodeId === FALSE) { - unset($masterNodeLink[self::INDEX_DATA]); - } else { - $masterNodeLink[self::INDEX_DATA] = $nextNodeId; - } - } else { - $prevNode = $this->getNode($prev); - if ($prevNode === FALSE) { - if (self::$debug) { - throw new Nette\InvalidStateException("Cannot load node number $prev."); - } - } else { - if ($nextNodeId === FALSE) { - unset($prevNode[self::INDEX_DATA][self::INDEX_DATA]); - if (empty($prevNode[self::INDEX_DATA])) { - unset($prevNode[self::INDEX_DATA]); - } - } else { - $prevNode[self::INDEX_DATA][self::INDEX_DATA] = $nextNodeId; - } - - $this->saveNode($prev, $prevNode); - } - } - unset($node[self::INDEX_DATA]); - } else { - $prev = $nodeId; - } - - $this->saveNode($nodeId, $node); - } - } - - - - /** - * Get node from journal. - * @param integer - * @return array - */ - private function getNode($id) - { - // Load from cache - if (isset($this->nodeCache[$id])) { - return $this->nodeCache[$id]; - } - - $binary = stream_get_contents($this->handle, self::NODE_SIZE, self::HEADER_SIZE + self::NODE_SIZE * $id); - - if (empty($binary)) { - // empty node, no Exception - return FALSE; - } - - list(, $magic, $lenght) = unpack('N2', $binary); - if ($magic !== self::INDEX_MAGIC && $magic !== self::DATA_MAGIC) { - if (!empty($magic)) { - if (self::$debug) { - throw new Nette\InvalidStateException("Node $id has malformed header."); - } - $this->deleteNode($id); - } - return FALSE; - } - - $data = substr($binary, 2 * self::INT32_SIZE, $lenght - 2 * self::INT32_SIZE); - - $node = @unserialize($data); // intentionally @ - if ($node === FALSE) { - $this->deleteNode($id); - if (self::$debug) { - throw new Nette\InvalidStateException("Cannot deserialize node number $id."); - } - return FALSE; - } - - // Save to cache and return - return $this->nodeCache[$id] = $node; - } - - - - /** - * Save node to cache. - * @param integer - * @param array - * @return void - */ - private function saveNode($id, array $node) - { - if (count($node) === 1) { // Nod contains only INFO - $nodeInfo = $node[self::INFO]; - if ($nodeInfo[self::TYPE] !== self::DATA) { - - if ($nodeInfo[self::END] !== -1) { - $this->nodeCache[$id] = $node; - $this->nodeChanged[$id] = TRUE; - return; - } - - if ($nodeInfo[self::MAX] === -1) { - $max = PHP_INT_MAX; - } else { - $max = $nodeInfo[self::MAX]; - } - - list(, , $parentId) = $this->findIndexNode($nodeInfo[self::TYPE], $max, $id); - if ($parentId !== -1 && $parentId !== $id) { - $parentNode = $this->getNode($parentId); - if ($parentNode === FALSE) { - if (self::$debug) { - throw new Nette\InvalidStateException("Cannot load node number $parentId."); - } - } else { - if ($parentNode[self::INFO][self::END] === $id) { - if (count($parentNode) === 1) { - $parentNode[self::INFO][self::END] = -1; - } else { - end($parentNode); - $lastKey = key($parentNode); - $parentNode[self::INFO][self::END] = $parentNode[$lastKey]; - unset($parentNode[$lastKey]); - } - } else { - unset($parentNode[$nodeInfo[self::MAX]]); - } - - $this->saveNode($parentId, $parentNode); - } - } - - if ($nodeInfo[self::TYPE] === self::PRIORITY) { // only priority tree has link to prevNode - if ($nodeInfo[self::MAX] === -1) { - if ($nodeInfo[self::PREV_NODE] !== -1) { - $prevNode = $this->getNode($nodeInfo[self::PREV_NODE]); - if ($prevNode === FALSE) { - if (self::$debug) { - throw new Nette\InvalidStateException('Cannot load node number ' . $nodeInfo[self::PREV_NODE] . '.'); - } - } else { - $prevNode[self::INFO][self::MAX] = -1; - $this->saveNode($nodeInfo[self::PREV_NODE], $prevNode); - } - } - } else { - list($nextId, $nextNode) = $this->findIndexNode($nodeInfo[self::TYPE], $nodeInfo[self::MAX] + 1, NULL, $id); - if ($nextId !== -1 && $nextId !== $id) { - $nextNode[self::INFO][self::PREV_NODE] = $nodeInfo[self::PREV_NODE]; - $this->saveNode($nextId, $nextNode); - } - } - } - } - $this->nodeCache[$id] = FALSE; - } else { - $this->nodeCache[$id] = $node; - } - $this->nodeChanged[$id] = TRUE; - } - - - - /** - * Commit all changed nodes from cache to journal file. - * @return void - */ - private function commit() - { - do { - foreach ($this->nodeChanged as $id => $foo) { - if ($this->prepareNode($id, $this->nodeCache[$id])) { - unset($this->nodeChanged[$id]); - } - } - } while (!empty($this->nodeChanged)); - - foreach ($this->toCommit as $node => $str) { - $this->commitNode($node, $str); - } - $this->toCommit = array(); - } - - - - /** - * Prepare node to journal file structure. - * @param integer - * @param array|bool - * @return bool Sucessfully commited - */ - private function prepareNode($id, $node) - { - if ($node === FALSE) { - if ($id < $this->lastNode) { - $this->lastNode = $id; - } - unset($this->nodeCache[$id]); - unset($this->dataNodeFreeSpace[$id]); - $this->deleteNode($id); - return TRUE; - } - - $data = serialize($node); - $dataSize = strlen($data) + 2 * self::INT32_SIZE; - - $isData = $node[self::INFO][self::TYPE] === self::DATA; - if ($dataSize > self::NODE_SIZE) { - if ($isData) { - throw new Nette\InvalidStateException('Saving node is bigger than maximum node size.'); - } else { - $this->bisectNode($id, $node); - return FALSE; - } - } - - $this->toCommit[$id] = pack('N2', $isData ? self::DATA_MAGIC : self::INDEX_MAGIC, $dataSize) . $data; - - if ($this->lastNode < $id) { - $this->lastNode = $id; - } - if ($isData) { - $this->dataNodeFreeSpace[$id] = self::NODE_SIZE - $dataSize; - } - - return TRUE; - } - - - - /** - * Commit node string to journal file. - * @param integer - * @param string - * @return void - */ - private function commitNode($id, $str) - { - fseek($this->handle, self::HEADER_SIZE + self::NODE_SIZE * $id); - $writen = fwrite($this->handle, $str); - if ($writen === FALSE) { - throw new Nette\InvalidStateException("Cannot write node number $id to journal."); - } - } - - - - /** - * Find right node in B+tree. . - * @param string Tree type (TAGS, PRIORITY or ENTRIES) - * @param int Searched item - * @return array Node - */ - private function findIndexNode($type, $search, $childId = NULL, $prevId = NULL) - { - $nodeId = self::$startNode[$type]; - - $parentId = -1; - while (TRUE) { - $node = $this->getNode($nodeId); - - if ($node === FALSE) { - return array( - $nodeId, - array( - self::INFO => array( - self::TYPE => $type, - self::IS_LEAF => TRUE, - self::PREV_NODE => -1, - self::END => -1, - self::MAX => -1, - ) - ), - $parentId, - ); // Init empty node - } - - if ($node[self::INFO][self::IS_LEAF] || $nodeId === $childId || $node[self::INFO][self::PREV_NODE] === $prevId) { - return array($nodeId, $node, $parentId); - } - - $parentId = $nodeId; - - if (isset($node[$search])) { - $nodeId = $node[$search]; - } else { - foreach ($node as $key => $childNode) { - if ($key > $search and $key !== self::INFO) { - $nodeId = $childNode; - continue 2; - } - } - - $nodeId = $node[self::INFO][self::END]; - } - } - } - - - - /** - * Find complete free node. - * @param integer - * @return array|integer Node ID - */ - private function findFreeNode($count = 1) - { - $id = $this->lastNode; - $nodesId = array(); - - do { - if (isset($this->nodeCache[$id])) { - ++$id; - continue; - } - - $offset = self::HEADER_SIZE + self::NODE_SIZE * $id; - - $binary = stream_get_contents($this->handle, self::INT32_SIZE, $offset); - - if (empty($binary)) { - $nodesId[] = $id; - } else { - list(, $magic) = unpack('N', $binary); - if ($magic !== self::INDEX_MAGIC && $magic !== self::DATA_MAGIC) { - $nodesId[] = $id; - } - } - - ++$id; - } while (count($nodesId) !== $count); - - if ($count === 1) { - return $nodesId[0]; - } else { - return $nodesId; - } - } - - - - /** - * Find free data node that has $size bytes of free space. - * @param integer size in bytes - * @return integer Node ID - */ - private function findFreeDataNode($size) - { - foreach ($this->dataNodeFreeSpace as $id => $freeSpace) { - if ($freeSpace > $size) { - return $id; - } - } - - $id = self::$startNode[self::DATA]; - while (TRUE) { - if (isset($this->dataNodeFreeSpace[$id]) || isset($this->nodeCache[$id])) { - ++$id; - continue; - } - - $offset = self::HEADER_SIZE + self::NODE_SIZE * $id; - $binary = stream_get_contents($this->handle, 2 * self::INT32_SIZE, $offset); - - if (empty($binary)) { - $this->dataNodeFreeSpace[$id] = self::NODE_SIZE; - return $id; - } - - list(, $magic, $nodeSize) = unpack('N2', $binary); - if (empty($magic)) { - $this->dataNodeFreeSpace[$id] = self::NODE_SIZE; - return $id; - } elseif ($magic === self::DATA_MAGIC) { - $freeSpace = self::NODE_SIZE - $nodeSize; - $this->dataNodeFreeSpace[$id] = $freeSpace; - - if ($freeSpace > $size) { - return $id; - } - } - - ++$id; - } - } - - - - /** - * Bisect node or when has only one key, move part to data node. - * @param integer Node ID - * @param array Node - * @return void - */ - private function bisectNode($id, array $node) - { - $nodeInfo = $node[self::INFO]; - unset($node[self::INFO]); - - if (count($node) === 1) { - $key = key($node); - - $dataId = $this->findFreeDataNode(self::NODE_SIZE); - $this->saveNode($dataId, array( - self::INDEX_DATA => $node[$key], - self::INFO => array( - self::TYPE => self::DATA, - self::LAST_INDEX => ($dataId << self::BITROT), - ))); - - unset($node[$key]); - $node[$key][self::INDEX_DATA] = $dataId; - $node[self::INFO] = $nodeInfo; - - $this->saveNode($id, $node); - return; - } - - ksort($node); - $halfCount = ceil(count($node) / 2); - - list($first, $second) = array_chunk($node, $halfCount, TRUE); - - end($first); - $halfKey = key($first); - - if ($id <= 2) { // Root - list($firstId, $secondId) = $this->findFreeNode(2); - - $first[self::INFO] = array( - self::TYPE => $nodeInfo[self::TYPE], - self::IS_LEAF => $nodeInfo[self::IS_LEAF], - self::PREV_NODE => -1, - self::END => -1, - self::MAX => $halfKey, - ); - $this->saveNode($firstId, $first); - - $second[self::INFO] = array( - self::TYPE => $nodeInfo[self::TYPE], - self::IS_LEAF => $nodeInfo[self::IS_LEAF], - self::PREV_NODE => $firstId, - self::END => $nodeInfo[self::END], - self::MAX => -1, - ); - $this->saveNode($secondId, $second); - - $parentNode = array( - self::INFO => array( - self::TYPE => $nodeInfo[self::TYPE], - self::IS_LEAF => FALSE, - self::PREV_NODE => -1, - self::END => $secondId, - self::MAX => -1, - ), - $halfKey => $firstId, - ); - $this->saveNode($id, $parentNode); - } else { - $firstId = $this->findFreeNode(); - - $first[self::INFO] = array( - self::TYPE => $nodeInfo[self::TYPE], - self::IS_LEAF => $nodeInfo[self::IS_LEAF], - self::PREV_NODE => $nodeInfo[self::PREV_NODE], - self::END => -1, - self::MAX => $halfKey, - ); - $this->saveNode($firstId, $first); - - $second[self::INFO] = array( - self::TYPE => $nodeInfo[self::TYPE], - self::IS_LEAF => $nodeInfo[self::IS_LEAF], - self::PREV_NODE => $firstId, - self::END => $nodeInfo[self::END], - self::MAX => $nodeInfo[self::MAX], - ); - $this->saveNode($id, $second); - - list(,, $parent) = $this->findIndexNode($nodeInfo[self::TYPE], $halfKey); - $parentNode = $this->getNode($parent); - if ($parentNode === FALSE) { - if (self::$debug) { - throw new Nette\InvalidStateException("Cannot load node number $parent."); - } - } else { - $parentNode[$halfKey] = $firstId; - ksort($parentNode); // Parent index must be always sorted. - $this->saveNode($parent, $parentNode); - } - } - } - - - - /** - * Commit header to journal file. - * @return void - */ - private function headerCommit() - { - fseek($this->handle, self::INT32_SIZE); - @fwrite($this->handle, pack('N', $this->lastNode)); // intentionally @, save is not necceseary - } - - - - /** - * Remove node from journal file. - * @param integer - * @return void - */ - private function deleteNode($id) - { - fseek($this->handle, 0, SEEK_END); - $end = ftell($this->handle); - - if ($end <= (self::HEADER_SIZE + self::NODE_SIZE * ($id + 1))) { - $packedNull = pack('N', 0); - - do { - $binary = stream_get_contents($this->handle, self::INT32_SIZE, (self::HEADER_SIZE + self::NODE_SIZE * --$id)); - } while (empty($binary) || $binary === $packedNull); - - if (!ftruncate($this->handle, self::HEADER_SIZE + self::NODE_SIZE * ($id + 1))) { - throw new Nette\InvalidStateException('Cannot truncate journal file.'); - } - } else { - fseek($this->handle, self::HEADER_SIZE + self::NODE_SIZE * $id); - $writen = fwrite($this->handle, pack('N', 0)); - if ($writen !== self::INT32_SIZE) { - throw new Nette\InvalidStateException("Cannot delete node number $id from journal."); - } - } - } - - - - /** - * Complete delete all nodes from file. - * @return void - */ - private function deleteAll() - { - if (!ftruncate($this->handle, self::HEADER_SIZE)) { - throw new Nette\InvalidStateException('Cannot truncate journal file.'); - } - } - - - - /** - * Lock file for writing and reading and delete node cache when file has changed. - * @return void - */ - private function lock() - { - if (!$this->handle) { - throw new Nette\InvalidStateException('File journal file is not opened'); - } - - if (!flock($this->handle, LOCK_EX)) { - throw new Nette\InvalidStateException('Cannot acquire exclusive lock on journal.'); - } - - if ($this->lastModTime !== NULL) { - clearstatcache(); - if ($this->lastModTime < @filemtime($this->file)) { // intentionally @ - $this->nodeCache = $this->dataNodeFreeSpace = array(); - } - } - } - - - - /** - * Unlock file and save last modified time. - * @return void - */ - private function unlock() - { - if ($this->handle) { - fflush($this->handle); - flock($this->handle, LOCK_UN); - clearstatcache(); - $this->lastModTime = @filemtime($this->file); // intentionally @ - } - } - - - - /** - * Append $append to $array. - * This function is much faster then $array = array_merge($array, $append) - * @param array - * @param array - * @return void - */ - private function arrayAppend(array &$array, array $append) - { - foreach ($append as $value) { - $array[] = $value; - } - } - - - - /** - * Append $append to $array with preserve keys. - * This function is much faster then $array = $array + $append - * @param array - * @param array - * @return void - */ - private function arrayAppendKeys(array &$array, array $append) - { - foreach ($append as $key => $value) { - $array[$key] = $value; - } - } - -} + 0, + self::PRIORITY => 1, + self::ENTRIES => 2, + self::DATA => 3, + ); + + + + /** + * @param string Directory location with journal file + */ + public function __construct($dir) + { + $this->file = $dir . '/' . self::FILE; + + // Create jorunal file when not exists + if (!file_exists($this->file)) { + $init = @fopen($this->file, 'xb'); // intentionally @ + if (!$init) { + clearstatcache(); + if (!file_exists($this->file)) { + throw new Nette\InvalidStateException("Cannot create journal file $this->file."); + } + } else { + $writen = fwrite($init, pack('N2', self::FILE_MAGIC, $this->lastNode)); + fclose($init); + if ($writen !== self::INT32_SIZE * 2) { + throw new Nette\InvalidStateException("Cannot write journal header."); + } + } + } + + $this->handle = fopen($this->file, 'r+b'); + + if (!$this->handle) { + throw new Nette\InvalidStateException("Cannot open journal file '$this->file'."); + } + + if (!flock($this->handle, LOCK_SH)) { + throw new Nette\InvalidStateException('Cannot acquire shared lock on journal.'); + } + + $header = stream_get_contents($this->handle, 2 * self::INT32_SIZE, 0); + + flock($this->handle, LOCK_UN); + + list(, $fileMagic, $this->lastNode) = unpack('N2', $header); + + if ($fileMagic !== self::FILE_MAGIC) { + fclose($this->handle); + $this->handle = false; + throw new Nette\InvalidStateException("Malformed journal file '$this->file'."); + } + } + + + + /** + * @return void + */ + public function __destruct() + { + if ($this->handle) { + $this->headerCommit(); + flock($this->handle, LOCK_UN); // Since PHP 5.3.3 is manual unlock necesary + fclose($this->handle); + $this->handle = false; + } + } + + + + /** + * Writes entry information into the journal. + * @param string + * @param array + * @return void + */ + public function write($key, array $dependencies) + { + $this->lock(); + + $priority = !isset($dependencies[Cache::PRIORITY]) ? FALSE : (int) $dependencies[Cache::PRIORITY]; + $tags = empty($dependencies[Cache::TAGS]) ? FALSE : (array) $dependencies[Cache::TAGS]; + + $exists = FALSE; + $keyHash = crc32($key); + list($entriesNodeId, $entriesNode) = $this->findIndexNode(self::ENTRIES, $keyHash); + + if (isset($entriesNode[$keyHash])) { + $entries = $this->mergeIndexData($entriesNode[$keyHash]); + foreach ($entries as $link => $foo) { + $dataNode = $this->getNode($link >> self::BITROT); + if ($dataNode[$link][self::KEY] === $key) { + if ($dataNode[$link][self::TAGS] == $tags && $dataNode[$link][self::PRIORITY] === $priority) { // intentionally ==, the order of tags does not matter + if ($dataNode[$link][self::DELETED]) { + $dataNode[$link][self::DELETED] = FALSE; + $this->saveNode($link >> self::BITROT, $dataNode); + } + $exists = TRUE; + } else { // Alredy exists, but with other tags or priority + $toDelete = array(); + foreach ($dataNode[$link][self::TAGS] as $tag) { + $toDelete[self::TAGS][$tag][$link] = TRUE; + } + if ($dataNode[$link][self::PRIORITY] !== FALSE) { + $toDelete[self::PRIORITY][$dataNode[$link][self::PRIORITY]][$link] = TRUE; + } + $toDelete[self::ENTRIES][$keyHash][$link] = TRUE; + $this->cleanFromIndex($toDelete); + $entriesNode = $this->getNode($entriesNodeId); // Node was changed, get again + unset($dataNode[$link]); + $this->saveNode($link >> self::BITROT, $dataNode); + } + break; + } + } + } + + if ($exists === FALSE) { + // Magical constants + $requiredSize = strlen($key) + 75; + if ($tags) { + foreach ($tags as $tag) { + $requiredSize += strlen($tag) + 13; + } + } + $requiredSize += $priority ? 10 : 1; + + $freeDataNode = $this->findFreeDataNode($requiredSize); + $data = $this->getNode($freeDataNode); + + if ($data === FALSE) { + $data = array( + self::INFO => array( + self::LAST_INDEX => ($freeDataNode << self::BITROT), + self::TYPE => self::DATA, + ) + ); + } + + $dataNodeKey = ++$data[self::INFO][self::LAST_INDEX]; + $data[$dataNodeKey] = array( + self::KEY => $key, + self::TAGS => $tags ? $tags : array(), + self::PRIORITY => $priority, + self::DELETED => FALSE, + ); + + $this->saveNode($freeDataNode, $data); + + // Save to entries tree, ... + $entriesNode[$keyHash][$dataNodeKey] = 1; + $this->saveNode($entriesNodeId, $entriesNode); + + // ...tags tree... + if ($tags) { + foreach ($tags as $tag) { + list($nodeId, $node) = $this->findIndexNode(self::TAGS, $tag); + $node[$tag][$dataNodeKey] = 1; + $this->saveNode($nodeId, $node); + } + } + + // ...and priority tree. + if ($priority) { + list($nodeId, $node) = $this->findIndexNode(self::PRIORITY, $priority); + $node[$priority][$dataNodeKey] = 1; + $this->saveNode($nodeId, $node); + } + } + + $this->commit(); + $this->unlock(); + } + + + + /** + * Cleans entries from journal. + * @param array + * @return array of removed items or NULL when performing a full cleanup + */ + public function clean(array $conditions) + { + $this->lock(); + + if (!empty($conditions[Cache::ALL])) { + $this->nodeCache = $this->nodeChanged = $this->dataNodeFreeSpace = array(); + $this->deleteAll(); + $this->unlock(); + return; + } + + $toDelete = array( + self::TAGS => array(), + self::PRIORITY => array(), + self::ENTRIES => array() + ); + + $entries = array(); + + if (!empty($conditions[Cache::TAGS])) { + $entries = $this->cleanTags((array) $conditions[Cache::TAGS], $toDelete); + } + + if (isset($conditions[Cache::PRIORITY])) { + $this->arrayAppend($entries, $this->cleanPriority((int) $conditions[Cache::PRIORITY], $toDelete)); + } + + $this->deletedLinks = array(); + $this->cleanFromIndex($toDelete); + + $this->commit(); + $this->unlock(); + + return $entries; + } + + + + /** + * Cleans entries from journal by tags. + * @return array of removed items + */ + private function cleanTags(array $tags, array &$toDelete) + { + $entries = array(); + + foreach ($tags as $tag) { + list($nodeId, $node) = $this->findIndexNode(self::TAGS, $tag); + + if (isset($node[$tag])) { + $ent = $this->cleanLinks($this->mergeIndexData($node[$tag]), $toDelete); + $this->arrayAppend($entries, $ent); + } + } + + return $entries; + } + + + + /** + * Cleans entries from journal by priority. + * @param integer + * @param array + * @return array of removed items + */ + private function cleanPriority($priority, array &$toDelete) + { + list($nodeId, $node) = $this->findIndexNode(self::PRIORITY, $priority); + + ksort($node); + + $allData = array(); + + foreach ($node as $prior => $data) { + if ($prior === self::INFO) { + continue; + } elseif ($prior > $priority) { + break; + } + + $this->arrayAppendKeys($allData, $this->mergeIndexData($data)); + } + + $nodeInfo = $node[self::INFO]; + while ($nodeInfo[self::PREV_NODE] !== -1) { + $nodeId = $nodeInfo[self::PREV_NODE]; + $node = $this->getNode($nodeId); + + if ($node === FALSE) { + if (self::$debug) { + throw new Nette\InvalidStateException("Cannot load node number $nodeId."); + } + break; + } + + $nodeInfo = $node[self::INFO]; + unset($node[self::INFO]); + + foreach ($node as $prior => $data) { + $this->arrayAppendKeys($allData, $this->mergeIndexData($data)); + } + } + + return $this->cleanLinks($allData, $toDelete); + } + + + + /** + * Cleans links from $data. + * @param array + * @param array + * @return array of removed items + */ + private function cleanLinks(array $data, array &$toDelete) + { + $return = array(); + + $data = array_keys($data); + sort($data); + $max = count($data); + $data[] = 0; + $i = 0; + + while ($i < $max) { + $searchLink = $data[$i]; + + if (isset($this->deletedLinks[$searchLink])) { + ++$i; + continue; + } + + $nodeId = $searchLink >> self::BITROT; + $node = $this->getNode($nodeId); + + if ($node === FALSE) { + if (self::$debug) { + throw new Nette\InvalidStateException('Cannot load node number ' . ($nodeId) . '.'); + } + ++$i; + continue; + } + + do { + $link = $data[$i]; + + if (!isset($node[$link])) { + if (self::$debug) { + throw new Nette\InvalidStateException("Link with ID $searchLink is not in node ". ($nodeId) . '.'); + } + continue; + } elseif (isset($this->deletedLinks[$link])) { + continue; + } + + $nodeLink = &$node[$link]; + if (!$nodeLink[self::DELETED]) { + $nodeLink[self::DELETED] = TRUE; + $return[] = $nodeLink[self::KEY]; + } else { + foreach ($nodeLink[self::TAGS] as $tag) { + $toDelete[self::TAGS][$tag][$link] = TRUE; + } + if ($nodeLink[self::PRIORITY] !== FALSE) { + $toDelete[self::PRIORITY][$nodeLink[self::PRIORITY]][$link] = TRUE; + } + $toDelete[self::ENTRIES][crc32($nodeLink[self::KEY])][$link] = TRUE; + unset($node[$link]); + $this->deletedLinks[$link] = TRUE; + } + } while (($data[++$i] >> self::BITROT) === $nodeId); + + $this->saveNode($nodeId, $node); + } + + return $return; + } + + + + /** + * Remove links to deleted keys from index. + * @param array + */ + private function cleanFromIndex(array $toDeleteFromIndex) + { + foreach ($toDeleteFromIndex as $type => $toDelete) { + ksort($toDelete); + + while (!empty($toDelete)) { + reset($toDelete); + $searchKey = key($toDelete); + list($masterNodeId, $masterNode) = $this->findIndexNode($type, $searchKey); + + if (!isset($masterNode[$searchKey])) { + if (self::$debug) { + throw new Nette\InvalidStateException('Bad index.'); + } + unset($toDelete[$searchKey]); + continue; + } + + foreach ($toDelete as $key => $links) { + if (isset($masterNode[$key])) { + foreach ($links as $link => $foo) { + if (isset($masterNode[$key][$link])) { + unset($masterNode[$key][$link], $links[$link]); + } + } + + if (!empty($links) && isset($masterNode[$key][self::INDEX_DATA])) { + $this->cleanIndexData($masterNode[$key][self::INDEX_DATA], $links, $masterNode[$key]); + } + + if (empty($masterNode[$key])) { + unset($masterNode[$key]); + } + unset($toDelete[$key]); + } else { + break; + } + } + $this->saveNode($masterNodeId, $masterNode); + } + } + } + + + + /** + * Merge data with index data in other nodes. + * @param array + * @return array of merged items + */ + private function mergeIndexData(array $data) + { + while (isset($data[self::INDEX_DATA])) { + $id = $data[self::INDEX_DATA]; + unset($data[self::INDEX_DATA]); + $childNode = $this->getNode($id); + + if ($childNode === FALSE) { + if (self::$debug) { + throw new Nette\InvalidStateException("Cannot load node number $id."); + } + break; + } + + $this->arrayAppendKeys($data, $childNode[self::INDEX_DATA]); + } + + return $data; + } + + + + /** + * Cleans links from other nodes. + * @param int + * @param array + * @param array + * @return void + */ + private function cleanIndexData($nextNodeId, array $links, &$masterNodeLink) + { + $prev = -1; + + while ($nextNodeId && !empty($links)) { + $nodeId = $nextNodeId; + $node = $this->getNode($nodeId); + + if ($node === FALSE) { + if (self::$debug) { + throw new Nette\InvalidStateException("Cannot load node number $nodeId."); + } + break; + } + + foreach ($links as $link => $foo) { + if (isset($node[self::INDEX_DATA][$link])) { + unset($node[self::INDEX_DATA][$link], $links[$link]); + } + } + + if (isset($node[self::INDEX_DATA][self::INDEX_DATA])) { + $nextNodeId = $node[self::INDEX_DATA][self::INDEX_DATA]; + } else { + $nextNodeId = FALSE; + } + + if (empty($node[self::INDEX_DATA]) || (count($node[self::INDEX_DATA]) === 1 && $nextNodeId)) { + if ($prev === -1) { + if ($nextNodeId === FALSE) { + unset($masterNodeLink[self::INDEX_DATA]); + } else { + $masterNodeLink[self::INDEX_DATA] = $nextNodeId; + } + } else { + $prevNode = $this->getNode($prev); + if ($prevNode === FALSE) { + if (self::$debug) { + throw new Nette\InvalidStateException("Cannot load node number $prev."); + } + } else { + if ($nextNodeId === FALSE) { + unset($prevNode[self::INDEX_DATA][self::INDEX_DATA]); + if (empty($prevNode[self::INDEX_DATA])) { + unset($prevNode[self::INDEX_DATA]); + } + } else { + $prevNode[self::INDEX_DATA][self::INDEX_DATA] = $nextNodeId; + } + + $this->saveNode($prev, $prevNode); + } + } + unset($node[self::INDEX_DATA]); + } else { + $prev = $nodeId; + } + + $this->saveNode($nodeId, $node); + } + } + + + + /** + * Get node from journal. + * @param integer + * @return array + */ + private function getNode($id) + { + // Load from cache + if (isset($this->nodeCache[$id])) { + return $this->nodeCache[$id]; + } + + $binary = stream_get_contents($this->handle, self::NODE_SIZE, self::HEADER_SIZE + self::NODE_SIZE * $id); + + if (empty($binary)) { + // empty node, no Exception + return FALSE; + } + + list(, $magic, $lenght) = unpack('N2', $binary); + if ($magic !== self::INDEX_MAGIC && $magic !== self::DATA_MAGIC) { + if (!empty($magic)) { + if (self::$debug) { + throw new Nette\InvalidStateException("Node $id has malformed header."); + } + $this->deleteNode($id); + } + return FALSE; + } + + $data = substr($binary, 2 * self::INT32_SIZE, $lenght - 2 * self::INT32_SIZE); + + $node = @unserialize($data); // intentionally @ + if ($node === FALSE) { + $this->deleteNode($id); + if (self::$debug) { + throw new Nette\InvalidStateException("Cannot deserialize node number $id."); + } + return FALSE; + } + + // Save to cache and return + return $this->nodeCache[$id] = $node; + } + + + + /** + * Save node to cache. + * @param integer + * @param array + * @return void + */ + private function saveNode($id, array $node) + { + if (count($node) === 1) { // Nod contains only INFO + $nodeInfo = $node[self::INFO]; + if ($nodeInfo[self::TYPE] !== self::DATA) { + + if ($nodeInfo[self::END] !== -1) { + $this->nodeCache[$id] = $node; + $this->nodeChanged[$id] = TRUE; + return; + } + + if ($nodeInfo[self::MAX] === -1) { + $max = PHP_INT_MAX; + } else { + $max = $nodeInfo[self::MAX]; + } + + list(, , $parentId) = $this->findIndexNode($nodeInfo[self::TYPE], $max, $id); + if ($parentId !== -1 && $parentId !== $id) { + $parentNode = $this->getNode($parentId); + if ($parentNode === FALSE) { + if (self::$debug) { + throw new Nette\InvalidStateException("Cannot load node number $parentId."); + } + } else { + if ($parentNode[self::INFO][self::END] === $id) { + if (count($parentNode) === 1) { + $parentNode[self::INFO][self::END] = -1; + } else { + end($parentNode); + $lastKey = key($parentNode); + $parentNode[self::INFO][self::END] = $parentNode[$lastKey]; + unset($parentNode[$lastKey]); + } + } else { + unset($parentNode[$nodeInfo[self::MAX]]); + } + + $this->saveNode($parentId, $parentNode); + } + } + + if ($nodeInfo[self::TYPE] === self::PRIORITY) { // only priority tree has link to prevNode + if ($nodeInfo[self::MAX] === -1) { + if ($nodeInfo[self::PREV_NODE] !== -1) { + $prevNode = $this->getNode($nodeInfo[self::PREV_NODE]); + if ($prevNode === FALSE) { + if (self::$debug) { + throw new Nette\InvalidStateException('Cannot load node number ' . $nodeInfo[self::PREV_NODE] . '.'); + } + } else { + $prevNode[self::INFO][self::MAX] = -1; + $this->saveNode($nodeInfo[self::PREV_NODE], $prevNode); + } + } + } else { + list($nextId, $nextNode) = $this->findIndexNode($nodeInfo[self::TYPE], $nodeInfo[self::MAX] + 1, NULL, $id); + if ($nextId !== -1 && $nextId !== $id) { + $nextNode[self::INFO][self::PREV_NODE] = $nodeInfo[self::PREV_NODE]; + $this->saveNode($nextId, $nextNode); + } + } + } + } + $this->nodeCache[$id] = FALSE; + } else { + $this->nodeCache[$id] = $node; + } + $this->nodeChanged[$id] = TRUE; + } + + + + /** + * Commit all changed nodes from cache to journal file. + * @return void + */ + private function commit() + { + do { + foreach ($this->nodeChanged as $id => $foo) { + if ($this->prepareNode($id, $this->nodeCache[$id])) { + unset($this->nodeChanged[$id]); + } + } + } while (!empty($this->nodeChanged)); + + foreach ($this->toCommit as $node => $str) { + $this->commitNode($node, $str); + } + $this->toCommit = array(); + } + + + + /** + * Prepare node to journal file structure. + * @param integer + * @param array|bool + * @return bool Sucessfully commited + */ + private function prepareNode($id, $node) + { + if ($node === FALSE) { + if ($id < $this->lastNode) { + $this->lastNode = $id; + } + unset($this->nodeCache[$id]); + unset($this->dataNodeFreeSpace[$id]); + $this->deleteNode($id); + return TRUE; + } + + $data = serialize($node); + $dataSize = strlen($data) + 2 * self::INT32_SIZE; + + $isData = $node[self::INFO][self::TYPE] === self::DATA; + if ($dataSize > self::NODE_SIZE) { + if ($isData) { + throw new Nette\InvalidStateException('Saving node is bigger than maximum node size.'); + } else { + $this->bisectNode($id, $node); + return FALSE; + } + } + + $this->toCommit[$id] = pack('N2', $isData ? self::DATA_MAGIC : self::INDEX_MAGIC, $dataSize) . $data; + + if ($this->lastNode < $id) { + $this->lastNode = $id; + } + if ($isData) { + $this->dataNodeFreeSpace[$id] = self::NODE_SIZE - $dataSize; + } + + return TRUE; + } + + + + /** + * Commit node string to journal file. + * @param integer + * @param string + * @return void + */ + private function commitNode($id, $str) + { + fseek($this->handle, self::HEADER_SIZE + self::NODE_SIZE * $id); + $writen = fwrite($this->handle, $str); + if ($writen === FALSE) { + throw new Nette\InvalidStateException("Cannot write node number $id to journal."); + } + } + + + + /** + * Find right node in B+tree. . + * @param string Tree type (TAGS, PRIORITY or ENTRIES) + * @param int Searched item + * @return array Node + */ + private function findIndexNode($type, $search, $childId = NULL, $prevId = NULL) + { + $nodeId = self::$startNode[$type]; + + $parentId = -1; + while (TRUE) { + $node = $this->getNode($nodeId); + + if ($node === FALSE) { + return array( + $nodeId, + array( + self::INFO => array( + self::TYPE => $type, + self::IS_LEAF => TRUE, + self::PREV_NODE => -1, + self::END => -1, + self::MAX => -1, + ) + ), + $parentId, + ); // Init empty node + } + + if ($node[self::INFO][self::IS_LEAF] || $nodeId === $childId || $node[self::INFO][self::PREV_NODE] === $prevId) { + return array($nodeId, $node, $parentId); + } + + $parentId = $nodeId; + + if (isset($node[$search])) { + $nodeId = $node[$search]; + } else { + foreach ($node as $key => $childNode) { + if ($key > $search and $key !== self::INFO) { + $nodeId = $childNode; + continue 2; + } + } + + $nodeId = $node[self::INFO][self::END]; + } + } + } + + + + /** + * Find complete free node. + * @param integer + * @return array|integer Node ID + */ + private function findFreeNode($count = 1) + { + $id = $this->lastNode; + $nodesId = array(); + + do { + if (isset($this->nodeCache[$id])) { + ++$id; + continue; + } + + $offset = self::HEADER_SIZE + self::NODE_SIZE * $id; + + $binary = stream_get_contents($this->handle, self::INT32_SIZE, $offset); + + if (empty($binary)) { + $nodesId[] = $id; + } else { + list(, $magic) = unpack('N', $binary); + if ($magic !== self::INDEX_MAGIC && $magic !== self::DATA_MAGIC) { + $nodesId[] = $id; + } + } + + ++$id; + } while (count($nodesId) !== $count); + + if ($count === 1) { + return $nodesId[0]; + } else { + return $nodesId; + } + } + + + + /** + * Find free data node that has $size bytes of free space. + * @param integer size in bytes + * @return integer Node ID + */ + private function findFreeDataNode($size) + { + foreach ($this->dataNodeFreeSpace as $id => $freeSpace) { + if ($freeSpace > $size) { + return $id; + } + } + + $id = self::$startNode[self::DATA]; + while (TRUE) { + if (isset($this->dataNodeFreeSpace[$id]) || isset($this->nodeCache[$id])) { + ++$id; + continue; + } + + $offset = self::HEADER_SIZE + self::NODE_SIZE * $id; + $binary = stream_get_contents($this->handle, 2 * self::INT32_SIZE, $offset); + + if (empty($binary)) { + $this->dataNodeFreeSpace[$id] = self::NODE_SIZE; + return $id; + } + + list(, $magic, $nodeSize) = unpack('N2', $binary); + if (empty($magic)) { + $this->dataNodeFreeSpace[$id] = self::NODE_SIZE; + return $id; + } elseif ($magic === self::DATA_MAGIC) { + $freeSpace = self::NODE_SIZE - $nodeSize; + $this->dataNodeFreeSpace[$id] = $freeSpace; + + if ($freeSpace > $size) { + return $id; + } + } + + ++$id; + } + } + + + + /** + * Bisect node or when has only one key, move part to data node. + * @param integer Node ID + * @param array Node + * @return void + */ + private function bisectNode($id, array $node) + { + $nodeInfo = $node[self::INFO]; + unset($node[self::INFO]); + + if (count($node) === 1) { + $key = key($node); + + $dataId = $this->findFreeDataNode(self::NODE_SIZE); + $this->saveNode($dataId, array( + self::INDEX_DATA => $node[$key], + self::INFO => array( + self::TYPE => self::DATA, + self::LAST_INDEX => ($dataId << self::BITROT), + ))); + + unset($node[$key]); + $node[$key][self::INDEX_DATA] = $dataId; + $node[self::INFO] = $nodeInfo; + + $this->saveNode($id, $node); + return; + } + + ksort($node); + $halfCount = ceil(count($node) / 2); + + list($first, $second) = array_chunk($node, $halfCount, TRUE); + + end($first); + $halfKey = key($first); + + if ($id <= 2) { // Root + list($firstId, $secondId) = $this->findFreeNode(2); + + $first[self::INFO] = array( + self::TYPE => $nodeInfo[self::TYPE], + self::IS_LEAF => $nodeInfo[self::IS_LEAF], + self::PREV_NODE => -1, + self::END => -1, + self::MAX => $halfKey, + ); + $this->saveNode($firstId, $first); + + $second[self::INFO] = array( + self::TYPE => $nodeInfo[self::TYPE], + self::IS_LEAF => $nodeInfo[self::IS_LEAF], + self::PREV_NODE => $firstId, + self::END => $nodeInfo[self::END], + self::MAX => -1, + ); + $this->saveNode($secondId, $second); + + $parentNode = array( + self::INFO => array( + self::TYPE => $nodeInfo[self::TYPE], + self::IS_LEAF => FALSE, + self::PREV_NODE => -1, + self::END => $secondId, + self::MAX => -1, + ), + $halfKey => $firstId, + ); + $this->saveNode($id, $parentNode); + } else { + $firstId = $this->findFreeNode(); + + $first[self::INFO] = array( + self::TYPE => $nodeInfo[self::TYPE], + self::IS_LEAF => $nodeInfo[self::IS_LEAF], + self::PREV_NODE => $nodeInfo[self::PREV_NODE], + self::END => -1, + self::MAX => $halfKey, + ); + $this->saveNode($firstId, $first); + + $second[self::INFO] = array( + self::TYPE => $nodeInfo[self::TYPE], + self::IS_LEAF => $nodeInfo[self::IS_LEAF], + self::PREV_NODE => $firstId, + self::END => $nodeInfo[self::END], + self::MAX => $nodeInfo[self::MAX], + ); + $this->saveNode($id, $second); + + list(,, $parent) = $this->findIndexNode($nodeInfo[self::TYPE], $halfKey); + $parentNode = $this->getNode($parent); + if ($parentNode === FALSE) { + if (self::$debug) { + throw new Nette\InvalidStateException("Cannot load node number $parent."); + } + } else { + $parentNode[$halfKey] = $firstId; + ksort($parentNode); // Parent index must be always sorted. + $this->saveNode($parent, $parentNode); + } + } + } + + + + /** + * Commit header to journal file. + * @return void + */ + private function headerCommit() + { + fseek($this->handle, self::INT32_SIZE); + @fwrite($this->handle, pack('N', $this->lastNode)); // intentionally @, save is not necceseary + } + + + + /** + * Remove node from journal file. + * @param integer + * @return void + */ + private function deleteNode($id) + { + fseek($this->handle, 0, SEEK_END); + $end = ftell($this->handle); + + if ($end <= (self::HEADER_SIZE + self::NODE_SIZE * ($id + 1))) { + $packedNull = pack('N', 0); + + do { + $binary = stream_get_contents($this->handle, self::INT32_SIZE, (self::HEADER_SIZE + self::NODE_SIZE * --$id)); + } while (empty($binary) || $binary === $packedNull); + + if (!ftruncate($this->handle, self::HEADER_SIZE + self::NODE_SIZE * ($id + 1))) { + throw new Nette\InvalidStateException('Cannot truncate journal file.'); + } + } else { + fseek($this->handle, self::HEADER_SIZE + self::NODE_SIZE * $id); + $writen = fwrite($this->handle, pack('N', 0)); + if ($writen !== self::INT32_SIZE) { + throw new Nette\InvalidStateException("Cannot delete node number $id from journal."); + } + } + } + + + + /** + * Complete delete all nodes from file. + * @return void + */ + private function deleteAll() + { + if (!ftruncate($this->handle, self::HEADER_SIZE)) { + throw new Nette\InvalidStateException('Cannot truncate journal file.'); + } + } + + + + /** + * Lock file for writing and reading and delete node cache when file has changed. + * @return void + */ + private function lock() + { + if (!$this->handle) { + throw new Nette\InvalidStateException('File journal file is not opened'); + } + + if (!flock($this->handle, LOCK_EX)) { + throw new Nette\InvalidStateException('Cannot acquire exclusive lock on journal.'); + } + + if ($this->lastModTime !== NULL) { + clearstatcache(); + if ($this->lastModTime < @filemtime($this->file)) { // intentionally @ + $this->nodeCache = $this->dataNodeFreeSpace = array(); + } + } + } + + + + /** + * Unlock file and save last modified time. + * @return void + */ + private function unlock() + { + if ($this->handle) { + fflush($this->handle); + flock($this->handle, LOCK_UN); + clearstatcache(); + $this->lastModTime = @filemtime($this->file); // intentionally @ + } + } + + + + /** + * Append $append to $array. + * This function is much faster then $array = array_merge($array, $append) + * @param array + * @param array + * @return void + */ + private function arrayAppend(array &$array, array $append) + { + foreach ($append as $value) { + $array[] = $value; + } + } + + + + /** + * Append $append to $array with preserve keys. + * This function is much faster then $array = $array + $append + * @param array + * @param array + * @return void + */ + private function arrayAppendKeys(array &$array, array $append) + { + foreach ($append as $key => $value) { + $array[$key] = $value; + } + } + +} diff --git a/libs/Nette/Caching/Storages/FileStorage.php b/libs/Nette/Caching/Storages/FileStorage.php index 995d929..915c6a0 100644 --- a/libs/Nette/Caching/Storages/FileStorage.php +++ b/libs/Nette/Caching/Storages/FileStorage.php @@ -1,403 +1,429 @@ - timestamp) - META_CALLBACKS = 'callbacks'; // array of callbacks (function, args) - - /** additional cache structure */ - const FILE = 'file', - HANDLE = 'handle'; - - - /** @var float probability that the clean() routine is started */ - public static $gcProbability = 0.001; - - /** @var bool */ - public static $useDirectories = TRUE; - - /** @var string */ - private $dir; - - /** @var bool */ - private $useDirs; - - /** @var IJournal */ - private $journal; - - - - public function __construct($dir, IJournal $journal = NULL) - { - $this->dir = realpath($dir); - if ($this->dir === FALSE) { - throw new Nette\DirectoryNotFoundException("Directory '$dir' not found."); - } - - $this->useDirs = (bool) self::$useDirectories; - $this->journal = $journal; - - if (mt_rand() / mt_getrandmax() < self::$gcProbability) { - $this->clean(array()); - } - } - - - - /** - * Read from cache. - * @param string key - * @return mixed|NULL - */ - public function read($key) - { - $meta = $this->readMetaAndLock($this->getCacheFile($key), LOCK_SH); - if ($meta && $this->verify($meta)) { - return $this->readData($meta); // calls fclose() - - } else { - return NULL; - } - } - - - - /** - * Verifies dependencies. - * @param array - * @return bool - */ - private function verify($meta) - { - do { - if (!empty($meta[self::META_DELTA])) { - // meta[file] was added by readMetaAndLock() - if (filemtime($meta[self::FILE]) + $meta[self::META_DELTA] < time()) { - break; - } - touch($meta[self::FILE]); - - } elseif (!empty($meta[self::META_EXPIRE]) && $meta[self::META_EXPIRE] < time()) { - break; - } - - if (!empty($meta[self::META_CALLBACKS]) && !Cache::checkCallbacks($meta[self::META_CALLBACKS])) { - break; - } - - if (!empty($meta[self::META_ITEMS])) { - foreach ($meta[self::META_ITEMS] as $depFile => $time) { - $m = $this->readMetaAndLock($depFile, LOCK_SH); - if ($m[self::META_TIME] !== $time || ($m && !$this->verify($m))) { - break 2; - } - } - } - - return TRUE; - } while (FALSE); - - $this->delete($meta[self::FILE], $meta[self::HANDLE]); // meta[handle] & meta[file] was added by readMetaAndLock() - return FALSE; - } - - - - /** - * Writes item into the cache. - * @param string key - * @param mixed data - * @param array dependencies - * @return void - */ - public function write($key, $data, array $dp) - { - $meta = array( - self::META_TIME => microtime(), - ); - - if (isset($dp[Cache::EXPIRATION])) { - if (empty($dp[Cache::SLIDING])) { - $meta[self::META_EXPIRE] = $dp[Cache::EXPIRATION] + time(); // absolute time - } else { - $meta[self::META_DELTA] = (int) $dp[Cache::EXPIRATION]; // sliding time - } - } - - if (isset($dp[Cache::ITEMS])) { - foreach ((array) $dp[Cache::ITEMS] as $item) { - $depFile = $this->getCacheFile($item); - $m = $this->readMetaAndLock($depFile, LOCK_SH); - $meta[self::META_ITEMS][$depFile] = $m[self::META_TIME]; // may be NULL - unset($m); - } - } - - if (isset($dp[Cache::CALLBACKS])) { - $meta[self::META_CALLBACKS] = $dp[Cache::CALLBACKS]; - } - - $cacheFile = $this->getCacheFile($key); - if ($this->useDirs && !is_dir($dir = dirname($cacheFile))) { - umask(0000); - if (!mkdir($dir, 0777)) { - return; - } - } - $handle = @fopen($cacheFile, 'r+b'); // @ - file may not exist - if (!$handle) { - $handle = fopen($cacheFile, 'wb'); - if (!$handle) { - return; - } - } - - if (isset($dp[Cache::TAGS]) || isset($dp[Cache::PRIORITY])) { - if (!$this->journal) { - throw new Nette\InvalidStateException('CacheJournal has not been provided.'); - } - $this->journal->write($cacheFile, $dp); - } - - flock($handle, LOCK_EX); - ftruncate($handle, 0); - - if (!is_string($data)) { - $data = serialize($data); - $meta[self::META_SERIALIZED] = TRUE; - } - - $head = serialize($meta) . '?>'; - $head = 'delete($cacheFile, $handle); - } - - - - /** - * Removes item from the cache. - * @param string key - * @return void - */ - public function remove($key) - { - $this->delete($this->getCacheFile($key)); - } - - - - /** - * Removes items from the cache by conditions & garbage collector. - * @param array conditions - * @return void - */ - public function clean(array $conds) - { - $all = !empty($conds[Cache::ALL]); - $collector = empty($conds); - - // cleaning using file iterator - if ($all || $collector) { - $now = time(); - foreach (Nette\Utils\Finder::find('*')->from($this->dir)->childFirst() as $entry) { - $path = (string) $entry; - if ($entry->isDir()) { // collector: remove empty dirs - @rmdir($path); // @ - removing dirs is not necessary - continue; - } - if ($all) { - $this->delete($path); - - } else { // collector - $meta = $this->readMetaAndLock($path, LOCK_SH); - if (!$meta) { - continue; - } - - if (!empty($meta[self::META_EXPIRE]) && $meta[self::META_EXPIRE] < $now) { - $this->delete($path, $meta[self::HANDLE]); - continue; - } - - flock($meta[self::HANDLE], LOCK_UN); - fclose($meta[self::HANDLE]); - } - } - - if ($this->journal) { - $this->journal->clean($conds); - } - return; - } - - // cleaning using journal - if ($this->journal) { - foreach ($this->journal->clean($conds) as $file) { - $this->delete($file); - } - } - } - - - - /** - * Reads cache data from disk. - * @param string file path - * @param int lock mode - * @return array|NULL - */ - protected function readMetaAndLock($file, $lock) - { - $handle = @fopen($file, 'r+b'); // @ - file may not exist - if (!$handle) { - return NULL; - } - - flock($handle, $lock); - - $head = stream_get_contents($handle, self::META_HEADER_LEN); - if ($head && strlen($head) === self::META_HEADER_LEN) { - $size = (int) substr($head, -6); - $meta = stream_get_contents($handle, $size, self::META_HEADER_LEN); - $meta = @unserialize($meta); // intentionally @ - if (is_array($meta)) { - fseek($handle, $size + self::META_HEADER_LEN); // needed by PHP < 5.2.6 - $meta[self::FILE] = $file; - $meta[self::HANDLE] = $handle; - return $meta; - } - } - - flock($handle, LOCK_UN); - fclose($handle); - return NULL; - } - - - - /** - * Reads cache data from disk and closes cache file handle. - * @param array - * @return mixed - */ - protected function readData($meta) - { - $data = stream_get_contents($meta[self::HANDLE]); - flock($meta[self::HANDLE], LOCK_UN); - fclose($meta[self::HANDLE]); - - if (empty($meta[self::META_SERIALIZED])) { - return $data; - } else { - return @unserialize($data); // intentionally @ - } - } - - - - /** - * Returns file name. - * @param string - * @return string - */ - protected function getCacheFile($key) - { - $file = urlencode($key); - if ($this->useDirs && $a = strrpos($file, '%00')) { // %00 = urlencode(Nette\Caching\Cache::NAMESPACE_SEPARATOR) - $file = substr_replace($file, '/_', $a, 3); - } - return $this->dir . '/_' . $file; - } - - - - /** - * Deletes and closes file. - * @param string - * @param resource - * @return void - */ - private static function delete($file, $handle = NULL) - { - if (@unlink($file)) { // @ - file may not already exist - if ($handle) { - flock($handle, LOCK_UN); - fclose($handle); - } - return; - } - - if (!$handle) { - $handle = @fopen($file, 'r+'); // @ - file may not exist - } - if ($handle) { - flock($handle, LOCK_EX); - ftruncate($handle, 0); - flock($handle, LOCK_UN); - fclose($handle); - @unlink($file); // @ - file may not already exist - } - } - -} + timestamp) + META_CALLBACKS = 'callbacks'; // array of callbacks (function, args) + + /** additional cache structure */ + const FILE = 'file', + HANDLE = 'handle'; + + + /** @var float probability that the clean() routine is started */ + public static $gcProbability = 0.001; + + /** @var bool */ + public static $useDirectories = TRUE; + + /** @var string */ + private $dir; + + /** @var bool */ + private $useDirs; + + /** @var IJournal */ + private $journal; + + /** @var array */ + private $locks; + + + + public function __construct($dir, IJournal $journal = NULL) + { + $this->dir = realpath($dir); + if ($this->dir === FALSE) { + throw new Nette\DirectoryNotFoundException("Directory '$dir' not found."); + } + + $this->useDirs = (bool) static::$useDirectories; + $this->journal = $journal; + + if (mt_rand() / mt_getrandmax() < static::$gcProbability) { + $this->clean(array()); + } + } + + + + /** + * Read from cache. + * @param string key + * @return mixed|NULL + */ + public function read($key) + { + $meta = $this->readMetaAndLock($this->getCacheFile($key), LOCK_SH); + if ($meta && $this->verify($meta)) { + return $this->readData($meta); // calls fclose() + + } else { + return NULL; + } + } + + + + /** + * Verifies dependencies. + * @param array + * @return bool + */ + private function verify($meta) + { + do { + if (!empty($meta[self::META_DELTA])) { + // meta[file] was added by readMetaAndLock() + if (filemtime($meta[self::FILE]) + $meta[self::META_DELTA] < time()) { + break; + } + touch($meta[self::FILE]); + + } elseif (!empty($meta[self::META_EXPIRE]) && $meta[self::META_EXPIRE] < time()) { + break; + } + + if (!empty($meta[self::META_CALLBACKS]) && !Cache::checkCallbacks($meta[self::META_CALLBACKS])) { + break; + } + + if (!empty($meta[self::META_ITEMS])) { + foreach ($meta[self::META_ITEMS] as $depFile => $time) { + $m = $this->readMetaAndLock($depFile, LOCK_SH); + if ($m[self::META_TIME] !== $time || ($m && !$this->verify($m))) { + break 2; + } + } + } + + return TRUE; + } while (FALSE); + + $this->delete($meta[self::FILE], $meta[self::HANDLE]); // meta[handle] & meta[file] was added by readMetaAndLock() + return FALSE; + } + + + + /** + * Prevents item reading and writing. Lock is released by write() or remove(). + * @param string key + * @return void + */ + public function lock($key) + { + $cacheFile = $this->getCacheFile($key); + if ($this->useDirs && !is_dir($dir = dirname($cacheFile))) { + @mkdir($dir, 0777); // @ - directory may already exist + } + $handle = @fopen($cacheFile, 'r+b'); // @ - file may not exist + if (!$handle) { + $handle = fopen($cacheFile, 'wb'); + if (!$handle) { + return; + } + } + + $this->locks[$key] = $handle; + flock($handle, LOCK_EX); + } + + + + /** + * Writes item into the cache. + * @param string key + * @param mixed data + * @param array dependencies + * @return void + */ + public function write($key, $data, array $dp) + { + $meta = array( + self::META_TIME => microtime(), + ); + + if (isset($dp[Cache::EXPIRATION])) { + if (empty($dp[Cache::SLIDING])) { + $meta[self::META_EXPIRE] = $dp[Cache::EXPIRATION] + time(); // absolute time + } else { + $meta[self::META_DELTA] = (int) $dp[Cache::EXPIRATION]; // sliding time + } + } + + if (isset($dp[Cache::ITEMS])) { + foreach ((array) $dp[Cache::ITEMS] as $item) { + $depFile = $this->getCacheFile($item); + $m = $this->readMetaAndLock($depFile, LOCK_SH); + $meta[self::META_ITEMS][$depFile] = $m[self::META_TIME]; // may be NULL + unset($m); + } + } + + if (isset($dp[Cache::CALLBACKS])) { + $meta[self::META_CALLBACKS] = $dp[Cache::CALLBACKS]; + } + + if (!isset($this->locks[$key])) { + $this->lock($key); + if (!isset($this->locks[$key])) { + return; + } + } + $handle = $this->locks[$key]; + unset($this->locks[$key]); + + $cacheFile = $this->getCacheFile($key); + + if (isset($dp[Cache::TAGS]) || isset($dp[Cache::PRIORITY])) { + if (!$this->journal) { + throw new Nette\InvalidStateException('CacheJournal has not been provided.'); + } + $this->journal->write($cacheFile, $dp); + } + + ftruncate($handle, 0); + + if (!is_string($data)) { + $data = serialize($data); + $meta[self::META_SERIALIZED] = TRUE; + } + + $head = serialize($meta) . '?>'; + $head = 'delete($cacheFile, $handle); + } + + + + /** + * Removes item from the cache. + * @param string key + * @return void + */ + public function remove($key) + { + unset($this->locks[$key]); + $this->delete($this->getCacheFile($key)); + } + + + + /** + * Removes items from the cache by conditions & garbage collector. + * @param array conditions + * @return void + */ + public function clean(array $conds) + { + $all = !empty($conds[Cache::ALL]); + $collector = empty($conds); + + // cleaning using file iterator + if ($all || $collector) { + $now = time(); + foreach (Nette\Utils\Finder::find('_*')->from($this->dir)->childFirst() as $entry) { + $path = (string) $entry; + if ($entry->isDir()) { // collector: remove empty dirs + @rmdir($path); // @ - removing dirs is not necessary + continue; + } + if ($all) { + $this->delete($path); + + } else { // collector + $meta = $this->readMetaAndLock($path, LOCK_SH); + if (!$meta) { + continue; + } + + if ((!empty($meta[self::META_DELTA]) && filemtime($meta[self::FILE]) + $meta[self::META_DELTA] < $now) + || (!empty($meta[self::META_EXPIRE]) && $meta[self::META_EXPIRE] < $now) + ) { + $this->delete($path, $meta[self::HANDLE]); + continue; + } + + flock($meta[self::HANDLE], LOCK_UN); + fclose($meta[self::HANDLE]); + } + } + + if ($this->journal) { + $this->journal->clean($conds); + } + return; + } + + // cleaning using journal + if ($this->journal) { + foreach ($this->journal->clean($conds) as $file) { + $this->delete($file); + } + } + } + + + + /** + * Reads cache data from disk. + * @param string file path + * @param int lock mode + * @return array|NULL + */ + protected function readMetaAndLock($file, $lock) + { + $handle = @fopen($file, 'r+b'); // @ - file may not exist + if (!$handle) { + return NULL; + } + + flock($handle, $lock); + + $head = stream_get_contents($handle, self::META_HEADER_LEN); + if ($head && strlen($head) === self::META_HEADER_LEN) { + $size = (int) substr($head, -6); + $meta = stream_get_contents($handle, $size, self::META_HEADER_LEN); + $meta = @unserialize($meta); // intentionally @ + if (is_array($meta)) { + fseek($handle, $size + self::META_HEADER_LEN); // needed by PHP < 5.2.6 + $meta[self::FILE] = $file; + $meta[self::HANDLE] = $handle; + return $meta; + } + } + + flock($handle, LOCK_UN); + fclose($handle); + return NULL; + } + + + + /** + * Reads cache data from disk and closes cache file handle. + * @param array + * @return mixed + */ + protected function readData($meta) + { + $data = stream_get_contents($meta[self::HANDLE]); + flock($meta[self::HANDLE], LOCK_UN); + fclose($meta[self::HANDLE]); + + if (empty($meta[self::META_SERIALIZED])) { + return $data; + } else { + return @unserialize($data); // intentionally @ + } + } + + + + /** + * Returns file name. + * @param string + * @return string + */ + protected function getCacheFile($key) + { + $file = urlencode($key); + if ($this->useDirs && $a = strrpos($file, '%00')) { // %00 = urlencode(Nette\Caching\Cache::NAMESPACE_SEPARATOR) + $file = substr_replace($file, '/_', $a, 3); + } + return $this->dir . '/_' . $file; + } + + + + /** + * Deletes and closes file. + * @param string + * @param resource + * @return void + */ + private static function delete($file, $handle = NULL) + { + if (@unlink($file)) { // @ - file may not already exist + if ($handle) { + flock($handle, LOCK_UN); + fclose($handle); + } + return; + } + + if (!$handle) { + $handle = @fopen($file, 'r+'); // @ - file may not exist + } + if ($handle) { + flock($handle, LOCK_EX); + ftruncate($handle, 0); + flock($handle, LOCK_UN); + fclose($handle); + @unlink($file); // @ - file may not already exist + } + } + +} diff --git a/libs/Nette/Caching/Storages/IJournal.php b/libs/Nette/Caching/Storages/IJournal.php index f041425..e5d5e9d 100644 --- a/libs/Nette/Caching/Storages/IJournal.php +++ b/libs/Nette/Caching/Storages/IJournal.php @@ -1,42 +1,42 @@ -prefix = $prefix; - $this->journal = $journal; - $this->memcache = new \Memcache; - Nette\Diagnostics\Debugger::tryError(); - $this->memcache->connect($host, $port); - if (Nette\Diagnostics\Debugger::catchError($e)) { - throw new Nette\InvalidStateException('Memcache::connect(): ' . $e->getMessage(), 0, $e); - } - } - - - - /** - * Read from cache. - * @param string key - * @return mixed|NULL - */ - public function read($key) - { - $key = $this->prefix . $key; - $meta = $this->memcache->get($key); - if (!$meta) { - return NULL; - } - - // meta structure: - // array( - // data => stored data - // delta => relative (sliding) expiration - // callbacks => array of callbacks (function, args) - // ) - - // verify dependencies - if (!empty($meta[self::META_CALLBACKS]) && !Cache::checkCallbacks($meta[self::META_CALLBACKS])) { - $this->memcache->delete($key, 0); - return NULL; - } - - if (!empty($meta[self::META_DELTA])) { - $this->memcache->replace($key, $meta, 0, $meta[self::META_DELTA] + time()); - } - - return $meta[self::META_DATA]; - } - - - - /** - * Writes item into the cache. - * @param string key - * @param mixed data - * @param array dependencies - * @return void - */ - public function write($key, $data, array $dp) - { - if (isset($dp[Cache::ITEMS])) { - throw new Nette\NotSupportedException('Dependent items are not supported by MemcachedStorage.'); - } - - $key = $this->prefix . $key; - $meta = array( - self::META_DATA => $data, - ); - - $expire = 0; - if (isset($dp[Cache::EXPIRATION])) { - $expire = (int) $dp[Cache::EXPIRATION]; - if (!empty($dp[Cache::SLIDING])) { - $meta[self::META_DELTA] = $expire; // sliding time - } - } - - if (isset($dp[Cache::CALLBACKS])) { - $meta[self::META_CALLBACKS] = $dp[Cache::CALLBACKS]; - } - - if (isset($dp[Cache::TAGS]) || isset($dp[Cache::PRIORITY])) { - if (!$this->journal) { - throw new Nette\InvalidStateException('CacheJournal has not been provided.'); - } - $this->journal->write($key, $dp); - } - - $this->memcache->set($key, $meta, 0, $expire); - } - - - - /** - * Removes item from the cache. - * @param string key - * @return void - */ - public function remove($key) - { - $this->memcache->delete($this->prefix . $key, 0); - } - - - - /** - * Removes items from the cache by conditions & garbage collector. - * @param array conditions - * @return void - */ - public function clean(array $conds) - { - if (!empty($conds[Cache::ALL])) { - $this->memcache->flush(); - - } elseif ($this->journal) { - foreach ($this->journal->clean($conds) as $entry) { - $this->memcache->delete($entry, 0); - } - } - } - -} +prefix = $prefix; + $this->journal = $journal; + $this->memcache = new \Memcache; + if ($host) { + $this->addServer($host, $port); + } + } + + + + public function addServer($host = 'localhost', $port = 11211, $timeout = 1) + { + Nette\Diagnostics\Debugger::tryError(); + $this->memcache->addServer($host, $port, TRUE, 1, $timeout); + if (Nette\Diagnostics\Debugger::catchError($e)) { + throw new Nette\InvalidStateException('Memcache::addServer(): ' . $e->getMessage(), 0, $e); + } + } + + + + /** + * @return \Memcache + */ + public function getConnection() + { + return $this->memcache; + } + + + + /** + * Read from cache. + * @param string key + * @return mixed|NULL + */ + public function read($key) + { + $key = $this->prefix . $key; + $meta = $this->memcache->get($key); + if (!$meta) { + return NULL; + } + + // meta structure: + // array( + // data => stored data + // delta => relative (sliding) expiration + // callbacks => array of callbacks (function, args) + // ) + + // verify dependencies + if (!empty($meta[self::META_CALLBACKS]) && !Cache::checkCallbacks($meta[self::META_CALLBACKS])) { + $this->memcache->delete($key, 0); + return NULL; + } + + if (!empty($meta[self::META_DELTA])) { + $this->memcache->replace($key, $meta, 0, $meta[self::META_DELTA] + time()); + } + + return $meta[self::META_DATA]; + } + + + + /** + * Prevents item reading and writing. Lock is released by write() or remove(). + * @param string key + * @return void + */ + public function lock($key) + { + } + + + + /** + * Writes item into the cache. + * @param string key + * @param mixed data + * @param array dependencies + * @return void + */ + public function write($key, $data, array $dp) + { + if (isset($dp[Cache::ITEMS])) { + throw new Nette\NotSupportedException('Dependent items are not supported by MemcachedStorage.'); + } + + $key = $this->prefix . $key; + $meta = array( + self::META_DATA => $data, + ); + + $expire = 0; + if (isset($dp[Cache::EXPIRATION])) { + $expire = (int) $dp[Cache::EXPIRATION]; + if (!empty($dp[Cache::SLIDING])) { + $meta[self::META_DELTA] = $expire; // sliding time + } + } + + if (isset($dp[Cache::CALLBACKS])) { + $meta[self::META_CALLBACKS] = $dp[Cache::CALLBACKS]; + } + + if (isset($dp[Cache::TAGS]) || isset($dp[Cache::PRIORITY])) { + if (!$this->journal) { + throw new Nette\InvalidStateException('CacheJournal has not been provided.'); + } + $this->journal->write($key, $dp); + } + + $this->memcache->set($key, $meta, 0, $expire); + } + + + + /** + * Removes item from the cache. + * @param string key + * @return void + */ + public function remove($key) + { + $this->memcache->delete($this->prefix . $key, 0); + } + + + + /** + * Removes items from the cache by conditions & garbage collector. + * @param array conditions + * @return void + */ + public function clean(array $conds) + { + if (!empty($conds[Cache::ALL])) { + $this->memcache->flush(); + + } elseif ($this->journal) { + foreach ($this->journal->clean($conds) as $entry) { + $this->memcache->delete($entry, 0); + } + } + } + +} diff --git a/libs/Nette/Caching/Storages/MemoryStorage.php b/libs/Nette/Caching/Storages/MemoryStorage.php index f179d47..34099e9 100644 --- a/libs/Nette/Caching/Storages/MemoryStorage.php +++ b/libs/Nette/Caching/Storages/MemoryStorage.php @@ -1,80 +1,91 @@ -data[$key]) ? $this->data[$key] : NULL; - } - - - - /** - * Writes item into the cache. - * @param string key - * @param mixed data - * @param array dependencies - * @return void - */ - public function write($key, $data, array $dp) - { - $this->data[$key] = $data; - } - - - - /** - * Removes item from the cache. - * @param string key - * @return void - */ - public function remove($key) - { - unset($this->data[$key]); - } - - - - /** - * Removes items from the cache by conditions & garbage collector. - * @param array conditions - * @return void - */ - public function clean(array $conds) - { - if (!empty($conds[Nette\Caching\Cache::ALL])) { - $this->data = array(); - } - } - -} +data[$key]) ? $this->data[$key] : NULL; + } + + + + /** + * Prevents item reading and writing. Lock is released by write() or remove(). + * @param string key + * @return void + */ + public function lock($key) + { + } + + + + /** + * Writes item into the cache. + * @param string key + * @param mixed data + * @param array dependencies + * @return void + */ + public function write($key, $data, array $dp) + { + $this->data[$key] = $data; + } + + + + /** + * Removes item from the cache. + * @param string key + * @return void + */ + public function remove($key) + { + unset($this->data[$key]); + } + + + + /** + * Removes items from the cache by conditions & garbage collector. + * @param array conditions + * @return void + */ + public function clean(array $conds) + { + if (!empty($conds[Nette\Caching\Cache::ALL])) { + $this->data = array(); + } + } + +} diff --git a/libs/Nette/Caching/Storages/PhpFileStorage.php b/libs/Nette/Caching/Storages/PhpFileStorage.php index 48faae5..2a5e451 100644 --- a/libs/Nette/Caching/Storages/PhpFileStorage.php +++ b/libs/Nette/Caching/Storages/PhpFileStorage.php @@ -1,59 +1,59 @@ - $meta[self::FILE], - 'handle' => $meta[self::HANDLE], - ); - } - - - - /** - * Returns file name. - * @param string - * @return string - */ - protected function getCacheFile($key) - { - return parent::getCacheFile(substr_replace( - $key, - trim(strtr($this->hint, '\\/@', '.._'), '.') . '-', - strpos($key, Nette\Caching\Cache::NAMESPACE_SEPARATOR) + 1, - 0 - )) . '.php'; - } - -} + $meta[self::FILE], + 'handle' => $meta[self::HANDLE], + ); + } + + + + /** + * Returns file name. + * @param string + * @return string + */ + protected function getCacheFile($key) + { + return parent::getCacheFile(substr_replace( + $key, + trim(strtr($this->hint, '\\/@', '.._'), '.') . '-', + strpos($key, Nette\Caching\Cache::NAMESPACE_SEPARATOR) + 1, + 0 + )) . '.php'; + } + +} diff --git a/libs/Nette/ComponentModel/Component.php b/libs/Nette/ComponentModel/Component.php index 705a645..6a4e4ec 100644 --- a/libs/Nette/ComponentModel/Component.php +++ b/libs/Nette/ComponentModel/Component.php @@ -1,342 +1,351 @@ - [obj, depth, path, is_monitored?]] */ - private $monitors = array(); - - - - /** - */ - public function __construct(IContainer $parent = NULL, $name = NULL) - { - if ($parent !== NULL) { - $parent->addComponent($this, $name); - - } elseif (is_string($name)) { - $this->name = $name; - } - } - - - - /** - * Lookup hierarchy for component specified by class or interface name. - * @param string class/interface type - * @param bool throw exception if component doesn't exist? - * @return IComponent - */ - public function lookup($type, $need = TRUE) - { - if (!isset($this->monitors[$type])) { // not monitored or not processed yet - $obj = $this->parent; - $path = self::NAME_SEPARATOR . $this->name; - $depth = 1; - while ($obj !== NULL) { - if ($obj instanceof $type) { - break; - } - $path = self::NAME_SEPARATOR . $obj->getName() . $path; - $depth++; - $obj = $obj->getParent(); // IComponent::getParent() - if ($obj === $this) { - $obj = NULL; // prevent cycling - } - } - - if ($obj) { - $this->monitors[$type] = array($obj, $depth, substr($path, 1), FALSE); - - } else { - $this->monitors[$type] = array(NULL, NULL, NULL, FALSE); // not found - } - } - - if ($need && $this->monitors[$type][0] === NULL) { - throw new Nette\InvalidStateException("Component '$this->name' is not attached to '$type'."); - } - - return $this->monitors[$type][0]; - } - - - - /** - * Lookup for component specified by class or interface name. Returns backtrace path. - * A path is the concatenation of component names separated by self::NAME_SEPARATOR. - * @param string class/interface type - * @param bool throw exception if component doesn't exist? - * @return string - */ - public function lookupPath($type, $need = TRUE) - { - $this->lookup($type, $need); - return $this->monitors[$type][2]; - } - - - - /** - * Starts monitoring. - * @param string class/interface type - * @return void - */ - public function monitor($type) - { - if (empty($this->monitors[$type][3])) { - if ($obj = $this->lookup($type, FALSE)) { - $this->attached($obj); - } - $this->monitors[$type][3] = TRUE; // mark as monitored - } - } - - - - /** - * Stops monitoring. - * @param string class/interface type - * @return void - */ - public function unmonitor($type) - { - unset($this->monitors[$type]); - } - - - - /** - * This method will be called when the component (or component's parent) - * becomes attached to a monitored object. Do not call this method yourself. - * @param IComponent - * @return void - */ - protected function attached($obj) - { - } - - - - /** - * This method will be called before the component (or component's parent) - * becomes detached from a monitored object. Do not call this method yourself. - * @param IComponent - * @return void - */ - protected function detached($obj) - { - } - - - - /********************* interface IComponent ****************d*g**/ - - - - /** - * @return string - */ - final public function getName() - { - return $this->name; - } - - - - /** - * Returns the container if any. - * @return IContainer|NULL - */ - final public function getParent() - { - return $this->parent; - } - - - - /** - * Sets the parent of this component. This method is managed by containers and should - * not be called by applications - * @param IContainer New parent or null if this component is being removed from a parent - * @param string - * @return Component provides a fluent interface - * @throws Nette\InvalidStateException - * @internal - */ - public function setParent(IContainer $parent = NULL, $name = NULL) - { - if ($parent === NULL && $this->parent === NULL && $name !== NULL) { - $this->name = $name; // just rename - return $this; - - } elseif ($parent === $this->parent && $name === NULL) { - return $this; // nothing to do - } - - // A component cannot be given a parent if it already has a parent. - if ($this->parent !== NULL && $parent !== NULL) { - throw new Nette\InvalidStateException("Component '$this->name' already has a parent."); - } - - // remove from parent? - if ($parent === NULL) { - $this->refreshMonitors(0); - $this->parent = NULL; - - } else { // add to parent - $this->validateParent($parent); - $this->parent = $parent; - if ($name !== NULL) { - $this->name = $name; - } - - $tmp = array(); - $this->refreshMonitors(0, $tmp); - } - return $this; - } - - - - /** - * Is called by a component when it is about to be set new parent. Descendant can - * override this method to disallow a parent change by throwing an Nette\InvalidStateException - * @param IContainer - * @return void - * @throws Nette\InvalidStateException - */ - protected function validateParent(IContainer $parent) - { - } - - - - /** - * Refreshes monitors. - * @param int - * @param array|NULL (array = attaching, NULL = detaching) - * @param array - * @return void - */ - private function refreshMonitors($depth, & $missing = NULL, & $listeners = array()) - { - if ($this instanceof IContainer) { - foreach ($this->getComponents() as $component) { - if ($component instanceof Component) { - $component->refreshMonitors($depth + 1, $missing, $listeners); - } - } - } - - if ($missing === NULL) { // detaching - foreach ($this->monitors as $type => $rec) { - if (isset($rec[1]) && $rec[1] > $depth) { - if ($rec[3]) { // monitored - $this->monitors[$type] = array(NULL, NULL, NULL, TRUE); - $listeners[] = array($this, $rec[0]); - } else { // not monitored, just randomly cached - unset($this->monitors[$type]); - } - } - } - - } else { // attaching - foreach ($this->monitors as $type => $rec) { - if (isset($rec[0])) { // is in cache yet - continue; - - } elseif (!$rec[3]) { // not monitored, just randomly cached - unset($this->monitors[$type]); - - } elseif (isset($missing[$type])) { // known from previous lookup - $this->monitors[$type] = array(NULL, NULL, NULL, TRUE); - - } else { - $this->monitors[$type] = NULL; // forces re-lookup - if ($obj = $this->lookup($type, FALSE)) { - $listeners[] = array($this, $obj); - } else { - $missing[$type] = TRUE; - } - $this->monitors[$type][3] = TRUE; // mark as monitored - } - } - } - - if ($depth === 0) { // call listeners - $method = $missing === NULL ? 'detached' : 'attached'; - foreach ($listeners as $item) { - $item[0]->$method($item[1]); - } - } - } - - - - /********************* cloneable, serializable ****************d*g**/ - - - - /** - * Object cloning. - */ - public function __clone() - { - if ($this->parent === NULL) { - return; - - } elseif ($this->parent instanceof Container) { - $this->parent = $this->parent->_isCloning(); - if ($this->parent === NULL) { // not cloning - $this->refreshMonitors(0); - } - - } else { - $this->parent = NULL; - $this->refreshMonitors(0); - } - } - - - - /** - * Prevents unserialization. - */ - final public function __wakeup() - { - throw new Nette\NotImplementedException; - } - -} + [obj, depth, path, is_monitored?]] */ + private $monitors = array(); + + + + /** + */ + public function __construct(IContainer $parent = NULL, $name = NULL) + { + if ($parent !== NULL) { + $parent->addComponent($this, $name); + + } elseif (is_string($name)) { + $this->name = $name; + } + } + + + + /** + * Lookup hierarchy for component specified by class or interface name. + * @param string class/interface type + * @param bool throw exception if component doesn't exist? + * @return IComponent + */ + public function lookup($type, $need = TRUE) + { + if (!isset($this->monitors[$type])) { // not monitored or not processed yet + $obj = $this->parent; + $path = self::NAME_SEPARATOR . $this->name; + $depth = 1; + while ($obj !== NULL) { + if ($obj instanceof $type) { + break; + } + $path = self::NAME_SEPARATOR . $obj->getName() . $path; + $depth++; + $obj = $obj->getParent(); // IComponent::getParent() + if ($obj === $this) { + $obj = NULL; // prevent cycling + } + } + + if ($obj) { + $this->monitors[$type] = array($obj, $depth, substr($path, 1), FALSE); + + } else { + $this->monitors[$type] = array(NULL, NULL, NULL, FALSE); // not found + } + } + + if ($need && $this->monitors[$type][0] === NULL) { + throw new Nette\InvalidStateException("Component '$this->name' is not attached to '$type'."); + } + + return $this->monitors[$type][0]; + } + + + + /** + * Lookup for component specified by class or interface name. Returns backtrace path. + * A path is the concatenation of component names separated by self::NAME_SEPARATOR. + * @param string class/interface type + * @param bool throw exception if component doesn't exist? + * @return string + */ + public function lookupPath($type, $need = TRUE) + { + $this->lookup($type, $need); + return $this->monitors[$type][2]; + } + + + + /** + * Starts monitoring. + * @param string class/interface type + * @return void + */ + public function monitor($type) + { + if (empty($this->monitors[$type][3])) { + if ($obj = $this->lookup($type, FALSE)) { + $this->attached($obj); + } + $this->monitors[$type][3] = TRUE; // mark as monitored + } + } + + + + /** + * Stops monitoring. + * @param string class/interface type + * @return void + */ + public function unmonitor($type) + { + unset($this->monitors[$type]); + } + + + + /** + * This method will be called when the component (or component's parent) + * becomes attached to a monitored object. Do not call this method yourself. + * @param IComponent + * @return void + */ + protected function attached($obj) + { + } + + + + /** + * This method will be called before the component (or component's parent) + * becomes detached from a monitored object. Do not call this method yourself. + * @param IComponent + * @return void + */ + protected function detached($obj) + { + } + + + + /********************* interface IComponent ****************d*g**/ + + + + /** + * @return string + */ + final public function getName() + { + return $this->name; + } + + + + /** + * Returns the container if any. + * @return IContainer|NULL + */ + final public function getParent() + { + return $this->parent; + } + + + + /** + * Sets the parent of this component. This method is managed by containers and should + * not be called by applications + * @param IContainer New parent or null if this component is being removed from a parent + * @param string + * @return Component provides a fluent interface + * @throws Nette\InvalidStateException + * @internal + */ + public function setParent(IContainer $parent = NULL, $name = NULL) + { + if ($parent === NULL && $this->parent === NULL && $name !== NULL) { + $this->name = $name; // just rename + return $this; + + } elseif ($parent === $this->parent && $name === NULL) { + return $this; // nothing to do + } + + // A component cannot be given a parent if it already has a parent. + if ($this->parent !== NULL && $parent !== NULL) { + throw new Nette\InvalidStateException("Component '$this->name' already has a parent."); + } + + // remove from parent? + if ($parent === NULL) { + $this->refreshMonitors(0); + $this->parent = NULL; + + } else { // add to parent + $this->validateParent($parent); + $this->parent = $parent; + if ($name !== NULL) { + $this->name = $name; + } + + $tmp = array(); + $this->refreshMonitors(0, $tmp); + } + return $this; + } + + + + /** + * Is called by a component when it is about to be set new parent. Descendant can + * override this method to disallow a parent change by throwing an Nette\InvalidStateException + * @return void + * @throws Nette\InvalidStateException + */ + protected function validateParent(IContainer $parent) + { + } + + + + /** + * Refreshes monitors. + * @param int + * @param array|NULL (array = attaching, NULL = detaching) + * @param array + * @return void + */ + private function refreshMonitors($depth, & $missing = NULL, & $listeners = array()) + { + if ($this instanceof IContainer) { + foreach ($this->getComponents() as $component) { + if ($component instanceof Component) { + $component->refreshMonitors($depth + 1, $missing, $listeners); + } + } + } + + if ($missing === NULL) { // detaching + foreach ($this->monitors as $type => $rec) { + if (isset($rec[1]) && $rec[1] > $depth) { + if ($rec[3]) { // monitored + $this->monitors[$type] = array(NULL, NULL, NULL, TRUE); + $listeners[] = array($this, $rec[0]); + } else { // not monitored, just randomly cached + unset($this->monitors[$type]); + } + } + } + + } else { // attaching + foreach ($this->monitors as $type => $rec) { + if (isset($rec[0])) { // is in cache yet + continue; + + } elseif (!$rec[3]) { // not monitored, just randomly cached + unset($this->monitors[$type]); + + } elseif (isset($missing[$type])) { // known from previous lookup + $this->monitors[$type] = array(NULL, NULL, NULL, TRUE); + + } else { + $this->monitors[$type] = NULL; // forces re-lookup + if ($obj = $this->lookup($type, FALSE)) { + $listeners[] = array($this, $obj); + } else { + $missing[$type] = TRUE; + } + $this->monitors[$type][3] = TRUE; // mark as monitored + } + } + } + + if ($depth === 0) { // call listeners + $method = $missing === NULL ? 'detached' : 'attached'; + foreach ($listeners as $item) { + $item[0]->$method($item[1]); + } + } + } + + + + /********************* cloneable, serializable ****************d*g**/ + + + + /** + * Object cloning. + */ + public function __clone() + { + if ($this->parent === NULL) { + return; + + } elseif ($this->parent instanceof Container) { + $this->parent = $this->parent->_isCloning(); + if ($this->parent === NULL) { // not cloning + $this->refreshMonitors(0); + } + + } else { + $this->parent = NULL; + $this->refreshMonitors(0); + } + } + + + + /** + * Prevents serialization. + */ + final public function __sleep() + { + throw new Nette\NotImplementedException('Object serialization is not supported by class ' . get_class($this)); + } + + + + /** + * Prevents unserialization. + */ + final public function __wakeup() + { + throw new Nette\NotImplementedException('Object unserialization is not supported by class ' . get_class($this)); + } + +} diff --git a/libs/Nette/ComponentModel/Container.php b/libs/Nette/ComponentModel/Container.php index fb5693a..9c35767 100644 --- a/libs/Nette/ComponentModel/Container.php +++ b/libs/Nette/ComponentModel/Container.php @@ -1,257 +1,256 @@ -getName(); - } - - if (is_int($name)) { - $name = (string) $name; - - } elseif (!is_string($name)) { - throw new Nette\InvalidArgumentException("Component name must be integer or string, " . gettype($name) . " given."); - - } elseif (!preg_match('#^[a-zA-Z0-9_]+$#', $name)) { - throw new Nette\InvalidArgumentException("Component name must be non-empty alphanumeric string, '$name' given."); - } - - if (isset($this->components[$name])) { - throw new Nette\InvalidStateException("Component with name '$name' already exists."); - } - - // check circular reference - $obj = $this; - do { - if ($obj === $component) { - throw new Nette\InvalidStateException("Circular reference detected while adding component '$name'."); - } - $obj = $obj->getParent(); - } while ($obj !== NULL); - - // user checking - $this->validateChildComponent($component); - - try { - if (isset($this->components[$insertBefore])) { - $tmp = array(); - foreach ($this->components as $k => $v) { - if ($k === $insertBefore) { - $tmp[$name] = $component; - } - $tmp[$k] = $v; - } - $this->components = $tmp; - } else { - $this->components[$name] = $component; - } - $component->setParent($this, $name); - - } catch (\Exception $e) { - unset($this->components[$name]); // undo - throw $e; - } - } - - - - /** - * Removes a component from the IComponentContainer. - * @param IComponent - * @return void - */ - public function removeComponent(IComponent $component) - { - $name = $component->getName(); - if (!isset($this->components[$name]) || $this->components[$name] !== $component) { - throw new Nette\InvalidArgumentException("Component named '$name' is not located in this container."); - } - - unset($this->components[$name]); - $component->setParent(NULL); - } - - - - /** - * Returns component specified by name or path. - * @param string - * @param bool throw exception if component doesn't exist? - * @return IComponent|NULL - */ - final public function getComponent($name, $need = TRUE) - { - if (is_int($name)) { - $name = (string) $name; - - } elseif (!is_string($name)) { - throw new Nette\InvalidArgumentException("Component name must be integer or string, " . gettype($name) . " given."); - - } else { - $a = strpos($name, self::NAME_SEPARATOR); - if ($a !== FALSE) { - $ext = (string) substr($name, $a + 1); - $name = substr($name, 0, $a); - } - - if ($name === '') { - throw new Nette\InvalidArgumentException("Component or subcomponent name must not be empty string."); - } - } - - if (!isset($this->components[$name])) { - $component = $this->createComponent($name); - if ($component instanceof IComponent && $component->getParent() === NULL) { - $this->addComponent($component, $name); - } - } - - if (isset($this->components[$name])) { - if (!isset($ext)) { - return $this->components[$name]; - - } elseif ($this->components[$name] instanceof IContainer) { - return $this->components[$name]->getComponent($ext, $need); - - } elseif ($need) { - throw new Nette\InvalidArgumentException("Component with name '$name' is not container and cannot have '$ext' component."); - } - - } elseif ($need) { - throw new Nette\InvalidArgumentException("Component with name '$name' does not exist."); - } - } - - - - /** - * Component factory. Delegates the creation of components to a createComponent
+
diff --git a/libs/Nette/DI/Diagnostics/templates/ContainerPanel.tab.phtml b/libs/Nette/DI/Diagnostics/templates/ContainerPanel.tab.phtml
new file mode 100644
index 0000000..fc4e380
--- /dev/null
+++ b/libs/Nette/DI/Diagnostics/templates/ContainerPanel.tab.phtml
@@ -0,0 +1,9 @@
+
+container) ?>
+ +
+
+
+
+
+
+
+
+
+Parameters
+ +
+ container->parameters); ?>
+
+
+ Services
+ +| Name | +Autowired | +Service | +Meta | +
|---|---|---|---|
| ', $name)) ?> | +" class=""> | +
+
+
+
+ |
+ meta[$name])) { echo Helpers::clickableDump($container->meta[$name], TRUE); } ?> | +
Factories
+ +| Method | +Returns | +
|---|---|
| ', $name)) ?>() | + |
+
diff --git a/libs/Nette/DI/Helpers.php b/libs/Nette/DI/Helpers.php
new file mode 100644
index 0000000..b53af78
--- /dev/null
+++ b/libs/Nette/DI/Helpers.php
@@ -0,0 +1,160 @@
+ $val) {
+ $res[$key] = self::expand($val, $params, $recursive);
+ }
+ return $res;
+
+ } elseif ($var instanceof Statement) {
+ return new Statement(self::expand($var->entity, $params, $recursive), self::expand($var->arguments, $params, $recursive));
+
+ } elseif (!is_string($var)) {
+ return $var;
+ }
+
+ $parts = preg_split('#%([\w.-]*)%#i', $var, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $res = '';
+ foreach ($parts as $n => $part) {
+ if ($n % 2 === 0) {
+ $res .= $part;
+
+ } elseif ($part === '') {
+ $res .= '%';
+
+ } elseif (isset($recursive[$part])) {
+ throw new Nette\InvalidArgumentException('Circular reference detected for variables: ' . implode(', ', array_keys($recursive)) . '.');
+
+ } else {
+ $val = Nette\Utils\Arrays::get($params, explode('.', $part));
+ if ($recursive) {
+ $val = self::expand($val, $params, (is_array($recursive) ? $recursive : array()) + array($part => 1));
+ }
+ if (strlen($part) + 2 === strlen($var)) {
+ return $val;
+ }
+ if (!is_scalar($val)) {
+ throw new Nette\InvalidArgumentException("Unable to concatenate non-scalar parameter '$part' into '$var'.");
+ }
+ $res .= $val;
+ }
+ }
+ return $res;
+ }
+
+
+
+ /**
+ * Expand counterpart.
+ * @param mixed
+ * @return mixed
+ */
+ public static function escape($value)
+ {
+ if (is_array($value)) {
+ array_walk_recursive($value, function(&$val) {
+ $val = is_string($val) ? str_replace('%', '%%', $val) : $val;
+ });
+ } elseif (is_string($value)) {
+ $value = str_replace('%', '%%', $value);
+ }
+ return $value;
+ }
+
+
+
+ /**
+ * Generates list of arguments using autowiring.
+ * @param Nette\Reflection\GlobalFunction|Nette\Reflection\Method
+ * @return array
+ */
+ public static function autowireArguments(\ReflectionFunctionAbstract $method, array $arguments, $container)
+ {
+ $optCount = 0;
+ $num = -1;
+ $res = array();
+
+ foreach ($method->getParameters() as $num => $parameter) {
+ if (array_key_exists($num, $arguments)) {
+ $res[$num] = $arguments[$num];
+ unset($arguments[$num]);
+ $optCount = 0;
+
+ } elseif (array_key_exists($parameter->getName(), $arguments)) {
+ $res[$num] = $arguments[$parameter->getName()];
+ unset($arguments[$parameter->getName()]);
+ $optCount = 0;
+
+ } elseif ($class = $parameter->getClassName()) { // has object type hint
+ $res[$num] = $container->getByType($class, FALSE);
+ if ($res[$num] === NULL) {
+ if ($parameter->allowsNull()) {
+ $optCount++;
+ } else {
+ throw new ServiceCreationException("No service of type {$class} found. Make sure the type hint in $method is written correctly and service of this type is registered.");
+ }
+ } else {
+ if ($container instanceof ContainerBuilder) {
+ $res[$num] = '@' . $res[$num];
+ }
+ $optCount = 0;
+ }
+
+ } elseif ($parameter->isOptional()) {
+ // PDO::__construct has optional parameter without default value (and isArray() and allowsNull() returns FALSE)
+ $res[$num] = $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : NULL;
+ $optCount++;
+
+ } else {
+ throw new ServiceCreationException("Parameter $parameter has no type hint, so its value must be specified.");
+ }
+ }
+
+ // extra parameters
+ while (array_key_exists(++$num, $arguments)) {
+ $res[$num] = $arguments[$num];
+ unset($arguments[$num]);
+ $optCount = 0;
+ }
+ if ($arguments) {
+ throw new ServiceCreationException("Unable to pass specified arguments to $method.");
+ }
+
+ return $optCount ? array_slice($res, 0, -$optCount) : $res;
+ }
+
+}
diff --git a/libs/Nette/DI/IContainer.php b/libs/Nette/DI/IContainer.php
index 16b9a35..ddb39d7 100644
--- a/libs/Nette/DI/IContainer.php
+++ b/libs/Nette/DI/IContainer.php
@@ -1,54 +1,52 @@
-container = $container;
+ $this->namespace = $namespace . '.';
+ $this->parameters = & $container->parameters[$namespace];
+ }
+
+
+
+ /**
+ * @return object
+ */
+ public function __call($name, $args)
+ {
+ if (substr($name, 0, 6) === 'create') {
+ return call_user_func_array(array(
+ $this->container,
+ Container::getMethodName($this->namespace . substr($name, 6), FALSE)
+ ), $args);
+ }
+ throw new Nette\NotSupportedException;
+ }
+
+
+
+ /**
+ * @return object
+ */
+ public function &__get($name)
+ {
+ $service = $this->container->getService($this->namespace . $name);
+ return $service;
+ }
+
+
+
+ /**
+ * @return void
+ */
+ public function __set($name, $service)
+ {
+ throw new Nette\NotSupportedException;
+ }
+
+
+
+ /**
+ * @return bool
+ */
+ public function __isset($name)
+ {
+ return $this->container->hasService($this->namespace . $name);
+ }
+
+
+
+ /**
+ * @return void
+ */
+ public function __unset($name)
+ {
+ throw new Nette\NotSupportedException;
+ }
+
+}
diff --git a/libs/Nette/DI/ServiceBuilder.php b/libs/Nette/DI/ServiceBuilder.php
deleted file mode 100644
index cc807b1..0000000
--- a/libs/Nette/DI/ServiceBuilder.php
+++ /dev/null
@@ -1,52 +0,0 @@
-class = $class;
- }
-
-
-
- public function getClass()
- {
- return $this->class;
- }
-
-
-
- public function createService(Nette\DI\IContainer $container)
- {
- if (!class_exists($this->class)) {
- throw new Nette\InvalidStateException("Cannot instantiate service, class '$this->class' not found.");
- }
- return new $this->class;
- }
-
-}
diff --git a/libs/Nette/DI/ServiceDefinition.php b/libs/Nette/DI/ServiceDefinition.php
new file mode 100644
index 0000000..eede295
--- /dev/null
+++ b/libs/Nette/DI/ServiceDefinition.php
@@ -0,0 +1,134 @@
+class = $class;
+ if ($args) {
+ $this->setFactory($class, $args);
+ }
+ return $this;
+ }
+
+
+
+ public function setFactory($factory, array $args = array())
+ {
+ $this->factory = new Statement($factory, $args);
+ return $this;
+ }
+
+
+
+ public function setArguments(array $args = array())
+ {
+ if ($this->factory) {
+ $this->factory->arguments = $args;
+ } else {
+ $this->setClass($this->class, $args);
+ }
+ return $this;
+ }
+
+
+
+ public function addSetup($target, $args = NULL)
+ {
+ if (!is_array($args)) {
+ $args = func_get_args();
+ array_shift($args);
+ }
+ $this->setup[] = new Statement($target, $args);
+ return $this;
+ }
+
+
+
+ public function setParameters(array $params)
+ {
+ $this->shared = $this->autowired = FALSE;
+ $this->parameters = $params;
+ return $this;
+ }
+
+
+
+ public function addTag($tag, $attrs = TRUE)
+ {
+ $this->tags[$tag] = $attrs;
+ return $this;
+ }
+
+
+
+ public function setAutowired($on)
+ {
+ $this->autowired = $on;
+ return $this;
+ }
+
+
+
+ public function setShared($on)
+ {
+ $this->shared = (bool) $on;
+ $this->autowired = $this->shared ? $this->autowired : FALSE;
+ return $this;
+ }
+
+
+
+ public function setInternal($on)
+ {
+ $this->internal = (bool) $on;
+ return $this;
+ }
+
+}
diff --git a/libs/Nette/DI/Statement.php b/libs/Nette/DI/Statement.php
new file mode 100644
index 0000000..c114f9e
--- /dev/null
+++ b/libs/Nette/DI/Statement.php
@@ -0,0 +1,39 @@
+entity = $entity;
+ $this->arguments = $arguments;
+ }
+
+}
diff --git a/libs/Nette/DI/exceptions.php b/libs/Nette/DI/exceptions.php
index 9934e41..bc19f91 100644
--- a/libs/Nette/DI/exceptions.php
+++ b/libs/Nette/DI/exceptions.php
@@ -1,32 +1,32 @@
-setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
- $this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('Nette\Database\Statement', array($this)));
-
- $class = 'Nette\Database\Drivers\\' . $this->getAttribute(PDO::ATTR_DRIVER_NAME) . 'Driver';
- if (class_exists($class)) {
- $this->driver = new $class($this, (array) $options);
- }
-
- $this->preprocessor = new SqlPreprocessor($this);
-
- $this->databaseReflection = new Reflection\DatabaseReflection; // TODO
-
- Diagnostics\ConnectionPanel::initialize($this);
- }
-
-
-
- /** @return ISupplementalDriver */
- public function getSupplementalDriver()
- {
- return $this->driver;
- }
-
-
-
- /**
- * Generates and executes SQL query.
- * @param string statement
- * @param mixed [parameters, ...]
- * @return Statement
- */
- public function query($statement)
- {
- $args = func_get_args();
- return $this->queryArgs(array_shift($args), $args);
- }
-
-
-
- /**
- * Generates and executes SQL query.
- * @param string statement
- * @param mixed [parameters, ...]
- * @return int number of affected rows
- */
- public function exec($statement)
- {
- $args = func_get_args();
- return $this->queryArgs(array_shift($args), $args)->rowCount();
- }
-
-
-
- /**
- * @param string statement
- * @param array
- * @return Statement
- */
- public function queryArgs($statement, $params)
- {
- foreach ($params as $value) {
- if (is_array($value) || is_object($value)) {
- $need = TRUE; break;
- }
- }
- if (isset($need) || strpos($statement, ':') !== FALSE && $this->preprocessor !== NULL) {
- list($statement, $params) = $this->preprocessor->process($statement, $params);
- }
-
- return $this->prepare($statement)->execute($params);
- }
-
-
-
- /********************* shortcuts ****************d*g**/
-
-
-
- /**
- * Shortcut for query()->fetch()
- * @param string statement
- * @param mixed [parameters, ...]
- * @return Row
- */
- public function fetch($args)
- {
- $args = func_get_args();
- return $this->queryArgs(array_shift($args), $args)->fetch();
- }
-
-
-
- /**
- * Shortcut for query()->fetchColumn()
- * @param string statement
- * @param mixed [parameters, ...]
- * @return mixed
- */
- public function fetchColumn($args)
- {
- $args = func_get_args();
- return $this->queryArgs(array_shift($args), $args)->fetchColumn();
- }
-
-
-
- /**
- * Shortcut for query()->fetchPairs()
- * @param string statement
- * @param mixed [parameters, ...]
- * @return array
- */
- public function fetchPairs($args)
- {
- $args = func_get_args();
- return $this->queryArgs(array_shift($args), $args)->fetchPairs();
- }
-
-
-
- /**
- * Shortcut for query()->fetchAll()
- * @param string statement
- * @param mixed [parameters, ...]
- * @return array
- */
- public function fetchAll($args)
- {
- $args = func_get_args();
- return $this->queryArgs(array_shift($args), $args)->fetchAll();
- }
-
-
-
- /********************* selector ****************d*g**/
-
-
-
- /**
- * Creates selector for table.
- * @param string
- * @return Nette\Database\Table\Selection
- */
- public function table($table)
- {
- return new Table\Selection($table, $this);
- }
-
-
-
- /********************* misc ****************d*g**/
-
-
-
- /**
- * Import SQL dump from file - extreme fast.
- * @param string filename
- * @return int count of commands
- */
- public function loadFile($file)
- {
- @set_time_limit(0); // intentionally @
-
- $handle = @fopen($file, 'r'); // intentionally @
- if (!$handle) {
- throw new Nette\FileNotFoundException("Cannot open file '$file'.");
- }
-
- $count = 0;
- $sql = '';
- while (!feof($handle)) {
- $s = fgets($handle);
- $sql .= $s;
- if (substr(rtrim($s), -1) === ';') {
- parent::exec($sql); // native query without logging
- $sql = '';
- $count++;
- }
- }
- fclose($handle);
- return $count;
- }
-
-
-
- /**
- * Returns syntax highlighted SQL command.
- * @param string
- * @return string
- */
- public static function highlightSql($sql)
- {
- static $keywords1 = 'SELECT|UPDATE|INSERT(?:\s+INTO)?|REPLACE(?:\s+INTO)?|DELETE|FROM|WHERE|HAVING|GROUP\s+BY|ORDER\s+BY|LIMIT|OFFSET|SET|VALUES|LEFT\s+JOIN|INNER\s+JOIN|TRUNCATE';
- static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|TRUE|FALSE';
-
- // insert new lines
- $sql = " $sql ";
- $sql = preg_replace("#(?<=[\\s,(])($keywords1)(?=[\\s,)])#i", "\n\$1", $sql);
-
- // reduce spaces
- $sql = preg_replace('#[ \t]{2,}#', " ", $sql);
-
- $sql = wordwrap($sql, 100);
- $sql = preg_replace("#([ \t]*\r?\n){2,}#", "\n", $sql);
-
- // syntax highlight
- $sql = htmlSpecialChars($sql);
- $sql = preg_replace_callback("#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is", function($matches) {
- if (!empty($matches[1])) // comment
- return '' . $matches[1] . '';
-
- if (!empty($matches[2])) // error
- return '' . $matches[2] . '';
-
- if (!empty($matches[3])) // most important keywords
- return '' . $matches[3] . '';
-
- if (!empty($matches[4])) // other keywords
- return '' . $matches[4] . '';
- }, $sql);
-
- return '' . trim($sql) . "\n"; - } - - - - /********************* Nette\Object behaviour ****************d*g**/ - - - - /** - * @return Nette\Reflection\ClassType - */ - public static function getReflection() - { - return new Nette\Reflection\ClassType(get_called_class()); - } - - - - public function __call($name, $args) - { - return ObjectMixin::call($this, $name, $args); - } - - - - public function &__get($name) - { - return ObjectMixin::get($this, $name); - } - - - - public function __set($name, $value) - { - return ObjectMixin::set($this, $name, $value); - } - - - - public function __isset($name) - { - return ObjectMixin::has($this, $name); - } - - - - public function __unset($name) - { - ObjectMixin::remove($this, $name); - } - -} +dsn = $dsn, $username, $password, $options); + $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + $this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('Nette\Database\Statement', array($this))); + + $driverClass = $driverClass ?: 'Nette\Database\Drivers\\' . ucfirst(str_replace('sql', 'Sql', $this->getAttribute(PDO::ATTR_DRIVER_NAME))) . 'Driver'; + $this->driver = new $driverClass($this, (array) $options); + $this->preprocessor = new SqlPreprocessor($this); + } + + + + public function getDsn() + { + return $this->dsn; + } + + + + /** @return ISupplementalDriver */ + public function getSupplementalDriver() + { + return $this->driver; + } + + + + /** + * Sets database reflection. + * @return Connection provides a fluent interface + */ + public function setDatabaseReflection(IReflection $databaseReflection) + { + $databaseReflection->setConnection($this); + $this->databaseReflection = $databaseReflection; + return $this; + } + + + + /** @return IReflection */ + public function getDatabaseReflection() + { + if (!$this->databaseReflection) { + $this->setDatabaseReflection(new Reflection\ConventionalReflection); + } + return $this->databaseReflection; + } + + + + /** + * Sets cache storage engine. + * @return Connection provides a fluent interface + */ + public function setCacheStorage(Nette\Caching\IStorage $storage = NULL) + { + $this->cache = $storage ? new Nette\Caching\Cache($storage, 'Nette.Database.' . md5($this->dsn)) : NULL; + return $this; + } + + + + public function getCache() + { + return $this->cache; + } + + + + /** + * Generates and executes SQL query. + * @param string statement + * @param mixed [parameters, ...] + * @return Statement + */ + public function query($statement) + { + $args = func_get_args(); + return $this->queryArgs(array_shift($args), $args); + } + + + + /** + * Generates and executes SQL query. + * @param string statement + * @param mixed [parameters, ...] + * @return int number of affected rows + */ + public function exec($statement) + { + $args = func_get_args(); + return $this->queryArgs(array_shift($args), $args)->rowCount(); + } + + + + /** + * @param string statement + * @param array + * @return Statement + */ + public function queryArgs($statement, $params) + { + foreach ($params as $value) { + if (is_array($value) || is_object($value)) { + $need = TRUE; break; + } + } + if (isset($need) && $this->preprocessor !== NULL) { + list($statement, $params) = $this->preprocessor->process($statement, $params); + } + + return $this->prepare($statement)->execute($params); + } + + + + /********************* shortcuts ****************d*g**/ + + + + /** + * Shortcut for query()->fetch() + * @param string statement + * @param mixed [parameters, ...] + * @return Row + */ + public function fetch($args) + { + $args = func_get_args(); + return $this->queryArgs(array_shift($args), $args)->fetch(); + } + + + + /** + * Shortcut for query()->fetchColumn() + * @param string statement + * @param mixed [parameters, ...] + * @return mixed + */ + public function fetchColumn($args) + { + $args = func_get_args(); + return $this->queryArgs(array_shift($args), $args)->fetchColumn(); + } + + + + /** + * Shortcut for query()->fetchPairs() + * @param string statement + * @param mixed [parameters, ...] + * @return array + */ + public function fetchPairs($args) + { + $args = func_get_args(); + return $this->queryArgs(array_shift($args), $args)->fetchPairs(); + } + + + + /** + * Shortcut for query()->fetchAll() + * @param string statement + * @param mixed [parameters, ...] + * @return array + */ + public function fetchAll($args) + { + $args = func_get_args(); + return $this->queryArgs(array_shift($args), $args)->fetchAll(); + } + + + + /********************* selector ****************d*g**/ + + + + /** + * Creates selector for table. + * @param string + * @return Nette\Database\Table\Selection + */ + public function table($table) + { + return new Table\Selection($table, $this); + } + + + + /********************* Nette\Object behaviour ****************d*g**/ + + + + /** + * @return Nette\Reflection\ClassType + */ + public /**/static/**/ function getReflection() + { + return new Nette\Reflection\ClassType(/*5.2*$this*//**/get_called_class()/**/); + } + + + + public function __call($name, $args) + { + return ObjectMixin::call($this, $name, $args); + } + + + + public function &__get($name) + { + return ObjectMixin::get($this, $name); + } + + + + public function __set($name, $value) + { + return ObjectMixin::set($this, $name, $value); + } + + + + public function __isset($name) + { + return ObjectMixin::has($this, $name); + } + + + + public function __unset($name) + { + ObjectMixin::remove($this, $name); + } + +} diff --git a/libs/Nette/Database/Diagnostics/ConnectionPanel.php b/libs/Nette/Database/Diagnostics/ConnectionPanel.php index 6979b5b..316741e 100644 --- a/libs/Nette/Database/Diagnostics/ConnectionPanel.php +++ b/libs/Nette/Database/Diagnostics/ConnectionPanel.php @@ -1,162 +1,159 @@ -onQuery[] = callback($panel, 'logQuery'); - Debugger::$bar->addPanel($panel); - Debugger::$blueScreen->addPanel(callback($panel, 'renderException'), __CLASS__); - } - } - - - - public function logQuery(Nette\Database\Statement $result, array $params = NULL) - { - if ($this->disabled) { - return; - } - $source = NULL; - foreach (debug_backtrace(FALSE) as $row) { - if (isset($row['file']) && is_file($row['file']) && strpos($row['file'], NETTE_DIR . DIRECTORY_SEPARATOR) !== 0) { - $source = array($row['file'], (int) $row['line']); - break; - } - } - $this->totalTime += $result->time; - $this->queries[] = array($result->queryString, $params, $result->time, $result->rowCount(), $result->getConnection(), $source); - } - - - - public function renderException($e) - { - if ($e instanceof \PDOException && isset($e->queryString)) { - return array( - 'tab' => 'SQL', - 'panel' => Connection::highlightSql($e->queryString), - ); - } - } - - - - public function getTab() - { - return '' - . '
'
- . count($this->queries) . ' queries'
- . ($this->totalTime ? ' / ' . sprintf('%0.1f', $this->totalTime * 1000) . 'ms' : '')
- . '';
- }
-
-
-
- public function getPanel()
- {
- $this->disabled = TRUE;
- $s = '';
- $h = 'htmlSpecialChars';
- foreach ($this->queries as $i => $query) {
- list($sql, $params, $time, $rows, $connection, $source) = $query;
-
- $explain = NULL; // EXPLAIN is called here to work SELECT FOUND_ROWS()
- if ($this->explain && preg_match('#\s*SELECT\s#iA', $sql)) {
- try {
- $explain = $connection->queryArgs('EXPLAIN ' . $sql, $params)->fetchAll();
- } catch (\PDOException $e) {}
- }
-
- $s .= 'explain ►"; - } - - $s .= '
| {$h($col)} | "; - } - $s .= "
|---|
| {$h($col)} | "; - } - $s .= "
Queries: ' . count($this->queries) . ($this->totalTime ? ', time: ' . sprintf('%0.3f', $this->totalTime * 1000) . ' ms' : '') . '
-
-
-
-
';
- }
-
-}
+disabled) {
+ return;
+ }
+ $source = NULL;
+ foreach (/*5.2*PHP_VERSION_ID < 50205 ? debug_backtrace() : */debug_backtrace(FALSE) as $row) {
+ if (isset($row['file']) && is_file($row['file']) && strpos($row['file'], NETTE_DIR . DIRECTORY_SEPARATOR) !== 0) {
+ if (isset($row['function']) && strpos($row['function'], 'call_user_func') === 0) continue;
+ if (isset($row['class']) && is_subclass_of($row['class'], '\\Nette\\Database\\Connection')) continue;
+ $source = array($row['file'], (int) $row['line']);
+ break;
+ }
+ }
+ $this->totalTime += $result->getTime();
+ $this->queries[] = array($result->queryString, $params, $result->getTime(), $result->rowCount(), $result->getConnection(), $source);
+ }
+
+
+
+ public static function renderException($e)
+ {
+ if (!$e instanceof \PDOException) {
+ return;
+ }
+ if (isset($e->queryString)) {
+ $sql = $e->queryString;
+
+ } elseif ($item = Nette\Diagnostics\Helpers::findTrace($e->getTrace(), 'PDO::prepare')) {
+ $sql = $item['args'][0];
+ }
+ return isset($sql) ? array(
+ 'tab' => 'SQL',
+ 'panel' => Helpers::dumpSql($sql),
+ ) : NULL;
+ }
+
+
+
+ public function getTab()
+ {
+ return ''
+ . '| Time ms | SQL Statement | Params | Rows |
|---|
'
+ . count($this->queries) . ' queries'
+ . ($this->totalTime ? ' / ' . sprintf('%0.1f', $this->totalTime * 1000) . 'ms' : '')
+ . '';
+ }
+
+
+
+ public function getPanel()
+ {
+ $this->disabled = TRUE;
+ $s = '';
+ $h = 'htmlSpecialChars';
+ foreach ($this->queries as $i => $query) {
+ list($sql, $params, $time, $rows, $connection, $source) = $query;
+
+ $explain = NULL; // EXPLAIN is called here to work SELECT FOUND_ROWS()
+ if ($this->explain && preg_match('#\s*\(?\s*SELECT\s#iA', $sql)) {
+ try {
+ $cmd = is_string($this->explain) ? $this->explain : 'EXPLAIN';
+ $explain = $connection->queryArgs("$cmd $sql", $params)->fetchAll();
+ } catch (\PDOException $e) {}
+ }
+
+ $s .= 'explain ►"; + } + + $s .= '
| {$h($col)} | "; + } + $s .= "
|---|
| {$h($col)} | "; + } + $s .= "
Queries: ' . count($this->queries) . ($this->totalTime ? ', time: ' . sprintf('%0.3f', $this->totalTime * 1000) . ' ms' : '') . '
+
+
+
+
';
+ }
+
+}
diff --git a/libs/Nette/Database/Drivers/MsSqlDriver.php b/libs/Nette/Database/Drivers/MsSqlDriver.php
index 03967e3..fad898d 100644
--- a/libs/Nette/Database/Drivers/MsSqlDriver.php
+++ b/libs/Nette/Database/Drivers/MsSqlDriver.php
@@ -1,101 +1,162 @@
- TRUE);
-
- /** @var Nette\Database\Connection */
- private $connection;
-
-
-
- public function __construct(Nette\Database\Connection $connection, array $options)
- {
- $this->connection = $connection;
- }
-
-
-
- /********************* SQL ****************d*g**/
-
-
-
- /**
- * Delimites identifier for use in a SQL statement.
- */
- public function delimite($name)
- {
- // @see http://msdn.microsoft.com/en-us/library/ms176027.aspx
- return '[' . str_replace(array('[', ']'), array('[[', ']]'), $name) . ']';
- }
-
-
-
- /**
- * Formats date-time for use in a SQL statement.
- */
- public function formatDateTime(\DateTime $value)
- {
- return $value->format("'Y-m-d H:i:s'");
- }
-
-
-
- /**
- * Encodes string for use in a LIKE statement.
- */
- public function formatLike($value, $pos)
- {
- $value = strtr($value, array("'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]'));
- return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
- }
-
-
-
- /**
- * Injects LIMIT/OFFSET to the SQL query.
- */
- public function applyLimit(&$sql, $limit, $offset)
- {
- // offset support is missing
- if ($limit >= 0) {
- $sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t';
- }
-
- if ($offset) {
- throw new Nette\NotImplementedException('Offset is not implemented.');
- }
- }
-
-
-
- /**
- * Normalizes result row.
- */
- public function normalizeRow($row, $statement)
- {
- return $row;
- }
-
-}
+connection = $connection;
+ }
+
+
+
+ /********************* SQL ****************d*g**/
+
+
+
+ /**
+ * Delimites identifier for use in a SQL statement.
+ */
+ public function delimite($name)
+ {
+ // @see http://msdn.microsoft.com/en-us/library/ms176027.aspx
+ return '[' . str_replace(array('[', ']'), array('[[', ']]'), $name) . ']';
+ }
+
+
+
+ /**
+ * Formats boolean for use in a SQL statement.
+ */
+ public function formatBool($value)
+ {
+ return $value ? '1' : '0';
+ }
+
+
+
+ /**
+ * Formats date-time for use in a SQL statement.
+ */
+ public function formatDateTime(\DateTime $value)
+ {
+ return $value->format("'Y-m-d H:i:s'");
+ }
+
+
+
+ /**
+ * Encodes string for use in a LIKE statement.
+ */
+ public function formatLike($value, $pos)
+ {
+ $value = strtr($value, array("'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]'));
+ return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+ }
+
+
+
+ /**
+ * Injects LIMIT/OFFSET to the SQL query.
+ */
+ public function applyLimit(&$sql, $limit, $offset)
+ {
+ // offset support is missing
+ if ($limit >= 0) {
+ $sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t';
+ }
+
+ if ($offset) {
+ throw new Nette\NotImplementedException('Offset is not implemented.');
+ }
+ }
+
+
+
+ /**
+ * Normalizes result row.
+ */
+ public function normalizeRow($row, $statement)
+ {
+ return $row;
+ }
+
+
+
+ /********************* reflection ****************d*g**/
+
+
+
+ /**
+ * Returns list of tables.
+ */
+ public function getTables()
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * Returns metadata for all columns in a table.
+ */
+ public function getColumns($table)
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * Returns metadata for all indexes in a table.
+ */
+ public function getIndexes($table)
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * Returns metadata for all foreign keys in a table.
+ */
+ public function getForeignKeys($table)
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * @return bool
+ */
+ public function isSupported($item)
+ {
+ return $item === self::SUPPORT_COLUMNS_META;
+ }
+
+}
diff --git a/libs/Nette/Database/Drivers/MySqlDriver.php b/libs/Nette/Database/Drivers/MySqlDriver.php
index 0170546..5441d59 100644
--- a/libs/Nette/Database/Drivers/MySqlDriver.php
+++ b/libs/Nette/Database/Drivers/MySqlDriver.php
@@ -1,111 +1,233 @@
- TRUE);
-
- /** @var Nette\Database\Connection */
- private $connection;
-
-
-
- /**
- * Driver options:
- * - charset => character encoding to set (default is utf8)
- * - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
- */
- public function __construct(Nette\Database\Connection $connection, array $options)
- {
- $this->connection = $connection;
- $charset = isset($options['charset']) ? $options['charset'] : 'utf8';
- if ($charset) {
- $connection->exec("SET NAMES '$charset'");
- }
- if (isset($options['sqlmode'])) {
- $connection->exec("SET sql_mode='$options[sqlmode]'");
- }
- $connection->exec("SET time_zone='" . date('P') . "'");
- }
-
-
-
- /********************* SQL ****************d*g**/
-
-
-
- /**
- * Delimites identifier for use in a SQL statement.
- */
- public function delimite($name)
- {
- // @see http://dev.mysql.com/doc/refman/5.0/en/identifiers.html
- return '`' . str_replace('`', '``', $name) . '`';
- }
-
-
-
- /**
- * Formats date-time for use in a SQL statement.
- */
- public function formatDateTime(\DateTime $value)
- {
- return $value->format("'Y-m-d H:i:s'");
- }
-
-
-
- /**
- * Encodes string for use in a LIKE statement.
- */
- public function formatLike($value, $pos)
- {
- $value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
- return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
- }
-
-
-
- /**
- * Injects LIMIT/OFFSET to the SQL query.
- */
- public function applyLimit(&$sql, $limit, $offset)
- {
- if ($limit >= 0 || $offset > 0) {
- // see http://dev.mysql.com/doc/refman/5.0/en/select.html
- $sql .= ' LIMIT ' . ($limit < 0 ? '18446744073709551615' : (int) $limit)
- . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
- }
- }
-
-
-
- /**
- * Normalizes result row.
- */
- public function normalizeRow($row, $statement)
- {
- return $row;
- }
-
-}
+ character encoding to set (default is utf8)
+ * - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
+ */
+ public function __construct(Nette\Database\Connection $connection, array $options)
+ {
+ $this->connection = $connection;
+ $charset = isset($options['charset']) ? $options['charset'] : 'utf8';
+ if ($charset) {
+ $connection->exec("SET NAMES '$charset'");
+ }
+ if (isset($options['sqlmode'])) {
+ $connection->exec("SET sql_mode='$options[sqlmode]'");
+ }
+ $connection->exec("SET time_zone='" . date('P') . "'");
+ }
+
+
+
+ /********************* SQL ****************d*g**/
+
+
+
+ /**
+ * Delimites identifier for use in a SQL statement.
+ */
+ public function delimite($name)
+ {
+ // @see http://dev.mysql.com/doc/refman/5.0/en/identifiers.html
+ return '`' . str_replace('`', '``', $name) . '`';
+ }
+
+
+
+ /**
+ * Formats boolean for use in a SQL statement.
+ */
+ public function formatBool($value)
+ {
+ return $value ? '1' : '0';
+ }
+
+
+
+ /**
+ * Formats date-time for use in a SQL statement.
+ */
+ public function formatDateTime(\DateTime $value)
+ {
+ return $value->format("'Y-m-d H:i:s'");
+ }
+
+
+
+ /**
+ * Encodes string for use in a LIKE statement.
+ */
+ public function formatLike($value, $pos)
+ {
+ $value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
+ return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+ }
+
+
+
+ /**
+ * Injects LIMIT/OFFSET to the SQL query.
+ */
+ public function applyLimit(&$sql, $limit, $offset)
+ {
+ if ($limit >= 0 || $offset > 0) {
+ // see http://dev.mysql.com/doc/refman/5.0/en/select.html
+ $sql .= ' LIMIT ' . ($limit < 0 ? '18446744073709551615' : (int) $limit)
+ . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
+ }
+ }
+
+
+
+ /**
+ * Normalizes result row.
+ */
+ public function normalizeRow($row, $statement)
+ {
+ return $row;
+ }
+
+
+
+ /********************* reflection ****************d*g**/
+
+
+
+ /**
+ * Returns list of tables.
+ */
+ public function getTables()
+ {
+ /*$this->connection->query("
+ SELECT TABLE_NAME as name, TABLE_TYPE = 'VIEW' as view
+ FROM INFORMATION_SCHEMA.TABLES
+ WHERE TABLE_SCHEMA = DATABASE()
+ ");*/
+ $tables = array();
+ foreach ($this->connection->query('SHOW FULL TABLES') as $row) {
+ $tables[] = array(
+ 'name' => $row[0],
+ 'view' => isset($row[1]) && $row[1] === 'VIEW',
+ );
+ }
+ return $tables;
+ }
+
+
+
+ /**
+ * Returns metadata for all columns in a table.
+ */
+ public function getColumns($table)
+ {
+ /*$this->connection->query("
+ SELECT *
+ FROM INFORMATION_SCHEMA.COLUMNS
+ WHERE TABLE_NAME = {$this->connection->quote($table)} AND TABLE_SCHEMA = DATABASE()
+ ");*/
+ $columns = array();
+ foreach ($this->connection->query('SHOW FULL COLUMNS FROM ' . $this->delimite($table)) as $row) {
+ $type = explode('(', $row['Type']);
+ $columns[] = array(
+ 'name' => $row['Field'],
+ 'table' => $table,
+ 'nativetype' => strtoupper($type[0]),
+ 'size' => isset($type[1]) ? (int) $type[1] : NULL,
+ 'unsigned' => (bool) strstr($row['Type'], 'unsigned'),
+ 'nullable' => $row['Null'] === 'YES',
+ 'default' => $row['Default'],
+ 'autoincrement' => $row['Extra'] === 'auto_increment',
+ 'primary' => $row['Key'] === 'PRI',
+ 'vendor' => (array) $row,
+ );
+ }
+ return $columns;
+ }
+
+
+
+ /**
+ * Returns metadata for all indexes in a table.
+ */
+ public function getIndexes($table)
+ {
+ /*$this->connection->query("
+ SELECT *
+ FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
+ WHERE TABLE_NAME = {$this->connection->quote($table)} AND TABLE_SCHEMA = DATABASE()
+ AND REFERENCED_COLUMN_NAME IS NULL
+ ");*/
+ $indexes = array();
+ foreach ($this->connection->query('SHOW INDEX FROM ' . $this->delimite($table)) as $row) {
+ $indexes[$row['Key_name']]['name'] = $row['Key_name'];
+ $indexes[$row['Key_name']]['unique'] = !$row['Non_unique'];
+ $indexes[$row['Key_name']]['primary'] = $row['Key_name'] === 'PRIMARY';
+ $indexes[$row['Key_name']]['columns'][$row['Seq_in_index'] - 1] = $row['Column_name'];
+ }
+ return array_values($indexes);
+ }
+
+
+
+ /**
+ * Returns metadata for all foreign keys in a table.
+ */
+ public function getForeignKeys($table)
+ {
+ $keys = array();
+ $query = 'SELECT CONSTRAINT_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME FROM information_schema.KEY_COLUMN_USAGE '
+ . 'WHERE TABLE_SCHEMA = DATABASE() AND REFERENCED_TABLE_NAME IS NOT NULL AND TABLE_NAME = ' . $this->connection->quote($table);
+
+ foreach ($this->connection->query($query) as $id => $row) {
+ $keys[$id]['name'] = $row['CONSTRAINT_NAME']; // foreign key name
+ $keys[$id]['local'] = $row['COLUMN_NAME']; // local columns
+ $keys[$id]['table'] = $row['REFERENCED_TABLE_NAME']; // referenced table
+ $keys[$id]['foreign'] = $row['REFERENCED_COLUMN_NAME']; // referenced columns
+ }
+
+ return array_values($keys);
+ }
+
+
+
+ /**
+ * @return bool
+ */
+ public function isSupported($item)
+ {
+ return $item === self::SUPPORT_COLUMNS_META || $item == self::SUPPORT_SELECT_UNGROUPED_COLUMNS;
+ }
+
+}
diff --git a/libs/Nette/Database/Drivers/OciDriver.php b/libs/Nette/Database/Drivers/OciDriver.php
index 57ddcdb..81db616 100644
--- a/libs/Nette/Database/Drivers/OciDriver.php
+++ b/libs/Nette/Database/Drivers/OciDriver.php
@@ -1,105 +1,175 @@
- TRUE);
-
- /** @var Nette\Database\Connection */
- private $connection;
-
- /** @var string Datetime format */
- private $fmtDateTime;
-
-
-
- public function __construct(Nette\Database\Connection $connection, array $options)
- {
- $this->connection = $connection;
- $this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';
- }
-
-
-
- /********************* SQL ****************d*g**/
-
-
-
- /**
- * Delimites identifier for use in a SQL statement.
- */
- public function delimite($name)
- {
- // @see http://download.oracle.com/docs/cd/B10500_01/server.920/a96540/sql_elements9a.htm
- return '"' . str_replace('"', '""', $name) . '"';
- }
-
-
-
- /**
- * Formats date-time for use in a SQL statement.
- */
- public function formatDateTime(\DateTime $value)
- {
- return $value->format($this->fmtDateTime);
- }
-
-
-
- /**
- * Encodes string for use in a LIKE statement.
- */
- public function formatLike($value, $pos)
- {
- throw new Nette\NotImplementedException;
- }
-
-
-
- /**
- * Injects LIMIT/OFFSET to the SQL query.
- */
- public function applyLimit(&$sql, $limit, $offset)
- {
- if ($offset > 0) {
- // see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
- $sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
- . ($limit >= 0 ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '')
- . ') WHERE "__rnum" > '. (int) $offset;
-
- } elseif ($limit >= 0) {
- $sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . (int) $limit;
- }
- }
-
-
-
- /**
- * Normalizes result row.
- */
- public function normalizeRow($row, $statement)
- {
- return $row;
- }
-
-}
+connection = $connection;
+ $this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';
+ }
+
+
+
+ /********************* SQL ****************d*g**/
+
+
+
+ /**
+ * Delimites identifier for use in a SQL statement.
+ */
+ public function delimite($name)
+ {
+ // @see http://download.oracle.com/docs/cd/B10500_01/server.920/a96540/sql_elements9a.htm
+ return '"' . str_replace('"', '""', $name) . '"';
+ }
+
+
+
+ /**
+ * Formats boolean for use in a SQL statement.
+ */
+ public function formatBool($value)
+ {
+ return $value ? '1' : '0';
+ }
+
+
+
+ /**
+ * Formats date-time for use in a SQL statement.
+ */
+ public function formatDateTime(\DateTime $value)
+ {
+ return $value->format($this->fmtDateTime);
+ }
+
+
+
+ /**
+ * Encodes string for use in a LIKE statement.
+ */
+ public function formatLike($value, $pos)
+ {
+ throw new Nette\NotImplementedException;
+ }
+
+
+
+ /**
+ * Injects LIMIT/OFFSET to the SQL query.
+ */
+ public function applyLimit(&$sql, $limit, $offset)
+ {
+ if ($offset > 0) {
+ // see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
+ $sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
+ . ($limit >= 0 ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '')
+ . ') WHERE "__rnum" > '. (int) $offset;
+
+ } elseif ($limit >= 0) {
+ $sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . (int) $limit;
+ }
+ }
+
+
+
+ /**
+ * Normalizes result row.
+ */
+ public function normalizeRow($row, $statement)
+ {
+ return $row;
+ }
+
+
+
+ /********************* reflection ****************d*g**/
+
+
+
+ /**
+ * Returns list of tables.
+ */
+ public function getTables()
+ {
+ $tables = array();
+ foreach ($this->connection->query('SELECT * FROM cat') as $row) {
+ if ($row[1] === 'TABLE' || $row[1] === 'VIEW') {
+ $tables[] = array(
+ 'name' => $row[0],
+ 'view' => $row[1] === 'VIEW',
+ );
+ }
+ }
+ return $tables;
+ }
+
+
+
+ /**
+ * Returns metadata for all columns in a table.
+ */
+ public function getColumns($table)
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * Returns metadata for all indexes in a table.
+ */
+ public function getIndexes($table)
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * Returns metadata for all foreign keys in a table.
+ */
+ public function getForeignKeys($table)
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * @return bool
+ */
+ public function isSupported($item)
+ {
+ return $item === self::SUPPORT_COLUMNS_META || $item === self::SUPPORT_SEQUENCE;
+ }
+
+}
diff --git a/libs/Nette/Database/Drivers/OdbcDriver.php b/libs/Nette/Database/Drivers/OdbcDriver.php
index 64676e6..743c759 100644
--- a/libs/Nette/Database/Drivers/OdbcDriver.php
+++ b/libs/Nette/Database/Drivers/OdbcDriver.php
@@ -1,100 +1,161 @@
- TRUE);
-
- /** @var Nette\Database\Connection */
- private $connection;
-
-
-
- public function __construct(Nette\Database\Connection $connection, array $options)
- {
- $this->connection = $connection;
- }
-
-
-
- /********************* SQL ****************d*g**/
-
-
-
- /**
- * Delimites identifier for use in a SQL statement.
- */
- public function delimite($name)
- {
- return '[' . str_replace(array('[', ']'), array('[[', ']]'), $name) . ']';
- }
-
-
-
- /**
- * Formats date-time for use in a SQL statement.
- */
- public function formatDateTime(\DateTime $value)
- {
- return $value->format("#m/d/Y H:i:s#");
- }
-
-
-
- /**
- * Encodes string for use in a LIKE statement.
- */
- public function formatLike($value, $pos)
- {
- $value = strtr($value, array("'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]'));
- return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
- }
-
-
-
- /**
- * Injects LIMIT/OFFSET to the SQL query.
- */
- public function applyLimit(&$sql, $limit, $offset)
- {
- // offset support is missing
- if ($limit >= 0) {
- $sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ')';
- }
-
- if ($offset) {
- throw new Nette\InvalidArgumentException('Offset is not implemented in driver odbc.');
- }
- }
-
-
-
- /**
- * Normalizes result row.
- */
- public function normalizeRow($row, $statement)
- {
- return $row;
- }
-
-}
+connection = $connection;
+ }
+
+
+
+ /********************* SQL ****************d*g**/
+
+
+
+ /**
+ * Delimites identifier for use in a SQL statement.
+ */
+ public function delimite($name)
+ {
+ return '[' . str_replace(array('[', ']'), array('[[', ']]'), $name) . ']';
+ }
+
+
+
+ /**
+ * Formats boolean for use in a SQL statement.
+ */
+ public function formatBool($value)
+ {
+ return $value ? '1' : '0';
+ }
+
+
+
+ /**
+ * Formats date-time for use in a SQL statement.
+ */
+ public function formatDateTime(\DateTime $value)
+ {
+ return $value->format("#m/d/Y H:i:s#");
+ }
+
+
+
+ /**
+ * Encodes string for use in a LIKE statement.
+ */
+ public function formatLike($value, $pos)
+ {
+ $value = strtr($value, array("'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]'));
+ return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+ }
+
+
+
+ /**
+ * Injects LIMIT/OFFSET to the SQL query.
+ */
+ public function applyLimit(&$sql, $limit, $offset)
+ {
+ // offset support is missing
+ if ($limit >= 0) {
+ $sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ')';
+ }
+
+ if ($offset) {
+ throw new Nette\InvalidArgumentException('Offset is not implemented in driver odbc.');
+ }
+ }
+
+
+
+ /**
+ * Normalizes result row.
+ */
+ public function normalizeRow($row, $statement)
+ {
+ return $row;
+ }
+
+
+
+ /********************* reflection ****************d*g**/
+
+
+
+ /**
+ * Returns list of tables.
+ */
+ public function getTables()
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * Returns metadata for all columns in a table.
+ */
+ public function getColumns($table)
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * Returns metadata for all indexes in a table.
+ */
+ public function getIndexes($table)
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * Returns metadata for all foreign keys in a table.
+ */
+ public function getForeignKeys($table)
+ {
+ throw new NotImplementedException;
+ }
+
+
+
+ /**
+ * @return bool
+ */
+ public function isSupported($item)
+ {
+ return $item === self::SUPPORT_COLUMNS_META;
+ }
+
+}
diff --git a/libs/Nette/Database/Drivers/PgSqlDriver.php b/libs/Nette/Database/Drivers/PgSqlDriver.php
index 207aa71..d7efd91 100644
--- a/libs/Nette/Database/Drivers/PgSqlDriver.php
+++ b/libs/Nette/Database/Drivers/PgSqlDriver.php
@@ -1,97 +1,254 @@
- TRUE);
-
- /** @var Nette\Database\Connection */
- private $connection;
-
-
-
- public function __construct(Nette\Database\Connection $connection, array $options)
- {
- $this->connection = $connection;
- }
-
-
-
- /********************* SQL ****************d*g**/
-
-
-
- /**
- * Delimites identifier for use in a SQL statement.
- */
- public function delimite($name)
- {
- // @see http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
- return '"' . str_replace('"', '""', $name) . '"';
- }
-
-
-
- /**
- * Formats date-time for use in a SQL statement.
- */
- public function formatDateTime(\DateTime $value)
- {
- return $value->format("'Y-m-d H:i:s'");
- }
-
-
-
- /**
- * Encodes string for use in a LIKE statement.
- */
- public function formatLike($value, $pos)
- {
- throw new Nette\NotImplementedException;
- }
-
-
-
- /**
- * Injects LIMIT/OFFSET to the SQL query.
- */
- public function applyLimit(&$sql, $limit, $offset)
- {
- if ($limit >= 0)
- $sql .= ' LIMIT ' . (int) $limit;
-
- if ($offset > 0)
- $sql .= ' OFFSET ' . (int) $offset;
- }
-
-
-
- /**
- * Normalizes result row.
- */
- public function normalizeRow($row, $statement)
- {
- return $row;
- }
-
-}
+connection = $connection;
+ }
+
+
+
+ /********************* SQL ****************d*g**/
+
+
+
+ /**
+ * Delimites identifier for use in a SQL statement.
+ */
+ public function delimite($name)
+ {
+ // @see http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
+ return '"' . str_replace('"', '""', $name) . '"';
+ }
+
+
+
+ /**
+ * Formats boolean for use in a SQL statement.
+ */
+ public function formatBool($value)
+ {
+ return $value ? 'TRUE' : 'FALSE';
+ }
+
+
+
+ /**
+ * Formats date-time for use in a SQL statement.
+ */
+ public function formatDateTime(\DateTime $value)
+ {
+ return $value->format("'Y-m-d H:i:s'");
+ }
+
+
+
+ /**
+ * Encodes string for use in a LIKE statement.
+ */
+ public function formatLike($value, $pos)
+ {
+ $value = strtr($value, array("'" => "''", '\\' => '\\\\', '%' => '\\\\%', '_' => '\\\\_'));
+ return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+ }
+
+
+
+ /**
+ * Injects LIMIT/OFFSET to the SQL query.
+ */
+ public function applyLimit(&$sql, $limit, $offset)
+ {
+ if ($limit >= 0)
+ $sql .= ' LIMIT ' . (int) $limit;
+
+ if ($offset > 0)
+ $sql .= ' OFFSET ' . (int) $offset;
+ }
+
+
+
+ /**
+ * Normalizes result row.
+ */
+ public function normalizeRow($row, $statement)
+ {
+ return $row;
+ }
+
+
+
+ /********************* reflection ****************d*g**/
+
+
+
+ /**
+ * Returns list of tables.
+ */
+ public function getTables()
+ {
+ $tables = array();
+ foreach ($this->connection->query("
+ SELECT
+ table_name AS name,
+ table_type = 'VIEW' AS view
+ FROM
+ information_schema.tables
+ WHERE
+ table_schema = current_schema()
+ ") as $row) {
+ $tables[] = (array) $row;
+ }
+
+ return $tables;
+ }
+
+
+
+ /**
+ * Returns metadata for all columns in a table.
+ */
+ public function getColumns($table)
+ {
+ $columns = array();
+ foreach ($this->connection->query("
+ SELECT
+ c.column_name AS name,
+ c.table_name AS table,
+ upper(c.udt_name) AS nativetype,
+ greatest(c.character_maximum_length, c.numeric_precision) AS size,
+ FALSE AS unsigned,
+ c.is_nullable = 'YES' AS nullable,
+ c.column_default AS default,
+ coalesce(tc.constraint_type = 'PRIMARY KEY', FALSE) AND strpos(c.column_default, 'nextval') = 1 AS autoincrement,
+ coalesce(tc.constraint_type = 'PRIMARY KEY', FALSE) AS primary,
+ substring(c.column_default from 'nextval[(]''\"?([^''\"]+)') AS sequence
+ FROM
+ information_schema.columns AS c
+ LEFT JOIN information_schema.constraint_column_usage AS ccu USING(table_catalog, table_schema, table_name, column_name)
+ LEFT JOIN information_schema.table_constraints AS tc USING(constraint_catalog, constraint_schema, constraint_name)
+ WHERE
+ c.table_name = {$this->connection->quote($table)}
+ AND
+ c.table_schema = current_schema()
+ AND
+ (tc.constraint_type IS NULL OR tc.constraint_type = 'PRIMARY KEY')
+ ORDER BY
+ c.ordinal_position
+ ") as $row) {
+ $column = (array) $row;
+ $column['vendor'] = $column;
+ unset($column['sequence']);
+
+ $columns[] = $column;
+ }
+
+ return $columns;
+ }
+
+
+
+ /**
+ * Returns metadata for all indexes in a table.
+ */
+ public function getIndexes($table)
+ {
+ /* There is no information about all indexes in information_schema, so pg catalog must be used */
+ $indexes = array();
+ foreach ($this->connection->query("
+ SELECT
+ c2.relname AS name,
+ indisunique AS unique,
+ indisprimary AS primary,
+ attname AS column
+ FROM
+ pg_class AS c1
+ JOIN pg_namespace ON c1.relnamespace = pg_namespace.oid
+ JOIN pg_index ON c1.oid = indrelid
+ JOIN pg_class AS c2 ON indexrelid = c2.oid
+ LEFT JOIN pg_attribute ON c1.oid = attrelid AND attnum = ANY(indkey)
+ WHERE
+ nspname = current_schema()
+ AND
+ c1.relkind = 'r'
+ AND
+ c1.relname = {$this->connection->quote($table)}
+ ") as $row) {
+ $indexes[$row['name']]['name'] = $row['name'];
+ $indexes[$row['name']]['unique'] = $row['unique'];
+ $indexes[$row['name']]['primary'] = $row['primary'];
+ $indexes[$row['name']]['columns'][] = $row['column'];
+ }
+
+ return array_values($indexes);
+ }
+
+
+
+ /**
+ * Returns metadata for all foreign keys in a table.
+ */
+ public function getForeignKeys($table)
+ {
+ /* Not for multi-column foreign keys */
+ $keys = array();
+ foreach ($this->connection->query("
+ SELECT
+ tc.constraint_name AS name,
+ kcu.column_name AS local,
+ ccu.table_name AS table,
+ ccu.column_name AS foreign
+ FROM
+ information_schema.table_constraints AS tc
+ JOIN information_schema.key_column_usage AS kcu USING(constraint_catalog, constraint_schema, constraint_name)
+ JOIN information_schema.constraint_column_usage AS ccu USING(constraint_catalog, constraint_schema, constraint_name)
+ WHERE
+ constraint_type = 'FOREIGN KEY'
+ AND
+ tc.table_name = {$this->connection->quote($table)}
+ ORDER BY
+ kcu.ordinal_position
+ ") as $row) {
+ $keys[] = (array) $row;
+ }
+
+ return $keys;
+ }
+
+
+
+ /**
+ * @return bool
+ */
+ public function isSupported($item)
+ {
+ return $item === self::SUPPORT_COLUMNS_META || $item === self::SUPPORT_SEQUENCE;
+ }
+
+}
diff --git a/libs/Nette/Database/Drivers/Sqlite2Driver.php b/libs/Nette/Database/Drivers/Sqlite2Driver.php
index 021bcd8..2db3d72 100644
--- a/libs/Nette/Database/Drivers/Sqlite2Driver.php
+++ b/libs/Nette/Database/Drivers/Sqlite2Driver.php
@@ -1,58 +1,68 @@
- $value) {
- unset($row[$key]);
- if ($key[0] === '[' || $key[0] === '"') {
- $key = substr($key, 1, -1);
- }
- $row[$key] = $value;
- }
- return $row;
- }
-
-}
+ $value) {
+ unset($row[$key]);
+ if ($key[0] === '[' || $key[0] === '"') {
+ $key = substr($key, 1, -1);
+ }
+ $row[$key] = $value;
+ }
+ return $row;
+ }
+
+
+
+ /**
+ * Returns metadata for all foreign keys in a table.
+ */
+ public function getForeignKeys($table)
+ {
+ throw new NotSupportedException; // @see http://www.sqlite.org/foreignkeys.html
+ }
+
+}
diff --git a/libs/Nette/Database/Drivers/SqliteDriver.php b/libs/Nette/Database/Drivers/SqliteDriver.php
index fc80762..1ee5d47 100644
--- a/libs/Nette/Database/Drivers/SqliteDriver.php
+++ b/libs/Nette/Database/Drivers/SqliteDriver.php
@@ -1,99 +1,242 @@
- FALSE);
-
- /** @var Nette\Database\Connection */
- private $connection;
-
- /** @var string Datetime format */
- private $fmtDateTime;
-
-
-
- public function __construct(Nette\Database\Connection $connection, array $options)
- {
- $this->connection = $connection;
- $this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';
- }
-
-
-
- /********************* SQL ****************d*g**/
-
-
-
- /**
- * Delimites identifier for use in a SQL statement.
- */
- public function delimite($name)
- {
- return '[' . strtr($name, '[]', ' ') . ']';
- }
-
-
-
- /**
- * Formats date-time for use in a SQL statement.
- */
- public function formatDateTime(\DateTime $value)
- {
- return $value->format($this->fmtDateTime);
- }
-
-
-
- /**
- * Encodes string for use in a LIKE statement.
- */
- public function formatLike($value, $pos)
- {
- $value = addcslashes(substr($this->connection->quote($value), 1, -1), '%_\\');
- return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'") . " ESCAPE '\\'";
- }
-
-
-
- /**
- * Injects LIMIT/OFFSET to the SQL query.
- */
- public function applyLimit(&$sql, $limit, $offset)
- {
- if ($limit >= 0 || $offset > 0) {
- $sql .= ' LIMIT ' . $limit . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
- }
- }
-
-
-
- /**
- * Normalizes result row.
- */
- public function normalizeRow($row, $statement)
- {
- return $row;
- }
-
-}
+connection = $connection;
+ $this->fmtDateTime = isset($options['formatDateTime']) ? $options['formatDateTime'] : 'U';
+ //$connection->exec('PRAGMA foreign_keys = ON');
+ }
+
+
+
+ /********************* SQL ****************d*g**/
+
+
+
+ /**
+ * Delimites identifier for use in a SQL statement.
+ */
+ public function delimite($name)
+ {
+ return '[' . strtr($name, '[]', ' ') . ']';
+ }
+
+
+
+ /**
+ * Formats boolean for use in a SQL statement.
+ */
+ public function formatBool($value)
+ {
+ return $value ? '1' : '0';
+ }
+
+
+
+ /**
+ * Formats date-time for use in a SQL statement.
+ */
+ public function formatDateTime(\DateTime $value)
+ {
+ return $value->format($this->fmtDateTime);
+ }
+
+
+
+ /**
+ * Encodes string for use in a LIKE statement.
+ */
+ public function formatLike($value, $pos)
+ {
+ $value = addcslashes(substr($this->connection->quote($value), 1, -1), '%_\\');
+ return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'") . " ESCAPE '\\'";
+ }
+
+
+
+ /**
+ * Injects LIMIT/OFFSET to the SQL query.
+ */
+ public function applyLimit(&$sql, $limit, $offset)
+ {
+ if ($limit >= 0 || $offset > 0) {
+ $sql .= ' LIMIT ' . $limit . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
+ }
+ }
+
+
+
+ /**
+ * Normalizes result row.
+ */
+ public function normalizeRow($row, $statement)
+ {
+ return $row;
+ }
+
+
+
+ /********************* reflection ****************d*g**/
+
+
+
+ /**
+ * Returns list of tables.
+ */
+ public function getTables()
+ {
+ return $this->connection->query("
+ SELECT name, type = 'view' as view FROM sqlite_master WHERE type IN ('table', 'view')
+ UNION ALL
+ SELECT name, type = 'view' as view FROM sqlite_temp_master WHERE type IN ('table', 'view')
+ ORDER BY name
+ ")->fetchAll();
+ }
+
+
+
+ /**
+ * Returns metadata for all columns in a table.
+ */
+ public function getColumns($table)
+ {
+ $meta = $this->connection->query("
+ SELECT sql FROM sqlite_master WHERE type = 'table' AND name = {$this->connection->quote($table)}
+ UNION ALL
+ SELECT sql FROM sqlite_temp_master WHERE type = 'table' AND name = {$this->connection->quote($table)}
+ ")->fetch();
+
+ $columns = array();
+ foreach ($this->connection->query("PRAGMA table_info({$this->delimite($table)})") as $row) {
+ $column = $row['name'];
+ $pattern = "/(\"$column\"|\[$column\]|$column)\s+[^,]+\s+PRIMARY\s+KEY\s+AUTOINCREMENT/Ui";
+ $type = explode('(', $row['type']);
+ $columns[] = array(
+ 'name' => $column,
+ 'table' => $table,
+ 'fullname' => "$table.$column",
+ 'nativetype' => strtoupper($type[0]),
+ 'size' => isset($type[1]) ? (int) $type[1] : NULL,
+ 'nullable' => $row['notnull'] == '0',
+ 'default' => $row['dflt_value'],
+ 'autoincrement' => (bool) preg_match($pattern, $meta['sql']),
+ 'primary' => $row['pk'] == '1',
+ 'vendor' => (array) $row,
+ );
+ }
+ return $columns;
+ }
+
+
+
+ /**
+ * Returns metadata for all indexes in a table.
+ */
+ public function getIndexes($table)
+ {
+ $indexes = array();
+ foreach ($this->connection->query("PRAGMA index_list({$this->delimite($table)})") as $row) {
+ $indexes[$row['name']]['name'] = $row['name'];
+ $indexes[$row['name']]['unique'] = (bool) $row['unique'];
+ }
+
+ foreach ($indexes as $index => $values) {
+ $res = $this->connection->query("PRAGMA index_info({$this->delimite($index)})");
+ while ($row = $res->fetch(TRUE)) {
+ $indexes[$index]['columns'][$row['seqno']] = $row['name'];
+ }
+ }
+
+ $columns = $this->getColumns($table);
+ foreach ($indexes as $index => $values) {
+ $column = $indexes[$index]['columns'][0];
+ $primary = FALSE;
+ foreach ($columns as $info) {
+ if ($column == $info['name']) {
+ $primary = $info['primary'];
+ break;
+ }
+ }
+ $indexes[$index]['primary'] = (bool) $primary;
+ }
+ if (!$indexes) { // @see http://www.sqlite.org/lang_createtable.html#rowid
+ foreach ($columns as $column) {
+ if ($column['vendor']['pk']) {
+ $indexes[] = array(
+ 'name' => 'ROWID',
+ 'unique' => TRUE,
+ 'primary' => TRUE,
+ 'columns' => array($column['name']),
+ );
+ break;
+ }
+ }
+ }
+
+ return array_values($indexes);
+ }
+
+
+
+ /**
+ * Returns metadata for all foreign keys in a table.
+ */
+ public function getForeignKeys($table)
+ {
+ $keys = array();
+ foreach ($this->connection->query("PRAGMA foreign_key_list({$this->delimite($table)})") as $row) {
+ $keys[$row['id']]['name'] = $row['id']; // foreign key name
+ $keys[$row['id']]['local'][$row['seq']] = $row['from']; // local columns
+ $keys[$row['id']]['table'] = $row['table']; // referenced table
+ $keys[$row['id']]['foreign'][$row['seq']] = $row['to']; // referenced columns
+ $keys[$row['id']]['onDelete'] = $row['on_delete'];
+ $keys[$row['id']]['onUpdate'] = $row['on_update'];
+
+ if ($keys[$row['id']]['foreign'][0] == NULL) {
+ $keys[$row['id']]['foreign'] = NULL;
+ }
+ }
+ return array_values($keys);
+ }
+
+
+
+ /**
+ * @return bool
+ */
+ public function isSupported($item)
+ {
+ return FALSE;
+ }
+
+}
diff --git a/libs/Nette/Database/Helpers.php b/libs/Nette/Database/Helpers.php
new file mode 100644
index 0000000..646447e
--- /dev/null
+++ b/libs/Nette/Database/Helpers.php
@@ -0,0 +1,173 @@
+ IReflection::FIELD_TEXT, // PostgreSQL arrays
+ 'BYTEA|BLOB|BIN' => IReflection::FIELD_BINARY,
+ 'TEXT|CHAR' => IReflection::FIELD_TEXT,
+ 'YEAR|BYTE|COUNTER|SERIAL|INT|LONG' => IReflection::FIELD_INTEGER,
+ 'CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER' => IReflection::FIELD_FLOAT,
+ '^TIME$' => IReflection::FIELD_TIME,
+ 'TIME' => IReflection::FIELD_DATETIME, // DATETIME, TIMESTAMP
+ 'DATE' => IReflection::FIELD_DATE,
+ 'BOOL|BIT' => IReflection::FIELD_BOOL,
+ );
+
+
+
+ /**
+ * Displays complete result set as HTML table for debug purposes.
+ * @return void
+ */
+ public static function dumpResult(Statement $statement)
+ {
+ echo "\n| Time ms | SQL Statement | Params | Rows |
|---|
| Affected rows: | \n\t\t", $statement->rowCount(), " | \n\t
|---|
' . trim($sql) . "\n"; + } + + + + /** + * Heuristic type detection. + * @param string + * @return string + * @internal + */ + public static function detectType($type) + { + static $cache; + if (!isset($cache[$type])) { + $cache[$type] = 'string'; + foreach (self::$typePatterns as $s => $val) { + if (preg_match("#$s#i", $type)) { + return $cache[$type] = $val; + } + } + } + return $cache[$type]; + } + + + + /** + * Import SQL dump from file - extreme fast. + * @return int count of commands + */ + public static function loadFromFile(Connection $connection, $file) + { + @set_time_limit(0); // intentionally @ + + $handle = @fopen($file, 'r'); // intentionally @ + if (!$handle) { + throw new Nette\FileNotFoundException("Cannot open file '$file'."); + } + + $count = 0; + $sql = ''; + while (!feof($handle)) { + $s = fgets($handle); + $sql .= $s; + if (substr(rtrim($s), -1) === ';') { + $connection->exec($sql); // native query without logging + $sql = ''; + $count++; + } + } + if (trim($sql) !== '') { + $connection->exec($sql); + $count++; + } + fclose($handle); + return $count; + } + +} diff --git a/libs/Nette/Database/IReflection.php b/libs/Nette/Database/IReflection.php new file mode 100644 index 0000000..454a1cd --- /dev/null +++ b/libs/Nette/Database/IReflection.php @@ -0,0 +1,68 @@ +, %2$s for table name + * @param string %1$s stands for key used after ->, %2$s for table name + */ + public function __construct($primary = 'id', $foreign = '%s_id', $table = '%s') + { + $this->primary = $primary; + $this->foreign = $foreign; + $this->table = $table; + } + + + + public function getPrimary($table) + { + return sprintf($this->primary, $this->getColumnFromTable($table)); + } + + + + public function getHasManyReference($table, $key) + { + $table = $this->getColumnFromTable($table); + return array( + sprintf($this->table, $key, $table), + sprintf($this->foreign, $table, $key), + ); + } + + + + public function getBelongsToReference($table, $key) + { + $table = $this->getColumnFromTable($table); + return array( + sprintf($this->table, $key, $table), + sprintf($this->foreign, $key, $table), + ); + } + + + + public function setConnection(Nette\Database\Connection $connection) + {} + + + + protected function getColumnFromTable($name) + { + if ($this->table !== '%s' && preg_match('(^' . str_replace('%s', '(.*)', preg_quote($this->table)) . '$)', $name, $match)) { + return $match[1]; + } + + return $name; + } + +} diff --git a/libs/Nette/Database/Reflection/DatabaseReflection.php b/libs/Nette/Database/Reflection/DatabaseReflection.php deleted file mode 100644 index dd6bef5..0000000 --- a/libs/Nette/Database/Reflection/DatabaseReflection.php +++ /dev/null @@ -1,117 +0,0 @@ -, %2$s for table name - * @param string %1$s stands for key used after ->, %2$s for table name - */ - public function __construct($primary = 'id', $foreign = '%s_id', $table = '%s') - { - $this->primary = $primary; - $this->foreign = $foreign; - $this->table = $table; - } - - - - public function getPrimary($table) - { - return sprintf($this->primary, $table); - } - - - - public function getReferencingColumn($name, $table) - { - return $this->getReferencedColumn($table, $name); - } - - - - public function getReferencedColumn($name, $table) - { - if ($this->table !== '%s' && preg_match('(^' . str_replace('%s', '(.*)', preg_quote($this->table)) . '$)', $name, $match)) { - $name = $match[1]; - } - return sprintf($this->foreign, $name, $table); - } - - - - public function getReferencedTable($name, $table) - { - return sprintf($this->table, $name, $table); - } - - - - /** - * Heuristic type detection. - * @param string - * @return string - * @internal - */ - public static function detectType($type) - { - static $types, $patterns = array( - 'BYTEA|BLOB|BIN' => self::FIELD_BINARY, - 'TEXT|CHAR' => self::FIELD_TEXT, - 'YEAR|BYTE|COUNTER|SERIAL|INT|LONG' => self::FIELD_INTEGER, - 'CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER' => self::FIELD_FLOAT, - 'TIME|DATE' => self::FIELD_DATETIME, - 'BOOL|BIT' => self::FIELD_BOOL, - ); - - if (!isset($types[$type])) { - $types[$type] = 'string'; - foreach ($patterns as $s => $val) { - if (preg_match("#$s#i", $type)) { - return $types[$type] = $val; - } - } - } - return $types[$type]; - } - -} diff --git a/libs/Nette/Database/Reflection/DiscoveredReflection.php b/libs/Nette/Database/Reflection/DiscoveredReflection.php new file mode 100644 index 0000000..0c70d6f --- /dev/null +++ b/libs/Nette/Database/Reflection/DiscoveredReflection.php @@ -0,0 +1,196 @@ +cacheStorage = $storage; + } + + + + public function setConnection(Nette\Database\Connection $connection) + { + $this->connection = $connection; + if ($this->cacheStorage) { + $this->cache = new Nette\Caching\Cache($this->cacheStorage, 'Nette.Database.' . md5($connection->getDsn())); + $this->structure = $this->cache->load('structure') ?: $this->structure; + } + } + + + + public function __destruct() + { + if ($this->cache) { + $this->cache->save('structure', $this->structure); + } + } + + + + public function getPrimary($table) + { + $primary = & $this->structure['primary'][strtolower($table)]; + if (isset($primary)) { + return empty($primary) ? NULL : $primary; + } + + $columns = $this->connection->getSupplementalDriver()->getColumns($table); + $primaryCount = 0; + foreach ($columns as $column) { + if ($column['primary']) { + $primary = $column['name']; + $primaryCount++; + } + } + + if ($primaryCount !== 1) { + $primary = ''; + return NULL; + } + + return $primary; + } + + + + public function getHasManyReference($table, $key, $refresh = TRUE) + { + $reference = & $this->structure['hasMany'][strtolower($table)]; + if (!empty($reference)) { + $candidates = $columnCandidates = array(); + foreach ($reference as $targetPair) { + list($targetColumn, $targetTable) = $targetPair; + if (stripos($targetTable, $key) === FALSE) + continue; + + $candidates[] = array($targetTable, $targetColumn); + if (stripos($targetColumn, $table) !== FALSE) { + $columnCandidates[] = $candidate = array($targetTable, $targetColumn); + if (strtolower($targetTable) === strtolower($key)) + return $candidate; + } + } + + if (count($columnCandidates) === 1) { + return reset($columnCandidates); + } elseif (count($candidates) === 1) { + return reset($candidates); + } + + foreach ($candidates as $candidate) { + list($targetTable, $targetColumn) = $candidate; + if (strtolower($targetTable) === strtolower($key)) + return $candidate; + } + + if (!$refresh && !empty($candidates)) { + throw new \PDOException('Ambiguous joining column in related call.'); + } + } + + if (!$refresh) { + throw new \PDOException("No reference found for \${$table}->related({$key})."); + } + + $this->reloadAllForeignKeys(); + return $this->getHasManyReference($table, $key, FALSE); + } + + + + public function getBelongsToReference($table, $key, $refresh = TRUE) + { + $reference = & $this->structure['belongsTo'][strtolower($table)]; + if (!empty($reference)) { + foreach ($reference as $column => $targetTable) { + if (stripos($column, $key) !== FALSE) { + return array( + $targetTable, + $column, + ); + } + } + } + + if (!$refresh) { + throw new \PDOException("No reference found for \${$table}->{$key}."); + } + + $this->reloadForeignKeys($table); + return $this->getBelongsToReference($table, $key, FALSE); + } + + + + protected function reloadAllForeignKeys() + { + foreach ($this->connection->getSupplementalDriver()->getTables() as $table) { + if ($table['view'] == FALSE) { + $this->reloadForeignKeys($table['name']); + } + } + + foreach (array_keys($this->structure['hasMany']) as $table) { + uksort($this->structure['hasMany'][$table], function($a, $b) { + return strlen($a) - strlen($b); + }); + } + } + + + + protected function reloadForeignKeys($table) + { + foreach ($this->connection->getSupplementalDriver()->getForeignKeys($table) as $row) { + $this->structure['belongsTo'][strtolower($table)][$row['local']] = $row['table']; + $this->structure['hasMany'][strtolower($row['table'])][$row['local'] . $table] = array($row['local'], $table); + } + + if (isset($this->structure['belongsTo'][$table])) { + uksort($this->structure['belongsTo'][$table], function($a, $b) { + return strlen($a) - strlen($b); + }); + } + } + +} diff --git a/libs/Nette/Database/Row.php b/libs/Nette/Database/Row.php index c61366c..d72482d 100644 --- a/libs/Nette/Database/Row.php +++ b/libs/Nette/Database/Row.php @@ -1,47 +1,58 @@ -normalizeRow($this); - } - - - - /** - * Returns a item. - * @param mixed key or index - * @return mixed - */ - public function offsetGet($key) - { - if (is_int($key)) { - $arr = array_values((array) $this); - return $arr[$key]; - } - return $this->$key; - } - -} +normalizeRow($this); + } + + + + /** + * Returns a item. + * @param mixed key or index + * @return mixed + */ + public function offsetGet($key) + { + if (is_int($key)) { + $arr = array_values((array) $this); + return $arr[$key]; + } + return $this->$key; + } + + + + public function offsetExists($key) + { + if (is_int($key)) { + $arr = array_values((array) $this); + return isset($arr[$key]); + } + return parent::offsetExists($key); + } + +} diff --git a/libs/Nette/Database/SqlLiteral.php b/libs/Nette/Database/SqlLiteral.php index b5202c5..14144f7 100644 --- a/libs/Nette/Database/SqlLiteral.php +++ b/libs/Nette/Database/SqlLiteral.php @@ -1,34 +1,44 @@ -value = (string) $value; - } - -} +value = (string) $value; + } + + + + /** + * @return string + */ + public function __toString() + { + return $this->value; + } + +} diff --git a/libs/Nette/Database/SqlPreprocessor.php b/libs/Nette/Database/SqlPreprocessor.php index c65e647..3a21d0d 100644 --- a/libs/Nette/Database/SqlPreprocessor.php +++ b/libs/Nette/Database/SqlPreprocessor.php @@ -1,167 +1,162 @@ -connection = $connection; - $this->driver = $connection->getSupplementalDriver(); - } - - - - /** - * @param string - * @param array - * @return array of [sql, params] - */ - public function process($sql, $params) - { - $this->params = $params; - $this->counter = 0; - $this->remaining = array(); - - $cmd = strtoupper(substr(ltrim($sql), 0, 6)); // detect array mode - $this->arrayMode = $cmd === 'INSERT' || $cmd === 'REPLAC' ? 'values' : 'assoc'; - - /*~ - \'.*?\'|".*?"| ## string - :[a-zA-Z0-9_]+:| ## :substitution: - \? ## placeholder - ~xs*/ - $sql = Nette\Utils\Strings::replace($sql, '~\'.*?\'|".*?"|:[a-zA-Z0-9_]+:|\?~s', array($this, 'callback')); - - while ($this->counter < count($params)) { - $sql .= ' ' . $this->formatValue($params[$this->counter++]); - } - - return array($sql, $this->remaining); - } - - - - /** @internal */ - public function callback($m) - { - $m = $m[0]; - if ($m[0] === "'" || $m[0] === '"') { // string - return $m; - - } elseif ($m[0] === '?') { // placeholder - return $this->formatValue($this->params[$this->counter++]); - - } elseif ($m[0] === ':') { // substitution - $s = substr($m, 1, -1); - return isset($this->connection->substitutions[$s]) ? $this->connection->substitutions[$s] : $m; - } - } - - - - private function formatValue($value) - { - if (is_string($value)) { - if (strlen($value) > 20) { - $this->remaining[] = $value; - return '?'; - - } else { - return $this->connection->quote($value); - } - - } elseif (is_int($value)) { - return (string) $value; - - } elseif (is_float($value)) { - return rtrim(rtrim(number_format($value, 10, '.', ''), '0'), '.'); - - } elseif (is_bool($value)) { - $this->remaining[] = $value; - return '?'; - - } elseif ($value === NULL) { - return 'NULL'; - - } elseif (is_array($value) || $value instanceof \Traversable) { - $vx = $kx = array(); - - if (isset($value[0])) { // non-associative; value, value, value - foreach ($value as $v) { - $vx[] = $this->formatValue($v); - } - return implode(', ', $vx); - - } elseif ($this->arrayMode === 'values') { // (key, key, ...) VALUES (value, value, ...) - $this->arrayMode = 'multi'; - foreach ($value as $k => $v) { - $kx[] = $this->driver->delimite($k); - $vx[] = $this->formatValue($v); - } - return '(' . implode(', ', $kx) . ') VALUES (' . implode(', ', $vx) . ')'; - - } elseif ($this->arrayMode === 'assoc') { // key=value, key=value, ... - foreach ($value as $k => $v) { - $vx[] = $this->driver->delimite($k) . '=' . $this->formatValue($v); - } - return implode(', ', $vx); - - } elseif ($this->arrayMode === 'multi') { // multiple insert (value, value, ...), ... - foreach ($value as $k => $v) { - $vx[] = $this->formatValue($v); - } - return ', (' . implode(', ', $vx) . ')'; - } - - } elseif ($value instanceof \DateTime) { - return $this->driver->formatDateTime($value); - - } elseif ($value instanceof SqlLiteral) { - return $value->value; - - } else { - $this->remaining[] = $value; - return '?'; - } - } - -} +connection = $connection; + $this->driver = $connection->getSupplementalDriver(); + } + + + + /** + * @param string + * @param array + * @return array of [sql, params] + */ + public function process($sql, $params) + { + $this->params = $params; + $this->counter = 0; + $this->remaining = array(); + $this->arrayMode = 'assoc'; + + $sql = Nette\Utils\Strings::replace($sql, '~\'.*?\'|".*?"|\?|\b(?:INSERT|REPLACE|UPDATE)\b~si', array($this, 'callback')); + + while ($this->counter < count($params)) { + $sql .= ' ' . $this->formatValue($params[$this->counter++]); + } + + return array($sql, $this->remaining); + } + + + + /** @internal */ + public function callback($m) + { + $m = $m[0]; + if ($m[0] === "'" || $m[0] === '"') { // string + return $m; + + } elseif ($m === '?') { // placeholder + return $this->formatValue($this->params[$this->counter++]); + + } else { // INSERT, REPLACE, UPDATE + $this->arrayMode = strtoupper($m) === 'UPDATE' ? 'assoc' : 'values'; + return $m; + } + } + + + + private function formatValue($value) + { + if (is_string($value)) { + if (strlen($value) > 20) { + $this->remaining[] = $value; + return '?'; + + } else { + return $this->connection->quote($value); + } + + } elseif (is_int($value)) { + return (string) $value; + + } elseif (is_float($value)) { + return rtrim(rtrim(number_format($value, 10, '.', ''), '0'), '.'); + + } elseif (is_bool($value)) { + return $this->driver->formatBool($value); + + } elseif ($value === NULL) { + return 'NULL'; + + } elseif ($value instanceof Table\ActiveRow) { + return $value->getPrimary(); + + } elseif (is_array($value) || $value instanceof \Traversable) { + $vx = $kx = array(); + + if (isset($value[0])) { // non-associative; value, value, value + foreach ($value as $v) { + $vx[] = $this->formatValue($v); + } + return implode(', ', $vx); + + } elseif ($this->arrayMode === 'values') { // (key, key, ...) VALUES (value, value, ...) + $this->arrayMode = 'multi'; + foreach ($value as $k => $v) { + $kx[] = $this->driver->delimite($k); + $vx[] = $this->formatValue($v); + } + return '(' . implode(', ', $kx) . ') VALUES (' . implode(', ', $vx) . ')'; + + } elseif ($this->arrayMode === 'assoc') { // key=value, key=value, ... + foreach ($value as $k => $v) { + $vx[] = $this->driver->delimite($k) . '=' . $this->formatValue($v); + } + return implode(', ', $vx); + + } elseif ($this->arrayMode === 'multi') { // multiple insert (value, value, ...), ... + foreach ($value as $k => $v) { + $vx[] = $this->formatValue($v); + } + return '(' . implode(', ', $vx) . ')'; + } + + } elseif ($value instanceof \DateTime) { + return $this->driver->formatDateTime($value); + + } elseif ($value instanceof SqlLiteral) { + return $value->__toString(); + + } else { + $this->remaining[] = $value; + return '?'; + } + } + +} diff --git a/libs/Nette/Database/Statement.php b/libs/Nette/Database/Statement.php index 06ccbd2..68c36bf 100644 --- a/libs/Nette/Database/Statement.php +++ b/libs/Nette/Database/Statement.php @@ -1,225 +1,221 @@ -connection = $connection; - $this->setFetchMode(PDO::FETCH_CLASS, 'Nette\Database\Row', array($this)); - } - - - - /** - * @return Connection - */ - public function getConnection() - { - return $this->connection; - } - - - - /** - * Executes statement. - * @param array - * @return Statement provides a fluent interface - */ - public function execute($params = array()) - { - static $types = array('boolean' => PDO::PARAM_BOOL, 'integer' => PDO::PARAM_INT, - 'resource' => PDO::PARAM_LOB, 'NULL' => PDO::PARAM_NULL); - - foreach ($params as $key => $value) { - $type = gettype($value); - $this->bindValue(is_int($key) ? $key + 1 : $key, $value, isset($types[$type]) ? $types[$type] : PDO::PARAM_STR); - } - - $time = microtime(TRUE); - try { - parent::execute(); - } catch (\PDOException $e) { - $e->queryString = $this->queryString; - throw $e; - } - $this->time = microtime(TRUE) - $time; - $this->connection->__call('onQuery', array($this, $params)); // $this->connection->onQuery() in PHP 5.3 - - return $this; - } - - - - /** - * Fetches into an array where the 1st column is a key and all subsequent columns are values. - * @return array - */ - public function fetchPairs() - { - return $this->fetchAll(PDO::FETCH_KEY_PAIR); // since PHP 5.2.3 - } - - - - /** - * Normalizes result row. - * @param array - * @return array - */ - public function normalizeRow($row) - { - if ($this->types === NULL) { - $this->types = array(); - if ($this->connection->getSupplementalDriver()->supports['meta']) { // workaround for PHP bugs #53782, #54695 - foreach ($row as $key => $foo) { - $type = $this->getColumnMeta(count($this->types)); - if (isset($type['native_type'])) { - $this->types[$key] = Reflection\DatabaseReflection::detectType($type['native_type']); - } - } - } - } - - foreach ($this->types as $key => $type) { - $value = $row[$key]; - if ($value === NULL || $value === FALSE || $type === Reflection\DatabaseReflection::FIELD_TEXT) { - - } elseif ($type === Reflection\DatabaseReflection::FIELD_INTEGER) { - $row[$key] = is_float($tmp = $value * 1) ? $value : $tmp; - - } elseif ($type === Reflection\DatabaseReflection::FIELD_FLOAT) { - $row[$key] = (string) ($tmp = (float) $value) === $value ? $tmp : $value; - - } elseif ($type === Reflection\DatabaseReflection::FIELD_BOOL) { - $row[$key] = ((bool) $value) && $value !== 'f' && $value !== 'F'; - } - } - - return $this->connection->getSupplementalDriver()->normalizeRow($row, $this); - } - - - - /********************* misc tools ****************d*g**/ - - - - /** - * Displays complete result set as HTML table for debug purposes. - * @return void - */ - public function dump() - { - echo "\n
| Affected rows: | \n\t\t", $this->rowCount(), " | \n\t
|---|
Error: ' . $id . '
' . nl2br(htmlSpecialChars($e)) . '
',
+ );
+ while (ob_get_level() > $obLevel) { // restore ob-level if broken
+ ob_end_clean();
+ }
+ }
+ }
+ require __DIR__ . '/templates/bar.phtml';
+ }
+
+}
diff --git a/libs/Nette/Diagnostics/BlueScreen.php b/libs/Nette/Diagnostics/BlueScreen.php
index 06f1367..f9ce51e 100644
--- a/libs/Nette/Diagnostics/BlueScreen.php
+++ b/libs/Nette/Diagnostics/BlueScreen.php
@@ -1,122 +1,139 @@
-panels[] = $panel;
- } else {
- $this->panels[$id] = $panel;
- }
- }
-
-
-
- /**
- * Renders blue screen.
- * @param \Exception
- * @return void
- */
- public function render(\Exception $exception)
- {
- $panels = $this->panels;
- require __DIR__ . '/templates/bluescreen.phtml';
- }
-
-
-
- /**
- * Returns syntax highlighted source code.
- * @param string
- * @param int
- * @param int
- * @return string
- */
- public static function highlightFile($file, $line, $count = 15)
- {
- if (function_exists('ini_set')) {
- ini_set('highlight.comment', '#999; font-style: italic');
- ini_set('highlight.default', '#000');
- ini_set('highlight.html', '#06B');
- ini_set('highlight.keyword', '#D24; font-weight: bold');
- ini_set('highlight.string', '#080');
- }
-
- $start = max(1, $line - floor($count / 2));
-
- $source = @file_get_contents($file); // intentionally @
- if (!$source) {
- return;
- }
- $source = explode("\n", highlight_string($source, TRUE));
- $spans = 1;
- $out = $source[0]; //
- $source = explode('
', $source[1]);
- array_unshift($source, NULL);
-
- $i = $start; // find last highlighted block
- while (--$i >= 1) {
- if (preg_match('#.*(]*>)#', $source[$i], $m)) {
- if ($m[1] !== '') {
- $spans++; $out .= $m[1];
- }
- break;
- }
- }
-
- $source = array_slice($source, $start, $count, TRUE);
- end($source);
- $numWidth = strlen((string) key($source));
-
- foreach ($source as $n => $s) {
- $spans += substr_count($s, ']+>#', $s, $tags);
- if ($n === $line) {
- $out .= sprintf(
- "%{$numWidth}s: %s\n%s",
- $n,
- strip_tags($s),
- implode('', $tags[0])
- );
- } else {
- $out .= sprintf("%{$numWidth}s: %s\n", $n, $s);
- }
- }
- return $out . str_repeat('', $spans) . ' ';
- }
-
-}
+panels, TRUE)) {
+ $this->panels[] = $panel;
+ }
+ return $this;
+ }
+
+
+
+ /**
+ * Renders blue screen.
+ * @param \Exception
+ * @return void
+ */
+ public function render(\Exception $exception)
+ {
+ $panels = $this->panels;
+ require __DIR__ . '/templates/bluescreen.phtml';
+ }
+
+
+
+ /**
+ * Returns syntax highlighted source code.
+ * @param string
+ * @param int
+ * @param int
+ * @return string
+ */
+ public static function highlightFile($file, $line, $lines = 15, $vars = array())
+ {
+ $source = @file_get_contents($file); // intentionally @
+ if ($source) {
+ return static::highlightPhp($source, $line, $lines, $vars);
+ }
+ }
+
+
+
+ /**
+ * Returns syntax highlighted source code.
+ * @param string
+ * @param int
+ * @param int
+ * @return string
+ */
+ public static function highlightPhp($source, $line, $lines = 15, $vars = array())
+ {
+ if (function_exists('ini_set')) {
+ ini_set('highlight.comment', '#998; font-style: italic');
+ ini_set('highlight.default', '#000');
+ ini_set('highlight.html', '#06B');
+ ini_set('highlight.keyword', '#D24; font-weight: bold');
+ ini_set('highlight.string', '#080');
+ }
+
+ $source = str_replace(array("\r\n", "\r"), "\n", $source);
+ $source = explode("\n", highlight_string($source, TRUE));
+ $spans = 1;
+ $out = $source[0]; //
+ $source = explode('
', $source[1]);
+ array_unshift($source, NULL);
+
+ $start = $i = max(1, $line - floor($lines * 2/3));
+ while (--$i >= 1) { // find last highlighted block
+ if (preg_match('#.*(]*>)#', $source[$i], $m)) {
+ if ($m[1] !== '') {
+ $spans++; $out .= $m[1];
+ }
+ break;
+ }
+ }
+
+ $source = array_slice($source, $start, $lines, TRUE);
+ end($source);
+ $numWidth = strlen((string) key($source));
+
+ foreach ($source as $n => $s) {
+ $spans += substr_count($s, ']+>#', $s, $tags);
+ if ($n == $line) {
+ $out .= sprintf(
+ "%{$numWidth}s: %s\n%s",
+ $n,
+ strip_tags($s),
+ implode('', $tags[0])
+ );
+ } else {
+ $out .= sprintf("%{$numWidth}s: %s\n", $n, $s);
+ }
+ }
+ $out .= str_repeat('', $spans) . ' ';
+
+ $out = preg_replace_callback('#">\$(\w+)( )?#', function($m) use ($vars) {
+ return isset($vars[$m[1]])
+ ? '" title="' . str_replace('"', '"', strip_tags(Helpers::htmlDump($vars[$m[1]]))) . $m[0]
+ : $m[0];
+ }, $out);
+
+ return ""; + } + +} diff --git a/libs/Nette/Diagnostics/Debugger.php b/libs/Nette/Diagnostics/Debugger.php index dd0a4c2..d91c3a3 100644 --- a/libs/Nette/Diagnostics/Debugger.php +++ b/libs/Nette/Diagnostics/Debugger.php @@ -1,663 +1,698 @@ -directory; - self::$email = & self::$logger->email; - self::$mailer = & self::$logger->mailer; - self::$emailSnooze = & Logger::$emailSnooze; - - self::$fireLogger = new FireLogger; - - self::$blueScreen = new BlueScreen; - self::$blueScreen->addPanel(function($e) { - if ($e instanceof Nette\Templating\FilterException) { - return array( - 'tab' => 'Template', - 'panel' => '$out
File: ' . Helpers::editorLink($e->sourceFile, $e->sourceLine) - . ' Line: ' . ($e->sourceLine ? $e->sourceLine : 'n/a') . '
' - . ($e->sourceLine ? '' . BlueScreen::highlightFile($e->sourceFile, $e->sourceLine) . '' : '') - ); - } - }); - - self::$bar = new Bar; - self::$bar->addPanel(new DefaultBarPanel('time')); - self::$bar->addPanel(new DefaultBarPanel('memory')); - self::$bar->addPanel(self::$errorPanel = new DefaultBarPanel('errors')); // filled by _errorHandler() - self::$bar->addPanel(self::$dumpPanel = new DefaultBarPanel('dumps')); // filled by barDump() - } - - - - /********************* errors and exceptions reporting ****************d*g**/ - - - - /** - * Enables displaying or logging errors and exceptions. - * @param mixed production, development mode, autodetection or IP address(es) whitelist. - * @param string error log directory; enables logging in production mode, FALSE means that logging is disabled - * @param string administrator email; enables email sending in production mode - * @return void - */ - public static function enable($mode = NULL, $logDirectory = NULL, $email = NULL) - { - error_reporting(E_ALL | E_STRICT); - - // production/development mode detection - if (is_bool($mode)) { - self::$productionMode = $mode; - - } elseif (is_string($mode)) { // IP addresses - $mode = preg_split('#[,\s]+#', "$mode 127.0.0.1 ::1"); - } - - if (is_array($mode)) { // IP addresses whitelist detection - self::$productionMode = !isset($_SERVER['REMOTE_ADDR']) || !in_array($_SERVER['REMOTE_ADDR'], $mode, TRUE); - } - - if (self::$productionMode === self::DETECT) { - if (class_exists('Nette\Environment')) { - self::$productionMode = Nette\Environment::isProduction(); - - } elseif (isset($_SERVER['SERVER_ADDR']) || isset($_SERVER['LOCAL_ADDR'])) { // IP address based detection - $addrs = array(); - if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { // proxy server detected - $addrs = preg_split('#,\s*#', $_SERVER['HTTP_X_FORWARDED_FOR']); - } - if (isset($_SERVER['REMOTE_ADDR'])) { - $addrs[] = $_SERVER['REMOTE_ADDR']; - } - $addrs[] = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : $_SERVER['LOCAL_ADDR']; - self::$productionMode = FALSE; - foreach ($addrs as $addr) { - $oct = explode('.', $addr); - if ($addr !== '::1' && (count($oct) !== 4 || ($oct[0] !== '10' && $oct[0] !== '127' && ($oct[0] !== '172' || $oct[1] < 16 || $oct[1] > 31) - && ($oct[0] !== '169' || $oct[1] !== '254') && ($oct[0] !== '192' || $oct[1] !== '168'))) - ) { - self::$productionMode = TRUE; - break; - } - } - - } else { - self::$productionMode = !self::$consoleMode; - } - } - - // logging configuration - if (is_string($logDirectory)) { - self::$logDirectory = realpath($logDirectory); - if (self::$logDirectory === FALSE) { - throw new Nette\DirectoryNotFoundException("Directory '$logDirectory' is not found."); - } - } elseif ($logDirectory === FALSE) { - self::$logDirectory = FALSE; - - } else { - self::$logDirectory = defined('APP_DIR') ? APP_DIR . '/../log' : getcwd() . '/log'; - } - if (self::$logDirectory) { - ini_set('error_log', self::$logDirectory . '/php_error.log'); - } - - // php configuration - if (function_exists('ini_set')) { - ini_set('display_errors', !self::$productionMode); // or 'stderr' - ini_set('html_errors', FALSE); - ini_set('log_errors', FALSE); - - } elseif (ini_get('display_errors') != !self::$productionMode && ini_get('display_errors') !== (self::$productionMode ? 'stderr' : 'stdout')) { // intentionally == - throw new Nette\NotSupportedException('Function ini_set() must be enabled.'); - } - - if ($email) { - if (!is_string($email)) { - throw new Nette\InvalidArgumentException('Email address must be a string.'); - } - self::$email = $email; - } - - if (!defined('E_DEPRECATED')) { - define('E_DEPRECATED', 8192); - } - - if (!defined('E_USER_DEPRECATED')) { - define('E_USER_DEPRECATED', 16384); - } - - if (!self::$enabled) { - register_shutdown_function(array(__CLASS__, '_shutdownHandler')); - set_exception_handler(array(__CLASS__, '_exceptionHandler')); - set_error_handler(array(__CLASS__, '_errorHandler')); - self::$enabled = TRUE; - } - } - - - - /** - * Is Debug enabled? - * @return bool - */ - public static function isEnabled() - { - return self::$enabled; - } - - - - /** - * Logs message or exception to file (if not disabled) and sends email notification (if enabled). - * @param string|Exception - * @param int one of constant Debugger::INFO, WARNING, ERROR (sends email), CRITICAL (sends email) - * @return void - */ - public static function log($message, $priority = self::INFO) - { - if (self::$logDirectory === FALSE) { - return; - - } elseif (!self::$logDirectory) { - throw new Nette\InvalidStateException('Logging directory is not specified in Nette\Diagnostics\Debugger::$logDirectory.'); - } - - if ($message instanceof \Exception) { - $exception = $message; - $message = "PHP Fatal error: " - . ($message instanceof Nette\FatalErrorException - ? $exception->getMessage() - : "Uncaught exception " . get_class($exception) . " with message '" . $exception->getMessage() . "'") - . " in " . $exception->getFile() . ":" . $exception->getLine(); - - $hash = md5($exception ); - $exceptionFilename = "exception " . @date('Y-m-d H-i-s') . " $hash.html"; - foreach (new \DirectoryIterator(self::$logDirectory) as $entry) { - if (strpos($entry, $hash)) { - $exceptionFilename = NULL; break; - } - } - } - - self::$logger->log(array( - @date('[Y-m-d H-i-s]'), - $message, - self::$source ? ' @ ' . self::$source : NULL, - !empty($exceptionFilename) ? ' @@ ' . $exceptionFilename : NULL - ), $priority); - - if (!empty($exceptionFilename) && $logHandle = @fopen(self::$logDirectory . '/'. $exceptionFilename, 'w')) { - ob_start(); // double buffer prevents sending HTTP headers in some PHP - ob_start(function($buffer) use ($logHandle) { fwrite($logHandle, $buffer); }, 1); - self::$blueScreen->render($exception); - ob_end_flush(); - ob_end_clean(); - fclose($logHandle); - } - } - - - - /** - * Shutdown handler to catch fatal errors and execute of the planned activities. - * @return void - * @internal - */ - public static function _shutdownHandler() - { - // fatal error handler - static $types = array( - E_ERROR => 1, - E_CORE_ERROR => 1, - E_COMPILE_ERROR => 1, - E_PARSE => 1, - ); - $error = error_get_last(); - if (isset($types[$error['type']])) { - self::_exceptionHandler(new Nette\FatalErrorException($error['message'], 0, $error['type'], $error['file'], $error['line'], NULL), TRUE); - } - - // debug bar (require HTML & development mode) - if (self::$bar && !self::$productionMode && !self::$ajaxDetected && !self::$consoleMode - && !preg_match('#^Content-Type: (?!text/html)#im', implode("\n", headers_list())) - ) { - self::$bar->render(); - } - } - - - - /** - * Handler to catch uncaught exception. - * @param \Exception - * @return void - * @internal - */ - public static function _exceptionHandler(\Exception $exception, $drawBar = FALSE) - { - if (!headers_sent()) { // for PHP < 5.2.4 - header('HTTP/1.1 500 Internal Server Error'); - } - - $htmlMode = !self::$ajaxDetected && !preg_match('#^Content-Type: (?!text/html)#im', implode("\n", headers_list())); - - try { - if (self::$productionMode) { - self::log($exception, self::ERROR); - - if (self::$consoleMode) { - echo "ERROR: the server encountered an internal error and was unable to complete your request.\n"; - - } elseif ($htmlMode) { - require __DIR__ . '/templates/error.phtml'; - } - - } else { - if (self::$consoleMode) { // dump to console - echo "$exception\n"; - - } elseif ($htmlMode) { // dump to browser - self::$blueScreen->render($exception); - if ($drawBar && self::$bar) { - self::$bar->render(); - } - - } elseif (!self::fireLog($exception, self::ERROR)) { // AJAX or non-HTML mode - self::log($exception); - } - } - - foreach (self::$onFatalError as $handler) { - call_user_func($handler, $exception); - } - } catch (\Exception $e) { - echo "\nNette\\Debug FATAL ERROR: thrown ", get_class($e), ': ', $e->getMessage(), - "\nwhile processing ", get_class($exception), ': ', $exception->getMessage(), "\n"; - } - exit(255); - } - - - - /** - * Handler to catch warnings and notices. - * @param int level of the error raised - * @param string error message - * @param string file that the error was raised in - * @param int line number the error was raised at - * @param array an array of variables that existed in the scope the error was triggered in - * @return bool FALSE to call normal error handler, NULL otherwise - * @throws Nette\FatalErrorException - * @internal - */ - public static function _errorHandler($severity, $message, $file, $line, $context) - { - if (self::$scream) { - error_reporting(E_ALL | E_STRICT); - } - - if (self::$lastError !== FALSE && ($severity & error_reporting()) === $severity) { // tryError mode - self::$lastError = new \ErrorException($message, 0, $severity, $file, $line); - return NULL; - } - - if ($severity === E_RECOVERABLE_ERROR || $severity === E_USER_ERROR) { - throw new Nette\FatalErrorException($message, 0, $severity, $file, $line, $context); - - } elseif (($severity & error_reporting()) !== $severity) { - return FALSE; // calls normal error handler to fill-in error_get_last() - - } elseif (self::$strictMode && !self::$productionMode) { - self::_exceptionHandler(new Nette\FatalErrorException($message, 0, $severity, $file, $line, $context)); - } - - static $types = array( - E_WARNING => 'Warning', - E_COMPILE_WARNING => 'Warning', // currently unable to handle - E_USER_WARNING => 'Warning', - E_NOTICE => 'Notice', - E_USER_NOTICE => 'Notice', - E_STRICT => 'Strict standards', - E_DEPRECATED => 'Deprecated', - E_USER_DEPRECATED => 'Deprecated', - ); - - $message = 'PHP ' . (isset($types[$severity]) ? $types[$severity] : 'Unknown error') . ": $message"; - $count = & self::$errorPanel->data["$message|$file|$line"]; - - if ($count++) { // repeated error - return NULL; - - } elseif (self::$productionMode) { - self::log("$message in $file:$line", self::ERROR); - return NULL; - - } else { - $ok = self::fireLog(new \ErrorException($message, 0, $severity, $file, $line), self::WARNING); - return self::$consoleMode || (!self::$bar && !$ok) ? FALSE : NULL; - } - - return FALSE; // call normal error handler - } - - - - /** - * Handles exception thrown in __toString(). - * @param \Exception - * @return void - */ - public static function toStringException(\Exception $exception) - { - if (self::$enabled) { - self::_exceptionHandler($exception); - } else { - trigger_error($exception->getMessage(), E_USER_ERROR); - } - } - - - - /** - * Starts catching potential errors/warnings. - * @return void - */ - public static function tryError() - { - if (!self::$enabled && self::$lastError === FALSE) { - set_error_handler(array(__CLASS__, '_errorHandler')); - } - self::$lastError = NULL; - } - - - - /** - * Returns catched error/warning message. - * @param \ErrorException catched error - * @return bool - */ - public static function catchError(& $error) - { - if (!self::$enabled && self::$lastError !== FALSE) { - restore_error_handler(); - } - $error = self::$lastError; - self::$lastError = FALSE; - return (bool) $error; - } - - - - /********************* useful tools ****************d*g**/ - - - - /** - * Dumps information about a variable in readable format. - * @param mixed variable to dump - * @param bool return output instead of printing it? (bypasses $productionMode) - * @return mixed variable itself or dump - */ - public static function dump($var, $return = FALSE) - { - if (!$return && self::$productionMode) { - return $var; - } - - $output = "
" . Helpers::htmlDump($var) . "\n"; - - if (!$return) { - $trace = debug_backtrace(); - $i = !isset($trace[1]['class']) && isset($trace[1]['function']) && $trace[1]['function'] === 'dump' ? 1 : 0; - if (isset($trace[$i]['file'], $trace[$i]['line']) && is_file($trace[$i]['file'])) { - $lines = file($trace[$i]['file']); - preg_match('#dump\((.*)\)#', $lines[$trace[$i]['line'] - 1], $m); - $output = substr_replace( - $output, - ' title="' . htmlspecialchars((isset($m[0]) ? "$m[0] \n" : '') . "in file {$trace[$i]['file']} on line {$trace[$i]['line']}") . '"', - 4, 0); - - if (self::$showLocation) { - $output = substr_replace( - $output, - ' in ' . Helpers::editorLink($trace[$i]['file'], $trace[$i]['line']) . ":{$trace[$i]['line']}", - -8, 0); - } - } - } - - if (self::$consoleMode) { - $output = htmlspecialchars_decode(strip_tags($output), ENT_NOQUOTES); - } - - if ($return) { - return $output; - - } else { - echo $output; - return $var; - } - } - - - - /** - * Starts/stops stopwatch. - * @param string name - * @return float elapsed seconds - */ - public static function timer($name = NULL) - { - static $time = array(); - $now = microtime(TRUE); - $delta = isset($time[$name]) ? $now - $time[$name] : 0; - $time[$name] = $now; - return $delta; - } - - - - /** - * Dumps information about a variable in Nette Debug Bar. - * @param mixed variable to dump - * @param string optional title - * @return mixed variable itself - */ - public static function barDump($var, $title = NULL) - { - if (!self::$productionMode) { - $dump = array(); - foreach ((is_array($var) ? $var : array('' => $var)) as $key => $val) { - $dump[$key] = Helpers::clickableDump($val); - } - self::$dumpPanel->data[] = array('title' => $title, 'dump' => $dump); - } - return $var; - } - - - - /** - * Sends message to FireLogger console. - * @param mixed message to log - * @return bool was successful? - */ - public static function fireLog($message) - { - if (!self::$productionMode) { - return self::$fireLogger->log($message); - } - } - - - - /** @deprecated */ - public static function addPanel(IBarPanel $panel, $id = NULL) - { - self::$bar->addPanel($panel, $id); - } - -} - - - -Debugger::_init(); + '1;33', + 'null' => '1;33', + 'int' => '1;36', + 'float' => '1;36', + 'string' => '1;32', + 'array' => '1;31', + 'key' => '1;37', + 'object' => '1;31', + 'visibility' => '1;30', + 'resource' => '1;37', + ); + + /********************* errors and exceptions reporting ****************d*g**/ + + /** server modes {@link Debugger::enable()} */ + const DEVELOPMENT = FALSE, + PRODUCTION = TRUE, + DETECT = NULL; + + /** @var BlueScreen */ + public static $blueScreen; + + /** @var bool|int determines whether any error will cause immediate death; if integer that it's matched against error severity */ + public static $strictMode = FALSE; // $immediateDeath + + /** @var bool disables the @ (shut-up) operator so that notices and warnings are no longer hidden */ + public static $scream = FALSE; + + /** @var array of callables specifies the functions that are automatically called after fatal error */ + public static $onFatalError = array(); + + /** @var bool {@link Debugger::enable()} */ + private static $enabled = FALSE; + + /** @var mixed {@link Debugger::tryError()} FALSE means catching is disabled */ + private static $lastError = FALSE; + + /********************* logging ****************d*g**/ + + /** @var Logger */ + public static $logger; + + /** @var FireLogger */ + public static $fireLogger; + + /** @var string name of the directory where errors should be logged; FALSE means that logging is disabled */ + public static $logDirectory; + + /** @var string email to sent error notifications */ + public static $email; + + /** @deprecated */ + public static $mailer; + + /** @deprecated */ + public static $emailSnooze; + + /********************* debug bar ****************d*g**/ + + /** @var Bar */ + public static $bar; + + /** @var DefaultBarPanel */ + private static $errorPanel; + + /** @var DefaultBarPanel */ + private static $dumpPanel; + + /********************* Firebug extension ****************d*g**/ + + /** {@link Debugger::log()} and {@link Debugger::fireLog()} */ + const DEBUG = 'debug', + INFO = 'info', + WARNING = 'warning', + ERROR = 'error', + CRITICAL = 'critical'; + + + + /** + * Static class - cannot be instantiated. + */ + final public function __construct() + { + throw new Nette\StaticClassException; + } + + + + /** + * Static class constructor. + * @internal + */ + public static function _init() + { + self::$time = isset($_SERVER['REQUEST_TIME_FLOAT']) ? $_SERVER['REQUEST_TIME_FLOAT'] : microtime(TRUE); + self::$consoleMode = PHP_SAPI === 'cli'; + self::$productionMode = self::DETECT; + if (self::$consoleMode) { + self::$source = empty($_SERVER['argv']) ? 'cli' : 'cli: ' . implode(' ', $_SERVER['argv']); + } else { + self::$ajaxDetected = isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest'; + if (isset($_SERVER['REQUEST_URI'])) { + self::$source = (isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off') ? 'https://' : 'http://') + . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '')) + . $_SERVER['REQUEST_URI']; + } + } + + self::$logger = new Logger; + self::$logDirectory = & self::$logger->directory; + self::$email = & self::$logger->email; + self::$mailer = & self::$logger->mailer; + self::$emailSnooze = & Logger::$emailSnooze; + + self::$fireLogger = new FireLogger; + + self::$blueScreen = new BlueScreen; + self::$blueScreen->addPanel(function($e) { + if ($e instanceof Nette\Templating\FilterException) { + return array( + 'tab' => 'Template', + 'panel' => '
File: ' . Helpers::editorLink($e->sourceFile, $e->sourceLine) + . ' Line: ' . ($e->sourceLine ? $e->sourceLine : 'n/a') . '
' + . ($e->sourceLine ? BlueScreen::highlightFile($e->sourceFile, $e->sourceLine) : '') + ); + } elseif ($e instanceof Nette\Utils\NeonException && preg_match('#line (\d+)#', $e->getMessage(), $m)) { + if ($item = Helpers::findTrace($e->getTrace(), 'Nette\Config\Adapters\NeonAdapter::load')) { + return array( + 'tab' => 'NEON', + 'panel' => 'File: ' . Helpers::editorLink($item['args'][0], $m[1]) . ' Line: ' . $m[1] . '
' + . BlueScreen::highlightFile($item['args'][0], $m[1]) + ); + } elseif ($item = Helpers::findTrace($e->getTrace(), 'Nette\Utils\Neon::decode')) { + return array( + 'tab' => 'NEON', + 'panel' => BlueScreen::highlightPhp($item['args'][0], $m[1]) + ); + } + } + }); + + self::$bar = new Bar; + self::$bar->addPanel(new DefaultBarPanel('time')); + self::$bar->addPanel(new DefaultBarPanel('memory')); + self::$bar->addPanel(self::$errorPanel = new DefaultBarPanel('errors')); // filled by _errorHandler() + self::$bar->addPanel(self::$dumpPanel = new DefaultBarPanel('dumps')); // filled by barDump() + } + + + + /********************* errors and exceptions reporting ****************d*g**/ + + + + /** + * Enables displaying or logging errors and exceptions. + * @param mixed production, development mode, autodetection or IP address(es) whitelist. + * @param string error log directory; enables logging in production mode, FALSE means that logging is disabled + * @param string administrator email; enables email sending in production mode + * @return void + */ + public static function enable($mode = NULL, $logDirectory = NULL, $email = NULL) + { + error_reporting(E_ALL | E_STRICT); + + // production/development mode detection + if (is_bool($mode)) { + self::$productionMode = $mode; + + } elseif ($mode !== self::DETECT || self::$productionMode === NULL) { // IP addresses or computer names whitelist detection + $list = is_string($mode) ? preg_split('#[,\s]+#', $mode) : (array) $mode; + if (!isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { + $list[] = '127.0.0.1'; + $list[] = '::1'; + } + self::$productionMode = !in_array(isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : php_uname('n'), $list, TRUE); + } + + // logging configuration + if (is_string($logDirectory)) { + self::$logDirectory = realpath($logDirectory); + if (self::$logDirectory === FALSE) { + die(__METHOD__ . "() error: Log directory is not found or is not directory."); + } + } elseif ($logDirectory === FALSE) { + self::$logDirectory = FALSE; + + } elseif (self::$logDirectory === NULL) { + self::$logDirectory = defined('APP_DIR') ? APP_DIR . '/../log' : getcwd() . '/log'; + } + if (self::$logDirectory) { + ini_set('error_log', self::$logDirectory . '/php_error.log'); + } + + // php configuration + if (function_exists('ini_set')) { + ini_set('display_errors', !self::$productionMode); // or 'stderr' + ini_set('html_errors', FALSE); + ini_set('log_errors', FALSE); + + } elseif (ini_get('display_errors') != !self::$productionMode && ini_get('display_errors') !== (self::$productionMode ? 'stderr' : 'stdout')) { // intentionally == + die(__METHOD__ . "() error: Unable to set 'display_errors' because function ini_set() is disabled."); + } + + if ($email) { + if (!is_string($email)) { + die(__METHOD__ . '() error: Email address must be a string.'); + } + self::$email = $email; + } + + if (!defined('E_DEPRECATED')) { + define('E_DEPRECATED', 8192); + } + + if (!defined('E_USER_DEPRECATED')) { + define('E_USER_DEPRECATED', 16384); + } + + if (!self::$enabled) { + register_shutdown_function(array(__CLASS__, '_shutdownHandler')); + set_exception_handler(array(__CLASS__, '_exceptionHandler')); + set_error_handler(array(__CLASS__, '_errorHandler')); + self::$enabled = TRUE; + } + } + + + + /** + * Is Debug enabled? + * @return bool + */ + public static function isEnabled() + { + return self::$enabled; + } + + + + /** + * Logs message or exception to file (if not disabled) and sends email notification (if enabled). + * @param string|Exception + * @param int one of constant Debugger::INFO, WARNING, ERROR (sends email), CRITICAL (sends email) + * @return string logged error filename + */ + public static function log($message, $priority = self::INFO) + { + if (self::$logDirectory === FALSE) { + return; + + } elseif (!self::$logDirectory) { + throw new Nette\InvalidStateException('Logging directory is not specified in Nette\Diagnostics\Debugger::$logDirectory.'); + } + + if ($message instanceof \Exception) { + $exception = $message; + $message = ($message instanceof Nette\FatalErrorException + ? 'Fatal error: ' . $exception->getMessage() + : get_class($exception) . ": " . $exception->getMessage()) + . " in " . $exception->getFile() . ":" . $exception->getLine(); + + $hash = md5($exception /*5.2*. (method_exists($exception, 'getPrevious') ? $exception->getPrevious() : (isset($exception->previous) ? $exception->previous : ''))*/); + $exceptionFilename = "exception-" . @date('Y-m-d-H-i-s') . "-$hash.html"; + foreach (new \DirectoryIterator(self::$logDirectory) as $entry) { + if (strpos($entry, $hash)) { + $exceptionFilename = $entry; + $saved = TRUE; + break; + } + } + } + + self::$logger->log(array( + @date('[Y-m-d H-i-s]'), + trim($message), + self::$source ? ' @ ' . self::$source : NULL, + !empty($exceptionFilename) ? ' @@ ' . $exceptionFilename : NULL + ), $priority); + + if (!empty($exceptionFilename)) { + $exceptionFilename = self::$logDirectory . '/' . $exceptionFilename; + if (empty($saved) && $logHandle = @fopen($exceptionFilename, 'w')) { + ob_start(); // double buffer prevents sending HTTP headers in some PHP + ob_start(function($buffer) use ($logHandle) { fwrite($logHandle, $buffer); }, 4096); + self::$blueScreen->render($exception); + ob_end_flush(); + ob_end_clean(); + fclose($logHandle); + } + return strtr($exceptionFilename, '\\/', DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR); + } + } + + + + /** + * Shutdown handler to catch fatal errors and execute of the planned activities. + * @return void + * @internal + */ + public static function _shutdownHandler() + { + if (!self::$enabled) { + return; + } + + // fatal error handler + static $types = array( + E_ERROR => 1, + E_CORE_ERROR => 1, + E_COMPILE_ERROR => 1, + E_PARSE => 1, + ); + $error = error_get_last(); + if (isset($types[$error['type']])) { + self::_exceptionHandler(new Nette\FatalErrorException($error['message'], 0, $error['type'], $error['file'], $error['line'], NULL)); + } + + // debug bar (require HTML & development mode) + if (self::$bar && !self::$productionMode && self::isHtmlMode()) { + self::$bar->render(); + } + } + + + + /** + * Handler to catch uncaught exception. + * @param \Exception + * @return void + * @internal + */ + public static function _exceptionHandler(\Exception $exception) + { + if (!headers_sent()) { // for PHP < 5.2.4 + $protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1'; + header($protocol . ' 500', TRUE, 500); + } + + try { + if (self::$productionMode) { + try { + self::log($exception, self::ERROR); + } catch (\Exception $e) { + echo 'FATAL ERROR: unable to log error'; + } + + if (self::$consoleMode) { + echo "ERROR: the server encountered an internal error and was unable to complete your request.\n"; + + } elseif (self::isHtmlMode()) { + require __DIR__ . '/templates/error.phtml'; + } + + } else { + if (self::$consoleMode) { // dump to console + echo "$exception\n"; + if ($file = self::log($exception)) { + echo "(stored in $file)\n"; + if (self::$browser) { + exec(self::$browser . ' ' . escapeshellarg($file)); + } + } + + } elseif (self::isHtmlMode()) { // dump to browser + self::$blueScreen->render($exception); + if (self::$bar) { + self::$bar->render(); + } + + } elseif (!self::fireLog($exception, self::ERROR)) { // AJAX or non-HTML mode + $file = self::log($exception); + if (!headers_sent()) { + header("X-Nette-Error-Log: $file"); + } + } + } + + foreach (self::$onFatalError as $handler) { + call_user_func($handler, $exception); + } + + } catch (\Exception $e) { + if (self::$productionMode) { + echo self::isHtmlMode() ? 'FATAL ERROR' : 'FATAL ERROR'; + } else { + echo "FATAL ERROR: thrown ", get_class($e), ': ', $e->getMessage(), + "\nwhile processing ", get_class($exception), ': ', $exception->getMessage(), "\n"; + } + } + + self::$enabled = FALSE; // un-register shutdown function + exit(255); + } + + + + /** + * Handler to catch warnings and notices. + * @param int level of the error raised + * @param string error message + * @param string file that the error was raised in + * @param int line number the error was raised at + * @param array an array of variables that existed in the scope the error was triggered in + * @return bool FALSE to call normal error handler, NULL otherwise + * @throws Nette\FatalErrorException + * @internal + */ + public static function _errorHandler($severity, $message, $file, $line, $context) + { + if (self::$scream) { + error_reporting(E_ALL | E_STRICT); + } + + if (self::$lastError !== FALSE && ($severity & error_reporting()) === $severity) { // tryError mode + self::$lastError = new \ErrorException($message, 0, $severity, $file, $line); + return NULL; + } + + if ($severity === E_RECOVERABLE_ERROR || $severity === E_USER_ERROR) { + if (Helpers::findTrace(/*5.2*PHP_VERSION_ID < 50205 ? debug_backtrace() : */debug_backtrace(FALSE), '*::__toString')) { + $previous = isset($context['e']) && $context['e'] instanceof \Exception ? $context['e'] : NULL; + self::_exceptionHandler(new Nette\FatalErrorException($message, 0, $severity, $file, $line, $context, $previous)); + } + throw new Nette\FatalErrorException($message, 0, $severity, $file, $line, $context); + + } elseif (($severity & error_reporting()) !== $severity) { + return FALSE; // calls normal error handler to fill-in error_get_last() + + } elseif (!self::$productionMode && (is_bool(self::$strictMode) ? self::$strictMode : ((self::$strictMode & $severity) === $severity))) { + self::_exceptionHandler(new Nette\FatalErrorException($message, 0, $severity, $file, $line, $context)); + } + + static $types = array( + E_WARNING => 'Warning', + E_COMPILE_WARNING => 'Warning', // currently unable to handle + E_USER_WARNING => 'Warning', + E_NOTICE => 'Notice', + E_USER_NOTICE => 'Notice', + E_STRICT => 'Strict standards', + E_DEPRECATED => 'Deprecated', + E_USER_DEPRECATED => 'Deprecated', + ); + + $message = 'PHP ' . (isset($types[$severity]) ? $types[$severity] : 'Unknown error') . ": $message"; + $count = & self::$errorPanel->data["$message|$file|$line"]; + + if ($count++) { // repeated error + return NULL; + + } elseif (self::$productionMode) { + self::log("$message in $file:$line", self::ERROR); + return NULL; + + } else { + $ok = self::fireLog(new \ErrorException($message, 0, $severity, $file, $line), self::WARNING); + return !self::isHtmlMode() || (!self::$bar && !$ok) ? FALSE : NULL; + } + + return FALSE; // call normal error handler + } + + + + /** + * Handles exception thrown in __toString(). + * @param \Exception + * @return void + */ + public static function toStringException(\Exception $exception) + { + if (self::$enabled) { + self::_exceptionHandler($exception); + } else { + trigger_error($exception->getMessage(), E_USER_ERROR); + } + } + + + + /** + * Starts catching potential errors/warnings. + * @return void + */ + public static function tryError() + { + if (!self::$enabled && self::$lastError === FALSE) { + set_error_handler(array(__CLASS__, '_errorHandler')); + } + self::$lastError = NULL; + } + + + + /** + * Returns catched error/warning message. + * @param \ErrorException catched error + * @return bool + */ + public static function catchError(& $error) + { + if (!self::$enabled && self::$lastError !== FALSE) { + restore_error_handler(); + } + $error = self::$lastError; + self::$lastError = FALSE; + return (bool) $error; + } + + + + /********************* useful tools ****************d*g**/ + + + + /** + * Dumps information about a variable in readable format. + * @param mixed variable to dump + * @param bool return output instead of printing it? (bypasses $productionMode) + * @return mixed variable itself or dump + */ + public static function dump($var, $return = FALSE) + { + if (!$return && self::$productionMode) { + return $var; + } + + $output = "" . Helpers::htmlDump($var) . "\n"; + + if (!$return) { + $trace = /*5.2*PHP_VERSION_ID < 50205 ? debug_backtrace() : */debug_backtrace(FALSE); + $item = Helpers::findTrace($trace, 'dump') ?: Helpers::findTrace($trace, __CLASS__ . '::dump'); + if (isset($item['file'], $item['line']) && is_file($item['file'])) { + $lines = file($item['file']); + preg_match('#dump\((.*)\)#', $lines[$item['line'] - 1], $m); + $output = substr_replace( + $output, + ' title="' . htmlspecialchars((isset($m[0]) ? "$m[0] \n" : '') . "in file {$item['file']} on line {$item['line']}") . '"', + 4, 0); + + if (self::$showLocation) { + $output = substr_replace( + $output, + ' in ' . Helpers::editorLink($item['file'], $item['line']) . ":{$item['line']}", + -8, 0); + } + } + } + + if (self::$consoleMode) { + if (self::$consoleColors && substr(getenv('TERM'), 0, 5) === 'xterm') { + $output = preg_replace_callback('#|#', function($m) { + return "\033[" . (isset($m[1], Debugger::$consoleColors[$m[1]]) ? Debugger::$consoleColors[$m[1]] : '0') . "m"; + }, $output); + } + $output = htmlspecialchars_decode(strip_tags($output), ENT_QUOTES); + } + + if ($return) { + return $output; + + } else { + echo $output; + return $var; + } + } + + + + /** + * Starts/stops stopwatch. + * @param string name + * @return float elapsed seconds + */ + public static function timer($name = NULL) + { + static $time = array(); + $now = microtime(TRUE); + $delta = isset($time[$name]) ? $now - $time[$name] : 0; + $time[$name] = $now; + return $delta; + } + + + + /** + * Dumps information about a variable in Nette Debug Bar. + * @param mixed variable to dump + * @param string optional title + * @return mixed variable itself + */ + public static function barDump($var, $title = NULL) + { + if (!self::$productionMode) { + $dump = array(); + foreach ((is_array($var) ? $var : array('' => $var)) as $key => $val) { + $dump[$key] = Helpers::clickableDump($val); + } + self::$dumpPanel->data[] = array('title' => $title, 'dump' => $dump); + } + return $var; + } + + + + /** + * Sends message to FireLogger console. + * @param mixed message to log + * @return bool was successful? + */ + public static function fireLog($message) + { + if (!self::$productionMode) { + return self::$fireLogger->log($message); + } + } + + + + private static function isHtmlMode() + { + return !self::$ajaxDetected && !self::$consoleMode + && !preg_match('#^Content-Type: (?!text/html)#im', implode("\n", headers_list())); + } + + + + /** @deprecated */ + public static function addPanel(IBarPanel $panel, $id = NULL) + { + return self::$bar->addPanel($panel, $id); + } + +} diff --git a/libs/Nette/Diagnostics/DefaultBarPanel.php b/libs/Nette/Diagnostics/DefaultBarPanel.php index 1779305..c969a79 100644 --- a/libs/Nette/Diagnostics/DefaultBarPanel.php +++ b/libs/Nette/Diagnostics/DefaultBarPanel.php @@ -1,76 +1,76 @@ -id = $id; - } - - - - /** - * Renders HTML code for custom tab. - * @return string - */ - public function getTab() - { - ob_start(); - $data = $this->data; - if ($this->id === 'time') { - require __DIR__ . '/templates/bar.time.tab.phtml'; - } elseif ($this->id === 'memory') { - require __DIR__ . '/templates/bar.memory.tab.phtml'; - } elseif ($this->id === 'dumps' && $this->data) { - require __DIR__ . '/templates/bar.dumps.tab.phtml'; - } elseif ($this->id === 'errors' && $this->data) { - require __DIR__ . '/templates/bar.errors.tab.phtml'; - } - return ob_get_clean(); - } - - - - /** - * Renders HTML code for custom panel. - * @return string - */ - public function getPanel() - { - ob_start(); - $data = $this->data; - if ($this->id === 'dumps') { - require __DIR__ . '/templates/bar.dumps.panel.phtml'; - } elseif ($this->id === 'errors') { - require __DIR__ . '/templates/bar.errors.panel.phtml'; - } - return ob_get_clean(); - } - -} +id = $id; + } + + + + /** + * Renders HTML code for custom tab. + * @return string + */ + public function getTab() + { + ob_start(); + $data = $this->data; + if ($this->id === 'time') { + require __DIR__ . '/templates/bar.time.tab.phtml'; + } elseif ($this->id === 'memory') { + require __DIR__ . '/templates/bar.memory.tab.phtml'; + } elseif ($this->id === 'dumps' && $this->data) { + require __DIR__ . '/templates/bar.dumps.tab.phtml'; + } elseif ($this->id === 'errors' && $this->data) { + require __DIR__ . '/templates/bar.errors.tab.phtml'; + } + return ob_get_clean(); + } + + + + /** + * Renders HTML code for custom panel. + * @return string + */ + public function getPanel() + { + ob_start(); + $data = $this->data; + if ($this->id === 'dumps') { + require __DIR__ . '/templates/bar.dumps.panel.phtml'; + } elseif ($this->id === 'errors') { + require __DIR__ . '/templates/bar.errors.panel.phtml'; + } + return ob_get_clean(); + } + +} diff --git a/libs/Nette/Diagnostics/FireLogger.php b/libs/Nette/Diagnostics/FireLogger.php index 2a23cd9..a8e9b3d 100644 --- a/libs/Nette/Diagnostics/FireLogger.php +++ b/libs/Nette/Diagnostics/FireLogger.php @@ -1,188 +1,188 @@ - array()); - - - - /** - * Sends message to FireLogger console. - * @param mixed - * @return bool was successful? - */ - public static function log($message, $priority = self::DEBUG) - { - if (!isset($_SERVER['HTTP_X_FIRELOGGER']) || headers_sent()) { - return FALSE; - } - - $item = array( - 'name' => 'PHP', - 'level' => $priority, - 'order' => count(self::$payload['logs']), - 'time' => str_pad(number_format((microtime(TRUE) - Debugger::$time) * 1000, 1, '.', ' '), 8, '0', STR_PAD_LEFT) . ' ms', - 'template' => '', - 'message' => '', - 'style' => 'background:#767ab6', - ); - - $args = func_get_args(); - if (isset($args[0]) && is_string($args[0])) { - $item['template'] = array_shift($args); - } - - if (isset($args[0]) && $args[0] instanceof \Exception) { - $e = array_shift($args); - $trace = $e->getTrace(); - if (isset($trace[0]['class']) && $trace[0]['class'] === 'Nette\Diagnostics\Debugger' - && ($trace[0]['function'] === '_shutdownHandler' || $trace[0]['function'] === '_errorHandler') - ) { - unset($trace[0]); - } - - $file = str_replace(dirname(dirname(dirname($e->getFile()))), "\xE2\x80\xA6", $e->getFile()); - $item['template'] = ($e instanceof \ErrorException ? '' : get_class($e) . ': ') - . $e->getMessage() . ($e->getCode() ? ' #' . $e->getCode() : '') . ' in ' . $file . ':' . $e->getLine(); - $item['pathname'] = $e->getFile(); - $item['lineno'] = $e->getLine(); - - } else { - $trace = debug_backtrace(); - if (isset($trace[1]['class']) && $trace[1]['class'] === 'Nette\Diagnostics\Debugger' - && ($trace[1]['function'] === 'fireLog') - ) { - unset($trace[0]); - } - - foreach ($trace as $frame) { - if (isset($frame['file']) && is_file($frame['file'])) { - $item['pathname'] = $frame['file']; - $item['lineno'] = $frame['line']; - break; - } - } - } - - $item['exc_info'] = array('', '', array()); - $item['exc_frames'] = array(); - - foreach ($trace as $frame) { - $frame += array('file' => NULL, 'line' => NULL, 'class' => NULL, 'type' => NULL, 'function' => NULL, 'object' => NULL, 'args' => NULL); - $item['exc_info'][2][] = array($frame['file'], $frame['line'], "$frame[class]$frame[type]$frame[function]", $frame['object']); - $item['exc_frames'][] = $frame['args']; - } - - if (isset($args[0]) && in_array($args[0], array(self::DEBUG, self::INFO, self::WARNING, self::ERROR, self::CRITICAL), TRUE)) { - $item['level'] = array_shift($args); - } - - $item['args'] = $args; - - self::$payload['logs'][] = self::jsonDump($item, -1); - foreach (str_split(base64_encode(@json_encode(self::$payload)), 4990) as $k => $v) { // intentionally @ - header("FireLogger-de11e-$k:$v"); - } - return TRUE; - } - - - - /** - * Dump implementation for JSON. - * @param mixed variable to dump - * @param int current recursion level - * @return string - */ - private static function jsonDump(&$var, $level = 0) - { - if (is_bool($var) || is_null($var) || is_int($var) || is_float($var)) { - return $var; - - } elseif (is_string($var)) { - if (Debugger::$maxLen && strlen($var) > Debugger::$maxLen) { - $var = substr($var, 0, Debugger::$maxLen) . " \xE2\x80\xA6 "; - } - return Nette\Utils\Strings::fixEncoding($var); - - } elseif (is_array($var)) { - static $marker; - if ($marker === NULL) { - $marker = uniqid("\x00", TRUE); - } - if (isset($var[$marker])) { - return "\xE2\x80\xA6RECURSION\xE2\x80\xA6"; - - } elseif ($level < Debugger::$maxDepth || !Debugger::$maxDepth) { - $var[$marker] = TRUE; - $res = array(); - foreach ($var as $k => &$v) { - if ($k !== $marker) { - $res[self::jsonDump($k)] = self::jsonDump($v, $level + 1); - } - } - unset($var[$marker]); - return $res; - - } else { - return " \xE2\x80\xA6 "; - } - - } elseif (is_object($var)) { - $arr = (array) $var; - static $list = array(); - if (in_array($var, $list, TRUE)) { - return "\xE2\x80\xA6RECURSION\xE2\x80\xA6"; - - } elseif ($level < Debugger::$maxDepth || !Debugger::$maxDepth) { - $list[] = $var; - $res = array("\x00" => '(object) ' . get_class($var)); - foreach ($arr as $k => &$v) { - if ($k[0] === "\x00") { - $k = substr($k, strrpos($k, "\x00") + 1); - } - $res[self::jsonDump($k)] = self::jsonDump($v, $level + 1); - } - array_pop($list); - return $res; - - } else { - return " \xE2\x80\xA6 "; - } - - } elseif (is_resource($var)) { - return "resource " . get_resource_type($var); - - } else { - return "unknown type"; - } - } - -} + array()); + + + + /** + * Sends message to FireLogger console. + * @param mixed + * @return bool was successful? + */ + public static function log($message, $priority = self::DEBUG) + { + if (!isset($_SERVER['HTTP_X_FIRELOGGER']) || headers_sent()) { + return FALSE; + } + + $item = array( + 'name' => 'PHP', + 'level' => $priority, + 'order' => count(self::$payload['logs']), + 'time' => str_pad(number_format((microtime(TRUE) - Debugger::$time) * 1000, 1, '.', ' '), 8, '0', STR_PAD_LEFT) . ' ms', + 'template' => '', + 'message' => '', + 'style' => 'background:#767ab6', + ); + + $args = func_get_args(); + if (isset($args[0]) && is_string($args[0])) { + $item['template'] = array_shift($args); + } + + if (isset($args[0]) && $args[0] instanceof \Exception) { + $e = array_shift($args); + $trace = $e->getTrace(); + if (isset($trace[0]['class']) && $trace[0]['class'] === 'Nette\Diagnostics\Debugger' + && ($trace[0]['function'] === '_shutdownHandler' || $trace[0]['function'] === '_errorHandler') + ) { + unset($trace[0]); + } + + $file = str_replace(dirname(dirname(dirname($e->getFile()))), "\xE2\x80\xA6", $e->getFile()); + $item['template'] = ($e instanceof \ErrorException ? '' : get_class($e) . ': ') + . $e->getMessage() . ($e->getCode() ? ' #' . $e->getCode() : '') . ' in ' . $file . ':' . $e->getLine(); + $item['pathname'] = $e->getFile(); + $item['lineno'] = $e->getLine(); + + } else { + $trace = debug_backtrace(); + if (isset($trace[1]['class']) && $trace[1]['class'] === 'Nette\Diagnostics\Debugger' + && ($trace[1]['function'] === 'fireLog') + ) { + unset($trace[0]); + } + + foreach ($trace as $frame) { + if (isset($frame['file']) && is_file($frame['file'])) { + $item['pathname'] = $frame['file']; + $item['lineno'] = $frame['line']; + break; + } + } + } + + $item['exc_info'] = array('', '', array()); + $item['exc_frames'] = array(); + + foreach ($trace as $frame) { + $frame += array('file' => NULL, 'line' => NULL, 'class' => NULL, 'type' => NULL, 'function' => NULL, 'object' => NULL, 'args' => NULL); + $item['exc_info'][2][] = array($frame['file'], $frame['line'], "$frame[class]$frame[type]$frame[function]", $frame['object']); + $item['exc_frames'][] = $frame['args']; + } + + if (isset($args[0]) && in_array($args[0], array(self::DEBUG, self::INFO, self::WARNING, self::ERROR, self::CRITICAL), TRUE)) { + $item['level'] = array_shift($args); + } + + $item['args'] = $args; + + self::$payload['logs'][] = self::jsonDump($item, -1); + foreach (str_split(base64_encode(@json_encode(self::$payload)), 4990) as $k => $v) { // intentionally @ + header("FireLogger-de11e-$k:$v"); + } + return TRUE; + } + + + + /** + * Dump implementation for JSON. + * @param mixed variable to dump + * @param int current recursion level + * @return string + */ + private static function jsonDump(&$var, $level = 0) + { + if (is_bool($var) || is_null($var) || is_int($var) || is_float($var)) { + return $var; + + } elseif (is_string($var)) { + if (Debugger::$maxLen && strlen($var) > Debugger::$maxLen) { + $var = substr($var, 0, Debugger::$maxLen) . " \xE2\x80\xA6 "; + } + return Nette\Utils\Strings::fixEncoding($var); + + } elseif (is_array($var)) { + static $marker; + if ($marker === NULL) { + $marker = uniqid("\x00", TRUE); + } + if (isset($var[$marker])) { + return "\xE2\x80\xA6RECURSION\xE2\x80\xA6"; + + } elseif ($level < Debugger::$maxDepth || !Debugger::$maxDepth) { + $var[$marker] = TRUE; + $res = array(); + foreach ($var as $k => &$v) { + if ($k !== $marker) { + $res[self::jsonDump($k)] = self::jsonDump($v, $level + 1); + } + } + unset($var[$marker]); + return $res; + + } else { + return " \xE2\x80\xA6 "; + } + + } elseif (is_object($var)) { + $arr = (array) $var; + static $list = array(); + if (in_array($var, $list, TRUE)) { + return "\xE2\x80\xA6RECURSION\xE2\x80\xA6"; + + } elseif ($level < Debugger::$maxDepth || !Debugger::$maxDepth) { + $list[] = $var; + $res = array("\x00" => '(object) ' . get_class($var)); + foreach ($arr as $k => &$v) { + if ($k[0] === "\x00") { + $k = substr($k, strrpos($k, "\x00") + 1); + } + $res[self::jsonDump($k)] = self::jsonDump($v, $level + 1); + } + array_pop($list); + return $res; + + } else { + return " \xE2\x80\xA6 "; + } + + } elseif (is_resource($var)) { + return "resource " . get_resource_type($var); + + } else { + return "unknown type"; + } + } + +} diff --git a/libs/Nette/Diagnostics/Helpers.php b/libs/Nette/Diagnostics/Helpers.php index ed1520f..0315555 100644 --- a/libs/Nette/Diagnostics/Helpers.php +++ b/libs/Nette/Diagnostics/Helpers.php @@ -1,196 +1,233 @@ -href(strtr(Debugger::$editor, array('%file' => rawurlencode($file), '%line' => $line))); - } else { - $el = Nette\Utils\Html::el('span'); - } - return $el->title("$file:$line") - ->setHtml(htmlSpecialChars(rtrim($dir, DIRECTORY_SEPARATOR)) . DIRECTORY_SEPARATOR . '' . htmlSpecialChars(basename($file)) . ''); - } - - - - /** - * Internal dump() implementation. - * @param mixed variable to dump - * @param int current recursion level - * @return string - */ - public static function htmlDump(&$var, $level = 0) - { - static $tableUtf, $tableBin, $reBinary = '#[^\x09\x0A\x0D\x20-\x7E\xA0-\x{10FFFF}]#u'; - if ($tableUtf === NULL) { - foreach (range("\x00", "\xFF") as $ch) { - if (ord($ch) < 32 && strpos("\r\n\t", $ch) === FALSE) { - $tableUtf[$ch] = $tableBin[$ch] = '\\x' . str_pad(dechex(ord($ch)), 2, '0', STR_PAD_LEFT); - } elseif (ord($ch) < 127) { - $tableUtf[$ch] = $tableBin[$ch] = $ch; - } else { - $tableUtf[$ch] = $ch; $tableBin[$ch] = '\\x' . dechex(ord($ch)); - } - } - $tableBin["\\"] = '\\\\'; - $tableBin["\r"] = '\\r'; - $tableBin["\n"] = '\\n'; - $tableBin["\t"] = '\\t'; - $tableUtf['\\x'] = $tableBin['\\x'] = '\\\\x'; - } - - if (is_bool($var)) { - return ($var ? 'TRUE' : 'FALSE') . "\n"; - - } elseif ($var === NULL) { - return "NULL\n"; - - } elseif (is_int($var)) { - return "$var\n"; - - } elseif (is_float($var)) { - $var = var_export($var, TRUE); - if (strpos($var, '.') === FALSE) { - $var .= '.0'; - } - return "$var\n"; - - } elseif (is_string($var)) { - if (Debugger::$maxLen && strlen($var) > Debugger::$maxLen) { - $s = htmlSpecialChars(substr($var, 0, Debugger::$maxLen), ENT_NOQUOTES) . ' ... '; - } else { - $s = htmlSpecialChars($var, ENT_NOQUOTES); - } - $s = strtr($s, preg_match($reBinary, $s) || preg_last_error() ? $tableBin : $tableUtf); - $len = strlen($var); - return "\"$s\"" . ($len > 1 ? " ($len)" : "") . "\n"; - - } elseif (is_array($var)) { - $s = "array(" . count($var) . ") "; - $space = str_repeat($space1 = ' ', $level); - $brackets = range(0, count($var) - 1) === array_keys($var) ? "[]" : "{}"; - - static $marker; - if ($marker === NULL) { - $marker = uniqid("\x00", TRUE); - } - if (empty($var)) { - - } elseif (isset($var[$marker])) { - $brackets = $var[$marker]; - $s .= "$brackets[0] *RECURSION* $brackets[1]"; - - } elseif ($level < Debugger::$maxDepth || !Debugger::$maxDepth) { - $s .= "
$brackets[0]\n";
- $var[$marker] = $brackets;
- foreach ($var as $k => &$v) {
- if ($k === $marker) {
- continue;
- }
- $k = is_int($k) ? $k : '"' . htmlSpecialChars(strtr($k, preg_match($reBinary, $k) || preg_last_error() ? $tableBin : $tableUtf)) . '"';
- $s .= "$space$space1$k => " . self::htmlDump($v, $level + 1);
- }
- unset($var[$marker]);
- $s .= "$space$brackets[1]";
-
- } else {
- $s .= "$brackets[0] ... $brackets[1]";
- }
- return $s . "\n";
-
- } elseif (is_object($var)) {
- $arr = (array) $var;
- $s = "" . get_class($var) . "(" . count($arr) . ") ";
- $space = str_repeat($space1 = ' ', $level);
-
- static $list = array();
- if (empty($arr)) {
-
- } elseif (in_array($var, $list, TRUE)) {
- $s .= "{ *RECURSION* }";
-
- } elseif ($level < Debugger::$maxDepth || !Debugger::$maxDepth) {
- $s .= "{\n";
- $list[] = $var;
- foreach ($arr as $k => &$v) {
- $m = '';
- if ($k[0] === "\x00") {
- $m = $k[1] === '*' ? ' protected' : ' private';
- $k = substr($k, strrpos($k, "\x00") + 1);
- }
- $k = htmlSpecialChars(strtr($k, preg_match($reBinary, $k) || preg_last_error() ? $tableBin : $tableUtf));
- $s .= "$space$space1\"$k\"$m => " . self::htmlDump($v, $level + 1);
- }
- array_pop($list);
- $s .= "$space}";
-
- } else {
- $s .= "{ ... }";
- }
- return $s . "\n";
-
- } elseif (is_resource($var)) {
- return "" . htmlSpecialChars(get_resource_type($var)) . " resource\n";
-
- } else {
- return "unknown type\n";
- }
- }
-
-
-
- /**
- * Dumps variable.
- * @param string
- * @return string
- */
- public static function clickableDump($dump)
- {
- return '' . preg_replace_callback(
- '#^( *)((?>[^(]{1,200}))\((\d+)\) #m',
- function ($m) {
- return "$m[1]$m[2]($m[3]) "
- . (trim($m[1]) || $m[3] < 7
- ? '▼ '
- : '► ');
- },
- self::htmlDump($dump)
- ) . '';
- }
-
-}
+href(strtr(Debugger::$editor, array('%file' => rawurlencode($file), '%line' => $line)))
+ ->title("$file:$line")
+ ->setHtml(htmlSpecialChars(rtrim($dir, DIRECTORY_SEPARATOR)) . DIRECTORY_SEPARATOR . '' . htmlSpecialChars(basename($file)) . '');
+ } else {
+ return Nette\Utils\Html::el('span')->setText($file);
+ }
+ }
+
+
+
+ /**
+ * Internal dump() implementation.
+ * @param mixed variable to dump
+ * @param int current recursion level
+ * @return string
+ */
+ public static function htmlDump(&$var, $level = 0)
+ {
+ static $tableUtf, $tableBin, $reBinary = '#[^\x09\x0A\x0D\x20-\x7E\xA0-\x{10FFFF}]#u';
+ if ($tableUtf === NULL) {
+ foreach (range("\x00", "\xFF") as $ch) {
+ if (ord($ch) < 32 && strpos("\r\n\t", $ch) === FALSE) {
+ $tableUtf[$ch] = $tableBin[$ch] = '\\x' . str_pad(dechex(ord($ch)), 2, '0', STR_PAD_LEFT);
+ } elseif (ord($ch) < 127) {
+ $tableUtf[$ch] = $tableBin[$ch] = $ch;
+ } else {
+ $tableUtf[$ch] = $ch; $tableBin[$ch] = '\\x' . dechex(ord($ch));
+ }
+ }
+ $tableBin["\\"] = '\\\\';
+ $tableBin["\r"] = '\\r';
+ $tableBin["\n"] = '\\n';
+ $tableBin["\t"] = '\\t';
+ $tableUtf['\\x'] = $tableBin['\\x'] = '\\\\x';
+ }
+
+ if (is_bool($var)) {
+ return '' . ($var ? 'TRUE' : 'FALSE') . "\n";
+
+ } elseif ($var === NULL) {
+ return "NULL\n";
+
+ } elseif (is_int($var)) {
+ return "$var\n";
+
+ } elseif (is_float($var)) {
+ $var = var_export($var, TRUE);
+ if (strpos($var, '.') === FALSE) {
+ $var .= '.0';
+ }
+ return "$var\n";
+
+ } elseif (is_string($var)) {
+ if (Debugger::$maxLen && strlen($var) > Debugger::$maxLen) {
+ $s = htmlSpecialChars(substr($var, 0, Debugger::$maxLen), ENT_NOQUOTES, 'ISO-8859-1') . ' ... ';
+ } else {
+ $s = htmlSpecialChars($var, ENT_NOQUOTES, 'ISO-8859-1');
+ }
+ $s = strtr($s, preg_match($reBinary, $s) || preg_last_error() ? $tableBin : $tableUtf);
+ $len = strlen($var);
+ return "\"$s\"" . ($len > 1 ? " ($len)" : "") . "\n";
+
+ } elseif (is_array($var)) {
+ $s = 'array(' . count($var) . ") ";
+ $space = str_repeat($space1 = ' ', $level);
+ $brackets = range(0, count($var) - 1) === array_keys($var) ? "[]" : "{}";
+
+ static $marker;
+ if ($marker === NULL) {
+ $marker = uniqid("\x00", TRUE);
+ }
+ if (empty($var)) {
+
+ } elseif (isset($var[$marker])) {
+ $brackets = $var[$marker];
+ $s .= "$brackets[0] *RECURSION* $brackets[1]";
+
+ } elseif ($level < Debugger::$maxDepth || !Debugger::$maxDepth) {
+ $s .= "$brackets[0]\n";
+ $var[$marker] = $brackets;
+ foreach ($var as $k => &$v) {
+ if ($k === $marker) {
+ continue;
+ }
+ $k = strtr($k, preg_match($reBinary, $k) || preg_last_error() ? $tableBin : $tableUtf);
+ $k = htmlSpecialChars(preg_match('#^\w+$#', $k) ? $k : "\"$k\"");
+ $s .= "$space$space1$k => " . self::htmlDump($v, $level + 1);
+ }
+ unset($var[$marker]);
+ $s .= "$space$brackets[1]";
+
+ } else {
+ $s .= "$brackets[0] ... $brackets[1]";
+ }
+ return $s . "\n";
+
+ } elseif (is_object($var)) {
+ if ($var instanceof \Closure) {
+ $rc = new \ReflectionFunction($var);
+ $arr = array();
+ foreach ($rc->getParameters() as $param) {
+ $arr[] = '$' . $param->getName();
+ }
+ $arr = array('file' => $rc->getFileName(), 'line' => $rc->getStartLine(), 'parameters' => implode(', ', $arr));
+ } else {
+ $arr = (array) $var;
+ }
+ $s = '' . get_class($var) . "(" . count($arr) . ") ";
+ $space = str_repeat($space1 = ' ', $level);
+
+ static $list = array();
+ if (empty($arr)) {
+
+ } elseif (in_array($var, $list, TRUE)) {
+ $s .= "{ *RECURSION* }";
+
+ } elseif ($level < Debugger::$maxDepth || !Debugger::$maxDepth || $var instanceof \Closure) {
+ $s .= "{\n";
+ $list[] = $var;
+ foreach ($arr as $k => &$v) {
+ $m = '';
+ if ($k[0] === "\x00") {
+ $m = ' ' . ($k[1] === '*' ? 'protected' : 'private') . '';
+ $k = substr($k, strrpos($k, "\x00") + 1);
+ }
+ $k = strtr($k, preg_match($reBinary, $k) || preg_last_error() ? $tableBin : $tableUtf);
+ $k = htmlSpecialChars(preg_match('#^\w+$#', $k) ? $k : "\"$k\"");
+ $s .= "$space$space1$k$m => " . self::htmlDump($v, $level + 1);
+ }
+ array_pop($list);
+ $s .= "$space}";
+
+ } else {
+ $s .= "{ ... }";
+ }
+ return $s . "\n";
+
+ } elseif (is_resource($var)) {
+ $type = get_resource_type($var);
+ $s = '' . htmlSpecialChars($type) . " resource ";
+
+ static $info = array('stream' => 'stream_get_meta_data', 'curl' => 'curl_getinfo');
+ if (isset($info[$type])) {
+ $space = str_repeat($space1 = ' ', $level);
+ $s .= "{\n";
+ foreach (call_user_func($info[$type], $var) as $k => $v) {
+ $s .= $space . $space1 . '' . htmlSpecialChars($k) . " => " . self::htmlDump($v, $level + 1);
+ }
+ $s .= "$space}";
+ }
+ return $s . "\n";
+
+ } else {
+ return "unknown type\n";
+ }
+ }
+
+
+
+ /**
+ * Dumps variable.
+ * @param string
+ * @return string
+ */
+ public static function clickableDump($dump, $collapsed = FALSE)
+ {
+ return '' . preg_replace_callback(
+ '#^( *)((?>[^(\r\n]{1,200}))\((\d+)\) #m',
+ function($m) use ($collapsed) {
+ return "$m[1]$m[2]($m[3]) "
+ . (($m[1] || !$collapsed) && ($m[3] < 7)
+ ? '▼ '
+ : '► ');
+ },
+ self::htmlDump($dump)
+ ) . '';
+ }
+
+
+
+ public static function findTrace(array $trace, $method, & $index = NULL)
+ {
+ $m = explode('::', $method);
+ foreach ($trace as $i => $item) {
+ if (isset($item['function']) && $item['function'] === end($m)
+ && isset($item['class']) === isset($m[1])
+ && (!isset($item['class']) || $item['class'] === $m[0] || $m[0] === '*' || is_subclass_of($item['class'], $m[0]))
+ ) {
+ $index = $i;
+ return $item;
+ }
+ }
+ }
+
+}
diff --git a/libs/Nette/Diagnostics/IBarPanel.php b/libs/Nette/Diagnostics/IBarPanel.php
index f959503..97262b5 100644
--- a/libs/Nette/Diagnostics/IBarPanel.php
+++ b/libs/Nette/Diagnostics/IBarPanel.php
@@ -1,38 +1,38 @@
-directory)) {
- throw new Nette\DirectoryNotFoundException("Directory '$this->directory' is not found or is not directory.");
- }
-
- if (is_array($message)) {
- $message = implode(' ', $message);
- }
- $res = error_log(trim($message) . PHP_EOL, 3, $this->directory . '/' . strtolower($priority) . '.log');
-
- if (($priority === self::ERROR || $priority === self::CRITICAL) && $this->email && $this->mailer
- && @filemtime($this->directory . '/email-sent') + self::$emailSnooze < time() // @ - file may not exist
- && @file_put_contents($this->directory . '/email-sent', 'sent') // @ - file may not be writable
- ) {
- call_user_func($this->mailer, $message, $this->email);
- }
- return $res;
- }
-
-
-
- /**
- * Default mailer.
- * @param string
- * @param string
- * @return void
- */
- private static function defaultMailer($message, $email)
- {
- $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] :
- (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '');
-
- $parts = str_replace(
- array("\r\n", "\n"),
- array("\n", PHP_EOL),
- array(
- 'headers' => "From: noreply@$host\nX-Mailer: Nette Framework\n",
- 'subject' => "PHP: An error occurred on the server $host",
- 'body' => "[" . @date('Y-m-d H:i:s') . "] $message", // @ - timezone may not be set
- )
- );
-
- mail($email, $parts['subject'], $parts['body'], $parts['headers']);
- }
-
-}
+directory)) {
+ throw new Nette\DirectoryNotFoundException("Directory '$this->directory' is not found or is not directory.");
+ }
+
+ if (is_array($message)) {
+ $message = implode(' ', $message);
+ }
+ $res = error_log(trim($message) . PHP_EOL, 3, $this->directory . '/' . strtolower($priority) . '.log');
+
+ if (($priority === self::ERROR || $priority === self::CRITICAL) && $this->email && $this->mailer
+ && @filemtime($this->directory . '/email-sent') + self::$emailSnooze < time() // @ - file may not exist
+ && @file_put_contents($this->directory . '/email-sent', 'sent') // @ - file may not be writable
+ ) {
+ Nette\Callback::create($this->mailer)->invoke($message, $this->email);
+ }
+ return $res;
+ }
+
+
+
+ /**
+ * Default mailer.
+ * @param string
+ * @param string
+ * @return void
+ */
+ public static function defaultMailer($message, $email)
+ {
+ $host = php_uname('n');
+ foreach (array('HTTP_HOST','SERVER_NAME', 'HOSTNAME') as $item) {
+ if (isset($_SERVER[$item])) {
+ $host = $_SERVER[$item]; break;
+ }
+ }
+
+ $parts = str_replace(
+ array("\r\n", "\n"),
+ array("\n", PHP_EOL),
+ array(
+ 'headers' => implode("\n", array(
+ "From: noreply@$host",
+ 'X-Mailer: Nette Framework',
+ 'Content-Type: text/plain; charset=UTF-8',
+ 'Content-Transfer-Encoding: 8bit',
+ )) . "\n",
+ 'subject' => "PHP: An error occurred on the server $host",
+ 'body' => "[" . @date('Y-m-d H:i:s') . "] $message", // @ - timezone may not be set
+ )
+ );
+
+ mail($email, $parts['subject'], $parts['body'], $parts['headers']);
+ }
+
+}
diff --git a/libs/Nette/Diagnostics/shortcuts.php b/libs/Nette/Diagnostics/shortcuts.php
new file mode 100644
index 0000000..b18d20e
--- /dev/null
+++ b/libs/Nette/Diagnostics/shortcuts.php
@@ -0,0 +1,25 @@
+
-
-
-
-Dumped variables
- -
-
-
-
-
-
-
-
- $dump): ?>
-
-
-
+
+
+
+
+| - | - |
|---|
Dumped variables
+ +
+
+
+
+
+
+
+
+ $dump): ?>
+
+
+
diff --git a/libs/Nette/Diagnostics/templates/bar.dumps.tab.phtml b/libs/Nette/Diagnostics/templates/bar.dumps.tab.phtml
index fd6a0c7..72c5bcb 100644
--- a/libs/Nette/Diagnostics/templates/bar.dumps.tab.phtml
+++ b/libs/Nette/Diagnostics/templates/bar.dumps.tab.phtml
@@ -1,14 +1,14 @@
-
-| + | + |
|---|
variables
+
+variables
diff --git a/libs/Nette/Diagnostics/templates/bar.errors.panel.phtml b/libs/Nette/Diagnostics/templates/bar.errors.panel.phtml
index c0b7388..9dbc604 100644
--- a/libs/Nette/Diagnostics/templates/bar.errors.panel.phtml
+++ b/libs/Nette/Diagnostics/templates/bar.errors.panel.phtml
@@ -1,26 +1,26 @@
-
-Errors
- -
-
-
- $count): list($message, $file, $line) = explode('|', $item) ?>
-
-
+
+| - | - |
Errors
+ +
+
+
+ $count): list($message, $file, $line) = explode('|', $item) ?>
+
+
diff --git a/libs/Nette/Diagnostics/templates/bar.errors.tab.phtml b/libs/Nette/Diagnostics/templates/bar.errors.tab.phtml
index 35fb7bc..4eb5b15 100644
--- a/libs/Nette/Diagnostics/templates/bar.errors.tab.phtml
+++ b/libs/Nette/Diagnostics/templates/bar.errors.tab.phtml
@@ -1,15 +1,15 @@
-
-| + | + |
errors
+
+ errors
diff --git a/libs/Nette/Diagnostics/templates/bar.memory.tab.phtml b/libs/Nette/Diagnostics/templates/bar.memory.tab.phtml
index 6998880..b434cc4 100644
--- a/libs/Nette/Diagnostics/templates/bar.memory.tab.phtml
+++ b/libs/Nette/Diagnostics/templates/bar.memory.tab.phtml
@@ -1,15 +1,15 @@
-
-
MB
+
+ MB
diff --git a/libs/Nette/Diagnostics/templates/bar.phtml b/libs/Nette/Diagnostics/templates/bar.phtml
index f089a4c..6735180 100644
--- a/libs/Nette/Diagnostics/templates/bar.phtml
+++ b/libs/Nette/Diagnostics/templates/bar.phtml
@@ -1,102 +1,621 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $panel): if (!$panel['panel']) continue; ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $panel): if (!$panel['panel']) continue; ?>
+
-
--
-
- "> Nette Framework - -
- ', trim($panel['tab']), ''; endif ?> - -
- × -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libs/Nette/Diagnostics/templates/bar.time.tab.phtml b/libs/Nette/Diagnostics/templates/bar.time.tab.phtml
index b7a3d22..4bcd33b 100644
--- a/libs/Nette/Diagnostics/templates/bar.time.tab.phtml
+++ b/libs/Nette/Diagnostics/templates/bar.time.tab.phtml
@@ -1,15 +1,15 @@
-
-
+
+-
+
- "> Nette Framework + +
- ', trim($panel['tab']), ''; endif ?> + +
- × +
ms
+
+ ms
diff --git a/libs/Nette/Diagnostics/templates/bluescreen.phtml b/libs/Nette/Diagnostics/templates/bluescreen.phtml
index 5ba38a3..2e9cc9e 100644
--- a/libs/Nette/Diagnostics/templates/bluescreen.phtml
+++ b/libs/Nette/Diagnostics/templates/bluescreen.phtml
@@ -1,332 +1,644 @@
- 'Fatal Error',
- E_USER_ERROR => 'User Error',
- E_RECOVERABLE_ERROR => 'Recoverable Error',
- E_CORE_ERROR => 'Core Error',
- E_COMPILE_ERROR => 'Compile Error',
- E_PARSE => 'Parse Error',
- E_WARNING => 'Warning',
- E_CORE_WARNING => 'Core Warning',
- E_COMPILE_WARNING => 'Compile Warning',
- E_USER_WARNING => 'User Warning',
- E_NOTICE => 'Notice',
- E_USER_NOTICE => 'User Notice',
- E_STRICT => 'Strict',
- E_DEPRECATED => 'Deprecated',
- E_USER_DEPRECATED => 'User Deprecated',
-);
-
-$title = ($exception instanceof Nette\FatalErrorException && isset($errorTypes[$exception->getSeverity()])) ? $errorTypes[$exception->getSeverity()] : get_class($exception);
-
-$expandPath = NETTE_DIR . DIRECTORY_SEPARATOR; // . 'Utils' . DIRECTORY_SEPARATOR . 'Object';
-$counter = 0;
-
-?>
-
-
-
-
-
-
-
-
- ▼<?php echo htmlspecialchars($title) ?>
+
+
+
+
+
+
+
+
-
-
-
-
-
+ 'Fatal Error',
+ E_USER_ERROR => 'User Error',
+ E_RECOVERABLE_ERROR => 'Recoverable Error',
+ E_CORE_ERROR => 'Core Error',
+ E_COMPILE_ERROR => 'Compile Error',
+ E_PARSE => 'Parse Error',
+ E_WARNING => 'Warning',
+ E_CORE_WARNING => 'Core Warning',
+ E_COMPILE_WARNING => 'Compile Warning',
+ E_USER_WARNING => 'User Warning',
+ E_NOTICE => 'Notice',
+ E_USER_NOTICE => 'User Notice',
+ E_STRICT => 'Strict',
+ E_DEPRECATED => 'Deprecated',
+ E_USER_DEPRECATED => 'User Deprecated',
+);
+
+$title = ($exception instanceof Nette\FatalErrorException && isset($errorTypes[$exception->getSeverity()])) ? $errorTypes[$exception->getSeverity()] : get_class($exception);
+
+$expandPath = NETTE_DIR . DIRECTORY_SEPARATOR; // . 'Utils' . DIRECTORY_SEPARATOR . 'Object';
+$counter = 0;
+
+?>
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- getCode() ? ' #' . $exception->getCode() : '') ?>
- -getMessage()) ?> getMessage())) ?>" id="netteBsSearch">search►
-
-
-Caused by 2) ? '►' : '▼' ?>
- -
-
' ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
- getCode() ? ' #' . $ex->getCode() : '') ?>
- -getMessage()) ?>
-
-
-
-
-
-
- getTrace(); $expanded = NULL ?>
- getFile(), $expandPath) === 0) {
- foreach ($stack as $key => $row) {
- if (isset($row['file']) && strpos($row['file'], $expandPath) !== 0) { $expanded = $key; break; }
- }
- } ?>
- getFile())): ?>
- ▼
- -
-
-
-
-
-
-
-
-
-
- Source file
- -
-
File: getFile(), $ex->getLine()) ?> Line: getLine() ?>
-getFile(), $ex->getLine()) ?>-
-
-
-
-
-
- context) && is_array($ex->context)):?>
- Call stack ▼
- -
-
-
- $row): ?>
-
- - - - - inner-code - - - ">source ► - - - - - (">arguments ►) -
- - -"> -- - - - -- getParameters(); - } catch (\Exception $e) { - $params = array(); - } - foreach ($row['args'] as $k => $v) { - echo '
-', (isset($params[$k]) ? '$' . $params[$k]->name : "#$k"), ' '; - echo Helpers::clickableDump($v); - echo " id="netteBsSrc">
- - -
-
-
-
-
-
- getPrevious()) || (isset($ex->previous) && $ex = $ex->previous)); ?>
- Variables ►
- -
-
-
- context as $k => $v) {
- echo '
-
- | $', htmlspecialchars($k), ' | ', Helpers::clickableDump($v), " |
|---|
-
-
-
-
-
- ►
- -
-
-
-
-
-
-
- Environment ►
- -
-
-
Constants ▼
-
-
- $v) {
- echo '
-
-
-
-
- | ', htmlspecialchars($k), ' | '; - echo '', Helpers::clickableDump($v), " |
|---|
Included files ► ()
-
-
-
-
-
-
- | ', htmlspecialchars($v), " | \n"; - } - ?> -
$_SERVER
- -empty
- -
-
- $v) echo '
-
-
- | ', htmlspecialchars($k), ' | ', Helpers::clickableDump($v), " |
|---|
-
-
-
-
- HTTP request ►
- -
-
-
Headers
-
-
- $v) echo '
-
-
-
-
-
- | ', htmlspecialchars($k), ' | ', htmlspecialchars($v), " |
|---|
$
- -empty
- -
-
- $v) echo '
-
-
-
- | ', htmlspecialchars($k), ' | ', Helpers::clickableDump($v), " |
|---|
-
-
-
-
- HTTP response ►
- -
-
Headers
- -'; - ?>- -
no headers
- -
+ ▼
+
+
+
+
+
+
+
+
+
+
+
+
+
+ getCode() ? ' #' . $exception->getCode() : '') ?>
+ +getMessage()) ?> getMessage())) ?>" id="netteBsSearch">search►
+
+
+Caused by 2) ? '►' : '▼' ?>
+ +
+
' ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ getCode() ? ' #' . $ex->getCode() : '')) ?>
+ +getMessage()) ?>
+
+
+
+
+
+
+ getTrace(); $expanded = NULL ?>
+ getFile(), $expandPath) === 0) {
+ foreach ($stack as $key => $row) {
+ if (isset($row['file']) && strpos($row['file'], $expandPath) !== 0) { $expanded = $key; break; }
+ }
+ } ?>
+
+ ▼
+ +
+
+
+
+
+
+
+
+
+ Source file
+ +
+
File: getFile(), $ex->getLine()) ?> Line: getLine() ?>
+ getFile())): ?>getFile(), $ex->getLine(), 15, isset($ex->context) ? $ex->context : NULL) ?> +
+
+
+
+
+
+ context) && is_array($ex->context)):?>
+ Call stack ▼
+ +
+
-
+ $row): ?>
+
+ + + + + inner-code + + + ">source ► + + + + + (">arguments ►) +
+ + +"> ++ + + + ++ getParameters(); + } catch (\Exception $e) { + $params = array(); + } + foreach ($row['args'] as $k => $v) { + echo '
+', htmlspecialchars(isset($params[$k]) ? '$' . $params[$k]->name : "#$k"), ' '; + echo Helpers::clickableDump($v); + echo " id="netteBsSrc">+ + +
+
+
+
+
+
+ getPrevious()) || (isset($ex->previous) && $ex = $ex->previous)); ?>
+ Variables ►
+ +
+
+
+ context as $k => $v) {
+ echo '
+
+ | $', htmlspecialchars($k), ' | ', Helpers::clickableDump($v), " |
|---|
+
+
+
+
+
+ ►
+ +
+
+
+
+
+
+
+ Environment ►
+ +
+
$_SERVER ▼
+
+
+ $v) echo '
+
+
+
+ | ', htmlspecialchars($k), ' | ', Helpers::clickableDump($v), " |
|---|
$_SESSION ▼
+
+
+
+ $v) echo '
+
+
+
+
+
+ empty
+ +| ', htmlspecialchars($k), ' | ', $k === '__NF' ? 'Nette Session' : Helpers::clickableDump($v), " |
|---|
Nette Session ▼
+
+
+ $v) echo '
+
+
+
+
+
+ | ', htmlspecialchars($k), ' | ', Helpers::clickableDump($v), " |
|---|
Constants ►
+
+
+ $v) {
+ echo '
+
+
+
+
+ | ', htmlspecialchars($k), ' | '; + echo '', Helpers::clickableDump($v), " |
|---|
Included files ► ()
+
+
+
+
+
+
+ | ', htmlspecialchars($v), " | \n"; + } + ?> +
Configuration options ►
+
+ |.+$#s', '', ob_get_clean()) ?>
+
+
+
+
+
+
+ HTTP request ►
+ +
+
+
Headers
+
+
+ $v) echo '
+
+
+
+
+
+ | ', htmlspecialchars($k), ' | ', htmlspecialchars($v), " |
|---|
$
+ +empty
+ +
+
+ $v) echo '
+
+
+
+ | ', htmlspecialchars($k), ' | ', Helpers::clickableDump($v), " |
|---|
+
+
+
+
+
+ HTTP response ►
+ +
+
Headers
+ +'; + ?>+ +
no headers
+ +
+
+
+
+
+
+
+ ▼
+ +
+
+