Skip to content

Commit 3a60b52

Browse files
deadbeef84deadbeef84
committed
Release 1.12.10
1 parent 9453caa commit 3a60b52

29 files changed

+213
-170
lines changed

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2005-2014, Zend Technologies USA, Inc.
1+
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

‎library/Zend/Application.php‎

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Application
17-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
* @version $Id$
2020
*/
2121

2222
/**
2323
* @category Zend
2424
* @package Zend_Application
25-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
25+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
2626
* @license http://framework.zend.com/license/new-bsd New BSD License
2727
*/
2828
class Zend_Application
@@ -86,7 +86,10 @@ public function __construct($environment, $options = null)
8686
} elseif ($options instanceof Zend_Config) {
8787
$options = $options->toArray();
8888
} elseif (!is_array($options)) {
89-
throw new Zend_Application_Exception('Invalid options provided; must be location of config file, a config object, or an array');
89+
throw new Zend_Application_Exception(
90+
'Invalid options provided; must be location of config file,'
91+
. ' a config object, or an array'
92+
);
9093
}
9194

9295
$this->setOptions($options);
@@ -127,11 +130,15 @@ public function setOptions(array $options)
127130
if (is_array($options['config'])) {
128131
$_options = array();
129132
foreach ($options['config'] as $tmp) {
130-
$_options = $this->mergeOptions($_options, $this->_loadConfig($tmp));
133+
$_options = $this->mergeOptions(
134+
$_options, $this->_loadConfig($tmp)
135+
);
131136
}
132137
$options = $this->mergeOptions($_options, $options);
133138
} else {
134-
$options = $this->mergeOptions($this->_loadConfig($options['config']), $options);
139+
$options = $this->mergeOptions(
140+
$this->_loadConfig($options['config']), $options
141+
);
135142
}
136143
}
137144

@@ -171,7 +178,9 @@ public function setOptions(array $options)
171178
$this->setBootstrap($bootstrap);
172179
} elseif (is_array($bootstrap)) {
173180
if (empty($bootstrap['path'])) {
174-
throw new Zend_Application_Exception('No bootstrap path provided');
181+
throw new Zend_Application_Exception(
182+
'No bootstrap path provided'
183+
);
175184
}
176185

177186
$path = $bootstrap['path'];
@@ -183,7 +192,9 @@ public function setOptions(array $options)
183192

184193
$this->setBootstrap($path, $class);
185194
} else {
186-
throw new Zend_Application_Exception('Invalid bootstrap information provided');
195+
throw new Zend_Application_Exception(
196+
'Invalid bootstrap information provided'
197+
);
187198
}
188199
}
189200

@@ -319,13 +330,18 @@ public function setBootstrap($path, $class = null)
319330
if (!class_exists($class, false)) {
320331
require_once $path;
321332
if (!class_exists($class, false)) {
322-
throw new Zend_Application_Exception('Bootstrap class not found');
333+
throw new Zend_Application_Exception(
334+
'Bootstrap class not found'
335+
);
323336
}
324337
}
325338
$this->_bootstrap = new $class($this);
326339

327340
if (!$this->_bootstrap instanceof Zend_Application_Bootstrap_Bootstrapper) {
328-
throw new Zend_Application_Exception('Bootstrap class does not implement Zend_Application_Bootstrap_Bootstrapper');
341+
throw new Zend_Application_Exception(
342+
'Bootstrap class does not implement'
343+
. ' Zend_Application_Bootstrap_Bootstrapper'
344+
);
329345
}
330346

331347
return $this;
@@ -403,13 +419,18 @@ protected function _loadConfig($file)
403419
case 'inc':
404420
$config = include $file;
405421
if (!is_array($config)) {
406-
throw new Zend_Application_Exception('Invalid configuration file provided; PHP file does not return array value');
422+
throw new Zend_Application_Exception(
423+
'Invalid configuration file provided; PHP file does not'
424+
. ' return array value'
425+
);
407426
}
408427
return $config;
409428
break;
410429

411430
default:
412-
throw new Zend_Application_Exception('Invalid configuration file provided; unknown config type');
431+
throw new Zend_Application_Exception(
432+
'Invalid configuration file provided; unknown config type'
433+
);
413434
}
414435

415436
return $config->toArray();

‎library/Zend/Application/Bootstrap/Bootstrap.php‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Application
1717
* @subpackage Bootstrap
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -34,7 +34,7 @@
3434
* @category Zend
3535
* @package Zend_Application
3636
* @subpackage Bootstrap
37-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
37+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3838
* @license http://framework.zend.com/license/new-bsd New BSD License
3939
*/
4040
class Zend_Application_Bootstrap_Bootstrap
@@ -64,9 +64,13 @@ public function __construct($application)
6464
parent::__construct($application);
6565

6666
if ($application->hasOption('resourceloader')) {
67-
$this->setOptions(array(
68-
'resourceloader' => $application->getOption('resourceloader')
69-
));
67+
$this->setOptions(
68+
array(
69+
'resourceloader' => $application->getOption(
70+
'resourceloader'
71+
)
72+
)
73+
);
7074
}
7175
$this->getResourceLoader();
7276

@@ -128,10 +132,14 @@ public function getResourceLoader()
128132
) {
129133
$r = new ReflectionClass($this);
130134
$path = $r->getFileName();
131-
$this->setResourceLoader(new Zend_Application_Module_Autoloader(array(
132-
'namespace' => $namespace,
133-
'basePath' => dirname($path),
134-
)));
135+
$this->setResourceLoader(
136+
new Zend_Application_Module_Autoloader(
137+
array(
138+
'namespace' => $namespace,
139+
'basePath' => dirname($path),
140+
)
141+
)
142+
);
135143
}
136144
return $this->_resourceLoader;
137145
}

