Permalink
Browse files

Upgraded Zend Framework

  • Loading branch information...
demiankatz committed Feb 21, 2013
1 parent a242653 commit a6c26184772fae3b2a6f0e935dc734c7596fdaec
Showing 1,986 changed files with 35,754 additions and 17,569 deletions.
@@ -451,6 +451,17 @@
),
),
),
+ 'items' => array(
+ 'type' => 'Segment',
+ 'options' => array(
+ 'route' => '/Items[/:extra]',
+ 'defaults' => array(
+ '__NAMESPACE__' => 'GeebyDeeby\Controller',
+ 'controller' => 'Item',
+ 'action' => 'list',
+ ),
+ ),
+ ),
'login' => array(
'type' => 'Literal',
'options' => array(
@@ -58,6 +58,18 @@ public function indexAction()
return $view;
}
+ /**
+ * Item list
+ *
+ * @return mixed
+ */
+ public function listAction()
+ {
+ return $this->createViewModel(
+ array('items' => $this->getDbTable('item')->getList())
+ );
+ }
+
/**
* Not found page
*
View
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2012, Zend Technologies USA, Inc.
+Copyright (c) 2005-2013, Zend Technologies USA, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -4,7 +4,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,7 @@
* @category Zend
* @package Zend_Loader
* @subpackage Exception
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -0,0 +1,240 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+use Zend\Console;
+use Zend\Loader\StandardAutoloader;
+
+/**
+ * Generate template maps.
+ *
+ * Usage:
+ * --help|-h Get usage message
+ * --library|-l [ <string> ] Library to parse; if none provided, assumes
+ * current directory
+ * --output|-o [ <string> ] Where to write map file; if not provided,
+ * assumes "template_map.php" in library directory
+ * --append|-a Append to map file if it exists
+ * --overwrite|-w Whether or not to overwrite existing map file
+ */
+
+$zfLibraryPath = getenv('LIB_PATH') ? getenv('LIB_PATH') : __DIR__ . '/../library';
+if (is_dir($zfLibraryPath)) {
+ // Try to load StandardAutoloader from library
+ if (false === include($zfLibraryPath . '/Zend/Loader/StandardAutoloader.php')) {
+ echo 'Unable to locate autoloader via library; aborting' . PHP_EOL;
+ exit(2);
+ }
+} else {
+ // Try to load StandardAutoloader from include_path
+ if (false === include('Zend/Loader/StandardAutoloader.php')) {
+ echo 'Unable to locate autoloader via include_path; aborting' . PHP_EOL;
+ exit(2);
+ }
+}
+
+$libraryPath = getcwd();
+$viewPath = getcwd() . '/view';
+
+// Setup autoloading
+$loader = new StandardAutoloader(array('autoregister_zf' => true));
+$loader->register();
+
+$rules = array(
+ 'help|h' => 'Get usage message',
+ 'library|l-s' => 'Library to parse; if none provided, assumes current directory',
+ 'view|v-s' => 'View path to parse; if none provided, assumes view as template directory',
+ 'output|o-s' => 'Where to write map file; if not provided, assumes "template_map.php" in library directory',
+ 'append|a' => 'Append to map file if it exists',
+ 'overwrite|w' => 'Whether or not to overwrite existing map file',
+);
+
+try {
+ $opts = new Console\Getopt($rules);
+ $opts->parse();
+} catch (Console\Exception\RuntimeException $e) {
+ echo $e->getUsageMessage();
+ exit(2);
+}
+
+if ($opts->getOption('h')) {
+ echo $opts->getUsageMessage();
+ exit(0);
+}
+
+$relativePathForMap = '';
+if (isset($opts->l)) {
+ if (!is_dir($opts->l)) {
+ echo 'Invalid library directory provided' . PHP_EOL
+ . PHP_EOL;
+ echo $opts->getUsageMessage();
+ exit(2);
+ }
+ $libraryPath = $opts->l;
+}
+$libraryPath = str_replace(DIRECTORY_SEPARATOR, '/', realpath($libraryPath));
+
+if (isset($opts->v)) {
+ if (!is_dir($opts->v)) {
+ echo 'Invalid view template directory provided' . PHP_EOL
+ . PHP_EOL;
+ echo $opts->getUsageMessage();
+ exit(2);
+ }
+ $viewPath = $opts->v;
+}
+
+if (!is_dir($viewPath)) {
+ printf('Invalid view path provided (%s)', $viewPath);
+ echo PHP_EOL . PHP_EOL;
+ echo $opts->getUsageMessage();
+ exit(2);
+}
+
+$viewPath = str_replace(DIRECTORY_SEPARATOR, '/', realpath($viewPath));
+
+$usingStdout = false;
+$appending = $opts->getOption('a');
+$output = $libraryPath . '/template_map.php';
+if (isset($opts->o)) {
+ $output = $opts->o;
+ if ('-' == $output) {
+ $output = STDOUT;
+ $usingStdout = true;
+ } elseif (is_dir($output)) {
+ echo 'Invalid output file provided' . PHP_EOL
+ . PHP_EOL;
+ echo $opts->getUsageMessage();
+ exit(2);
+ } elseif (!is_writeable(dirname($output))) {
+ echo "Cannot write to '$output'; aborting." . PHP_EOL
+ . PHP_EOL
+ . $opts->getUsageMessage();
+ exit(2);
+ } elseif (file_exists($output) && !$opts->getOption('w') && !$appending) {
+ echo "Template map file already exists at '$output'," . PHP_EOL
+ . "but 'overwrite' or 'appending' flag was not specified; aborting." . PHP_EOL
+ . PHP_EOL
+ . $opts->getUsageMessage();
+ exit(2);
+ } else {
+ // We need to add the $libraryPath into the relative path that is created in the template map file.
+ $mapPath = str_replace(DIRECTORY_SEPARATOR, '/', realpath(dirname($output)));
+
+ // Simple case: $libraryPathCompare is in $mapPathCompare
+ if (strpos($libraryPath, $mapPath) === 0) {
+ $relativePathForMap = substr($libraryPath, strlen($mapPath) + 1) . '/';
+ } else {
+ $libraryPathParts = explode('/', $libraryPath);
+ $mapPathParts = explode('/', $mapPath);
+
+ // Find the common part
+ $count = count($mapPathParts);
+ for ($i = 0; $i < $count; $i++) {
+ if (!isset($libraryPathParts[$i]) || $libraryPathParts[$i] != $mapPathParts[$i]) {
+ // Common part end
+ break;
+ }
+ }
+
+ // Add parent dirs for the subdirs of map
+ $relativePathForMap = str_repeat('../', $count - $i);
+
+ // Add library subdirs
+ $count = count($libraryPathParts);
+ for (; $i < $count; $i++) {
+ $relativePathForMap .= $libraryPathParts[$i] . '/';
+ }
+ }
+ }
+}
+
+if (!$usingStdout) {
+ if ($appending) {
+ echo "Appending to template file map '$output' for library in '$libraryPath'..." . PHP_EOL;
+ } else {
+ echo "Creating template file map for library in '$libraryPath'..." . PHP_EOL;
+ }
+}
+
+$dirOrIterator = new RecursiveDirectoryIterator($viewPath, RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
+$l = new RecursiveIteratorIterator($dirOrIterator);
+
+// Iterate over each element in the path, and create a map of
+// template name => filename, where the filename is relative to the view path
+$map = new stdClass;
+foreach ($l as $file) {
+ if (!$file->isFile()) {
+ continue;
+ }
+ $filename = str_replace($libraryPath . '/', '', str_replace(DIRECTORY_SEPARATOR, '/', $file->getPath()) . '/' . $file->getFilename());
+
+ // Add in relative path to library
+ $filename = $relativePathForMap . $filename;
+ $baseName = $file->getBasename('.' . $file->getExtension());
+ $mapName = str_replace($libraryPath . '/', '', str_replace(DIRECTORY_SEPARATOR, '/', $file->getPath()) . '/' . $baseName);
+ $map->{$mapName} = $filename;
+}
+
+
+if ($appending) {
+ $content = var_export((array) $map, true) . ';';
+
+ // Prefix with __DIR__; modify the generated content
+ $content = preg_replace("#(=> ')#", "=> __DIR__ . '/", $content);
+
+ // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
+ $content = str_replace("\\'", "'", $content);
+
+ // Convert to an array and remove the first "array("
+ $content = explode(PHP_EOL, $content);
+ array_shift($content);
+
+ // Load existing map file and remove the closing "bracket ");" from it
+ $existing = file($output, FILE_IGNORE_NEW_LINES);
+ array_pop($existing);
+
+ // Merge
+ $content = implode(PHP_EOL, array_merge($existing, $content));
+} else {
+ // Create a file with the map.
+ // Stupid syntax highlighters make separating < from PHP declaration necessary
+ $content = '<' . "?php\n"
+ . "// Generated by ZF2's ./bin/templatemap_generator.php\n"
+ . 'return ' . var_export((array) $map, true) . ';';
+
+ // Prefix with __DIR__; modify the generated content
+ $content = preg_replace("#(=> ')#", "=> __DIR__ . '/", $content);
+
+ // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
+ $content = str_replace("\\'", "'", $content);
+}
+
+// Remove unnecessary double-backslashes
+$content = str_replace('\\\\', '\\', $content);
+
+// Exchange "array (" width "array("
+$content = str_replace('array (', 'array(', $content);
+
+// Align "=>" operators to match coding standard
+preg_match_all('(\n\s+([^=]+)=>)', $content, $matches, PREG_SET_ORDER);
+$maxWidth = 0;
+
+foreach ($matches as $match) {
+ $maxWidth = max($maxWidth, strlen($match[1]));
+}
+
+$content = preg_replace('(\n\s+([^=]+)=>)e', "'\n \\1' . str_repeat(' ', " . $maxWidth . " - strlen('\\1')) . '=>'", $content);
+
+// Write the contents to disk
+file_put_contents($output, $content);
+
+if (!$usingStdout) {
+ echo "Wrote templatemap file to '" . realpath($output) . "'" . PHP_EOL;
+}
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Authentication\Adapter;
+
+abstract class AbstractAdapter implements ValidatableAdapterInterface
+{
+
+ /**
+ * @var mixed
+ */
+ protected $credential;
+
+ /**
+ * @var mixed
+ */
+ protected $identity;
+
+ /**
+ * Returns the credential of the account being authenticated, or
+ * NULL if none is set.
+ *
+ * @return mixed
+ */
+ public function getCredential()
+ {
+ return $this->credential;
+ }
+
+ /**
+ * Sets the credential for binding
+ *
+ * @param mixed $credential
+ * @return AbstractAdapter
+ */
+ public function setCredential($credential)
+ {
+ $this->credential = $credential;
+
+ return $this;
+ }
+
+ /**
+ * Returns the identity of the account being authenticated, or
+ * NULL if none is set.
+ *
+ * @return mixed
+ */
+ public function getIdentity()
+ {
+ return $this->identity;
+ }
+
+ /**
+ * Sets the identity for binding
+ *
+ * @param mixed $identity
+ * @return AbstractAdpter
+ */
+ public function setIdentity($identity)
+ {
+ $this->identity = $identity;
+
+ return $this;
+ }
+}
@@ -3,18 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_Authentication
*/
namespace Zend\Authentication\Adapter;
-/**
- * @category Zend
- * @package Zend_Authentication
- * @subpackage Adapter
- */
interface AdapterInterface
{
/**
Oops, something went wrong.

0 comments on commit a6c2618

Please sign in to comment.