‎library/Zend/Application/Bootstrap/BootstrapAbstract.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Application
1717
* @subpackage Bootstrap
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -38,7 +38,7 @@
3838
* @category Zend
3939
* @package Zend_Application
4040
* @subpackage Bootstrap
41-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
41+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
4242
* @license http://framework.zend.com/license/new-bsd New BSD License
4343
*/
4444
abstract class Zend_Application_Bootstrap_BootstrapAbstract

‎library/Zend/Application/Bootstrap/Bootstrapper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Application
1717
* @subpackage Bootstrap
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -26,7 +26,7 @@
2626
* @category Zend
2727
* @package Zend_Application
2828
* @subpackage Bootstrap
29-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
29+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3030
* @license http://framework.zend.com/license/new-bsd New BSD License
3131
*/
3232
interface Zend_Application_Bootstrap_Bootstrapper

‎library/Zend/Application/Bootstrap/Exception.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Application
17-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
* @version $Id$
2020
*/
@@ -30,7 +30,7 @@
3030
* @category Zend
3131
* @package Zend_Application
3232
* @uses Zend_Application_Exception
33-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3434
* @license http://framework.zend.com/license/new-bsd New BSD License
3535
*/
3636
class Zend_Application_Bootstrap_Exception extends Zend_Application_Exception

‎library/Zend/Application/Bootstrap/ResourceBootstrapper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Application
1717
* @subpackage Bootstrap
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -26,7 +26,7 @@
2626
* @category Zend
2727
* @package Zend_Application
2828
* @subpackage Bootstrap
29-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
29+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3030
* @license http://framework.zend.com/license/new-bsd New BSD License
3131
*/
3232
interface Zend_Application_Bootstrap_ResourceBootstrapper

‎library/Zend/Application/Exception.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Application
17-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
* @version $Id$
2020
*/
@@ -30,7 +30,7 @@
3030
* @uses Zend_Exception
3131
* @category Zend
3232
* @package Zend_Application
33-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3434
* @license http://framework.zend.com/license/new-bsd New BSD License
3535
*/
3636
class Zend_Application_Exception extends Zend_Exception

‎library/Zend/Application/Module/Autoloader.php‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Application
1717
* @subpackage Module
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @version $Id$
2020
* @license http://framework.zend.com/license/new-bsd New BSD License
2121
*/
@@ -30,7 +30,7 @@
3030
* @category Zend
3131
* @package Zend_Application
3232
* @subpackage Module
33-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3434
* @license http://framework.zend.com/license/new-bsd New BSD License
3535
*/
3636
class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource
@@ -54,40 +54,42 @@ public function __construct($options)
5454
public function initDefaultResourceTypes()
5555
{
5656
$basePath = $this->getBasePath();
57-
$this->addResourceTypes(array(
58-
'dbtable' => array(
59-
'namespace' => 'Model_DbTable',
60-
'path' => 'models/DbTable',
61-
),
62-
'mappers' => array(
63-
'namespace' => 'Model_Mapper',
64-
'path' => 'models/mappers',
65-
),
66-
'form' => array(
67-
'namespace' => 'Form',
68-
'path' => 'forms',
69-
),
70-
'model' => array(
71-
'namespace' => 'Model',
72-
'path' => 'models',
73-
),
74-
'plugin' => array(
75-
'namespace' => 'Plugin',
76-
'path' => 'plugins',
77-
),
78-
'service' => array(
79-
'namespace' => 'Service',
80-
'path' => 'services',
81-
),
82-
'viewhelper' => array(
83-
'namespace' => 'View_Helper',
84-
'path' => 'views/helpers',
85-
),
86-
'viewfilter' => array(
87-
'namespace' => 'View_Filter',
88-
'path' => 'views/filters',
89-
),
90-
));
57+
$this->addResourceTypes(
58+
array(
59+
'dbtable' => array(
60+
'namespace' => 'Model_DbTable',
61+
'path' => 'models/DbTable',
62+
),
63+
'mappers' => array(
64+
'namespace' => 'Model_Mapper',
65+
'path' => 'models/mappers',
66+
),
67+
'form' => array(
68+
'namespace' => 'Form',
69+
'path' => 'forms',
70+
),
71+
'model' => array(
72+
'namespace' => 'Model',
73+
'path' => 'models',
74+
),
75+
'plugin' => array(
76+
'namespace' => 'Plugin',
77+
'path' => 'plugins',
78+
),
79+
'service' => array(
80+
'namespace' => 'Service',
81+
'path' => 'services',
82+
),
83+
'viewhelper' => array(
84+
'namespace' => 'View_Helper',
85+
'path' => 'views/helpers',
86+
),
87+
'viewfilter' => array(
88+
'namespace' => 'View_Filter',
89+
'path' => 'views/filters',
90+
),
91+
)
92+
);
9193
$this->setDefaultResourceType('model');
9294
}
9395
}

‎library/Zend/Application/Module/Bootstrap.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Application
1717
* @subpackage Module
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @version $Id$
2020
* @license http://framework.zend.com/license/new-bsd New BSD License
2121
*/
@@ -33,7 +33,7 @@
3333
* @category Zend
3434
* @package Zend_Application
3535
* @subpackage Module
36-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
36+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3737
* @license http://framework.zend.com/license/new-bsd New BSD License
3838
*/
3939
abstract class Zend_Application_Module_Bootstrap

0 commit comments

Comments
 (0)