Permalink
Browse files

Merge branch 'master' of https://github.com/zendframework/zf2

  • Loading branch information...
Jerry Saravia Jerry Saravia
Jerry Saravia authored and Jerry Saravia committed Oct 4, 2012
2 parents f73a3f7 + 1d12f86 commit 1f24eba776ddfb2382a3a40a5a175028ddd90797
Showing with 1,651 additions and 302 deletions.
  1. +1 −2 .travis.yml
  2. +2 −1 README.md
  3. +1 −1 library/Zend/Authentication/composer.json
  4. +1 −1 library/Zend/Barcode/composer.json
  5. +1 −1 library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
  6. +1 −1 library/Zend/Cache/composer.json
  7. +1 −1 library/Zend/Captcha/composer.json
  8. +1 −1 library/Zend/Code/composer.json
  9. +1 −1 library/Zend/Config/composer.json
  10. +1 −1 library/Zend/Console/composer.json
  11. +1 −1 library/Zend/Crypt/composer.json
  12. +6 −0 library/Zend/Db/Adapter/AdapterAwareInterface.php
  13. +6 −0 library/Zend/Db/Adapter/AdapterServiceFactory.php
  14. +62 −1 library/Zend/Db/Adapter/Driver/ConnectionInterface.php
  15. +16 −0 library/Zend/Db/Adapter/Driver/DriverInterface.php
  16. +8 −0 library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
  17. +20 −0 library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
  18. +9 −3 library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
  19. +19 −0 library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
  20. +21 −2 library/Zend/Db/Adapter/Driver/Mysqli/Result.php
  21. +8 −0 library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
  22. +33 −3 library/Zend/Db/Adapter/Driver/Pdo/Connection.php
  23. +7 −1 library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
  24. +11 −1 library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
  25. +24 −0 library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
  26. +79 −1 library/Zend/Db/Adapter/Driver/Pgsql/Result.php
  27. +19 −1 library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
  28. +47 −1 library/Zend/Db/Adapter/Driver/ResultInterface.php
  29. +8 −3 library/Zend/Db/Adapter/Driver/StatementInterface.php
  30. +59 −0 library/Zend/Db/Adapter/Platform/PlatformInterface.php
  31. +8 −4 library/Zend/Db/Adapter/StatementContainerInterface.php
  32. +2 −1 library/Zend/Db/Sql/Select.php
  33. +1 −1 library/Zend/Db/composer.json
  34. +1 −1 library/Zend/Debug/composer.json
  35. +3 −0 library/Zend/Di/ServiceLocator/Generator.php
  36. +1 −1 library/Zend/Di/composer.json
  37. +1 −1 library/Zend/Dom/composer.json
  38. +1 −1 library/Zend/Escaper/composer.json
  39. +1 −1 library/Zend/EventManager/composer.json
  40. +5 −3 library/Zend/Feed/composer.json
  41. +1 −1 library/Zend/File/PhpClassFile.php
  42. +1 −1 library/Zend/File/Transfer/Adapter/AbstractAdapter.php
  43. +1 −1 library/Zend/File/Transfer/Adapter/Http.php
  44. +1 −1 library/Zend/File/composer.json
  45. +1 −1 library/Zend/Filter/composer.json
  46. +2 −0 library/Zend/Form/Element/Collection.php
  47. +15 −1 library/Zend/Form/Element/File.php
  48. +2 −2 library/Zend/Form/Element/MultiCheckbox.php
  49. +14 −1 library/Zend/Form/Element/Password.php
  50. +11 −2 library/Zend/Form/Element/Select.php
  51. +32 −23 library/Zend/Form/Form.php
  52. +2 −1 library/Zend/Form/View/Helper/FormCollection.php
  53. +3 −3 library/Zend/Form/View/Helper/FormRow.php
  54. +1 −1 library/Zend/Form/composer.json
  55. +8 −4 library/Zend/Http/Client/Adapter/Curl.php
  56. +1 −1 library/Zend/Http/Header/SetCookie.php
  57. +1 −1 library/Zend/Http/composer.json
  58. +2 −1 library/Zend/I18n/composer.json
  59. +1 −1 library/Zend/InputFilter/Input.php
  60. +1 −1 library/Zend/InputFilter/composer.json
  61. +1 −1 library/Zend/Json/composer.json
  62. +1 −1 library/Zend/Ldap/composer.json
  63. +6 −4 library/Zend/Loader/AutoloaderFactory.php
  64. +1 −1 library/Zend/Loader/ClassMapAutoloader.php
  65. +10 −10 library/Zend/Loader/ModuleAutoloader.php
  66. +1 −1 library/Zend/Loader/PluginClassLoader.php
  67. +1 −1 library/Zend/Loader/PluginClassLocator.php
  68. +2 −2 library/Zend/Loader/StandardAutoloader.php
  69. +1 −1 library/Zend/Loader/composer.json
  70. +10 −0 library/Zend/Log/Writer/FirePhp.php
  71. +1 −1 library/Zend/Log/composer.json
  72. +1 −1 library/Zend/Mail/composer.json
  73. +1 −1 library/Zend/Math/composer.json
  74. +1 −1 library/Zend/Memory/composer.json
  75. +1 −1 library/Zend/Mime/composer.json
  76. +6 −2 library/Zend/ModuleManager/Listener/ConfigListener.php
  77. +6 −1 library/Zend/ModuleManager/ModuleManager.php
  78. +1 −1 library/Zend/ModuleManager/composer.json
  79. +109 −88 library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
  80. +1 −1 library/Zend/Mvc/composer.json
  81. +1 −1 library/Zend/Navigation/composer.json
  82. +1 −1 library/Zend/Paginator/composer.json
  83. +1 −1 library/Zend/Permissions/Acl/composer.json
  84. +1 −1 library/Zend/ProgressBar/composer.json
  85. +1 −1 library/Zend/Serializer/composer.json
  86. +1 −1 library/Zend/Server/composer.json
  87. +21 −0 library/Zend/ServiceManager/AbstractFactoryInterface.php
  88. +58 −0 library/Zend/ServiceManager/Config.php
  89. +10 −0 library/Zend/ServiceManager/ConfigInterface.php
  90. +2 −0 library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
  91. +6 −0 library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php
  92. +4 −0 library/Zend/ServiceManager/Di/DiServiceFactory.php
  93. +4 −0 library/Zend/ServiceManager/Di/DiServiceInitializer.php
  94. +2 −1 library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
  95. +5 −0 library/Zend/ServiceManager/Exception/ExceptionInterface.php
  96. +3 −3 library/Zend/ServiceManager/Exception/InvalidArgumentException.php
  97. +7 −1 library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
  98. +2 −1 library/Zend/ServiceManager/Exception/RuntimeException.php
  99. +2 −1 library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
  100. +2 −1 library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
  101. +10 −0 library/Zend/ServiceManager/FactoryInterface.php
  102. +11 −0 library/Zend/ServiceManager/InitializerInterface.php
  103. +15 −0 library/Zend/ServiceManager/ServiceLocatorAwareInterface.php
  104. +20 −0 library/Zend/ServiceManager/ServiceLocatorInterface.php
  105. +42 −6 library/Zend/ServiceManager/ServiceManager.php
  106. +9 −0 library/Zend/ServiceManager/ServiceManagerAwareInterface.php
  107. +1 −1 library/Zend/ServiceManager/composer.json
  108. +1 −1 library/Zend/Session/Container.php
  109. +1 −1 library/Zend/Session/composer.json
  110. +1 −1 library/Zend/Soap/composer.json
  111. +11 −0 library/Zend/Stdlib/DispatchableInterface.php
  112. +3 −9 library/Zend/Stdlib/Hydrator/ClassMethods.php
  113. +1 −1 library/Zend/Stdlib/composer.json
  114. +1 −1 library/Zend/Tag/composer.json
  115. +3 −2 library/Zend/Text/composer.json
  116. +1 −1 library/Zend/Uri/composer.json
  117. +5 −1 library/Zend/Validator/Date.php
  118. +1 −1 library/Zend/Validator/ValidatorPluginManager.php
  119. +2 −1 library/Zend/Validator/composer.json
  120. +1 −1 library/Zend/Version/Version.php
  121. +1 −1 library/Zend/Version/composer.json
  122. +6 −6 library/Zend/View/Helper/HeadLink.php
  123. +9 −3 library/Zend/View/Helper/HeadMeta.php
  124. +5 −9 library/Zend/View/Strategy/JsonStrategy.php
  125. +1 −1 library/Zend/View/composer.json
  126. +1 −1 library/Zend/XmlRpc/composer.json
  127. +35 −0 resources/languages/tr/Zend_Captcha.php
  128. +279 −0 resources/languages/tr/Zend_Validate.php
  129. +16 −0 tests/ZendTest/Cache/Storage/Adapter/MemcachedTest.php
  130. +26 −3 tests/ZendTest/Db/Sql/SelectTest.php
  131. +67 −6 tests/ZendTest/Form/FormTest.php
  132. +46 −0 tests/ZendTest/Form/View/Helper/FormRowTest.php
  133. +13 −1 tests/ZendTest/Http/Header/SetCookieTest.php
  134. +25 −0 tests/ZendTest/InputFilter/InputTest.php
  135. +2 −0 tests/ZendTest/Mail/Storage/MboxFolderTest.php
  136. +2 −0 tests/ZendTest/Mail/Storage/MboxTest.php
  137. +11 −0 tests/ZendTest/ServiceManager/ServiceManagerTest.php
  138. +30 −0 tests/ZendTest/ServiceManager/TestAsset/BarAbstractFactory.php
  139. +15 −14 tests/ZendTest/Stdlib/HydratorTest.php
  140. +4 −4 tests/ZendTest/View/Helper/HeadLinkTest.php
  141. +22 −0 tests/ZendTest/View/Strategy/JsonStrategyTest.php
View
@@ -7,8 +7,7 @@ php:
before_install:
- cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
- - curl -s https://getcomposer.org/installer | php -- --quiet
- - php composer.phar install --dev
+ - composer install --dev
- wget http://cs.sensiolabs.org/get/php-cs-fixer.phar
script:
View
@@ -1,6 +1,7 @@
### Welcome to the *Zend Framework 2.0* Release!
Master: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=master)](http://travis-ci.org/zendframework/zf2)
+Develop: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=develop)](http://travis-ci.org/zendframework/zf2)
## RELEASE INFORMATION
@@ -12,7 +13,7 @@ XX YYY 2012
### UPDATES IN 2.0.3
-Please see [CHANGELOG.md](CHANGELOG.md).
+Please see CHANGELOG.md.
### SYSTEM REQUIREMENTS
@@ -8,7 +8,7 @@
],
"autoload": {
"psr-0": {
- "Zend\\Authentication": ""
+ "Zend\\Authentication\\": ""
}
},
"target-dir": "Zend/Authentication",
@@ -8,7 +8,7 @@
],
"autoload": {
"psr-0": {
- "Zend\\Barcode": ""
+ "Zend\\Barcode\\": ""
}
},
"target-dir": "Zend/Barcode",
@@ -139,7 +139,7 @@ public function setLibOptions(array $libOptions)
}
$this->triggerOptionEvent('lib_options', $normalizedOptions);
- $this->libOptions = array_merge($this->libOptions, $normalizedOptions);
+ $this->libOptions = array_diff_key($this->libOptions, $normalizedOptions) + $normalizedOptions;
return $this;
}
@@ -8,7 +8,7 @@
],
"autoload": {
"psr-0": {
- "Zend\\Cache": ""
+ "Zend\\Cache\\": ""
}
},
"target-dir": "Zend/Cache",
@@ -8,7 +8,7 @@
],
"autoload": {
"psr-0": {
- "Zend\\Captcha": ""
+ "Zend\\Captcha\\": ""
}
},
"target-dir": "Zend/Captcha",
@@ -8,7 +8,7 @@
],
"autoload": {
"psr-0": {
- "Zend\\Code": ""
+ "Zend\\Code\\": ""
}
},
"target-dir": "Zend/Code",
@@ -8,7 +8,7 @@
],
"autoload": {
"psr-0": {
- "Zend\\Config": ""
+ "Zend\\Config\\": ""
}
},
"target-dir": "Zend/Config",
@@ -8,7 +8,7 @@
],
"autoload": {
"psr-0": {
- "Zend\\Console": ""
+ "Zend\\Console\\": ""
}
},
"target-dir": "Zend/Console",
@@ -8,7 +8,7 @@
],
"autoload": {
"psr-0": {
- "Zend\\Crypt": ""
+ "Zend\\Crypt\\": ""
}
},
"target-dir": "Zend/Crypt",
@@ -17,5 +17,11 @@
*/
interface AdapterAwareInterface
{
+ /**
+ * Set db adapter
+ *
+ * @param Adapter $adapter
+ * @return AdapterAwareInterface
+ */
public function setDbAdapter(Adapter $adapter);
}
@@ -20,6 +20,12 @@
*/
class AdapterServiceFactory implements FactoryInterface
{
+ /**
+ * Create db adapter service
+ *
+ * @param ServiceLocatorInterface $serviceLocator
+ * @return Adapter
+ */
public function createService(ServiceLocatorInterface $serviceLocator)
{
$config = $serviceLocator->get('Configuration');
@@ -17,14 +17,75 @@
*/
interface ConnectionInterface
{
+ /**
+ * Get current schema
+ *
+ * @return string
+ */
public function getCurrentSchema();
+
+ /**
+ * Get resource
+ *
+ * @return mixed
+ */
public function getResource();
+
+ /**
+ * Connect
+ *
+ * @return ConnectionInterface
+ */
public function connect();
+
+ /**
+ * Is connected
+ *
+ * @return bool
+ */
public function isConnected();
+
+ /**
+ * Disconnect
+ *
+ * @return ConnectionInterface
+ */
public function disconnect();
+
+ /**
+ * Begin transaction
+ *
+ * @return ConnectionInterface
+ */
public function beginTransaction();
+
+ /**
+ * Commit
+ *
+ * @return ConnectionInterface
+ */
public function commit();
+
+ /**
+ * Rollback
+ *
+ * @return ConnectionInterface
+ */
public function rollback();
- public function execute($sql); // return result set
+
+ /**
+ * Execute
+ *
+ * @param string $sql
+ * @return ResultInterface
+ */
+ public function execute($sql);
+
+ /**
+ * Get last generated id
+ *
+ * @param null $name Ignored
+ * @return integer
+ */
public function getLastGeneratedValue($name = null);
}
@@ -23,46 +23,62 @@
const NAME_FORMAT_NATURAL = 'natural';
/**
+ * Get database platform name
+ *
* @param string $nameFormat
* @return string
*/
public function getDatabasePlatformName($nameFormat = self::NAME_FORMAT_CAMELCASE);
/**
+ * Check environment
+ *
* @return bool
*/
public function checkEnvironment();
/**
+ * Get connection
+ *
* @return ConnectionInterface
*/
public function getConnection();
/**
+ * Create statement
+ *
* @param string|resource $sqlOrResource
* @return StatementInterface
*/
public function createStatement($sqlOrResource = null);
/**
+ * Create result
+ *
* @param resource $resource
* @return ResultInterface
*/
public function createResult($resource);
/**
+ * Get prepare type
+ *
* @return array
*/
public function getPrepareType();
/**
+ * Format parameter name
+ *
* @param string $name
* @param mixed $type
* @return string
*/
public function formatParameterName($name, $type = null);
/**
+ * Get last generated value
+ *
* @return mixed
*/
public function getLastGeneratedValue();
@@ -26,13 +26,21 @@
protected $driver = null;
/**
+ * Set driver
+ *
* @param DriverInterface $driver
+ * @return void
*/
public function setDriver(DriverInterface $driver)
{
$this->driver = $driver;
}
+ /**
+ * Get name
+ *
+ * @return string
+ */
abstract public function getName();
}
@@ -17,7 +17,27 @@
*/
interface DriverFeatureInterface
{
+ /**
+ * Setup the default features for Pdo
+ *
+ * @return DriverFeatureInterface
+ */
public function setupDefaultFeatures();
+
+ /**
+ * Add feature
+ *
+ * @param string $name
+ * @param mixed $feature
+ * @return DriverFeatureInterface
+ */
public function addFeature($name, $feature);
+
+ /**
+ * Get feature
+ *
+ * @param $name
+ * @return mixed|false
+ */
public function getFeature($name);
}
@@ -138,7 +138,7 @@ public function getResource()
* Connect
*
* @throws Exception\RuntimeException
- * @return null
+ * @return void
*/
public function connect()
{
@@ -156,7 +156,7 @@ public function connect()
return $p[$name];
}
}
- return null;
+ return;
};
$hostname = $findParameterValue(array('hostname', 'host'));
@@ -185,7 +185,7 @@ public function connect()
/**
* Is connected
*
- * @return boolean
+ * @return bool
*/
public function isConnected()
{
@@ -194,6 +194,8 @@ public function isConnected()
/**
* Disconnect
+ *
+ * @return void
*/
public function disconnect()
{
@@ -205,6 +207,8 @@ public function disconnect()
/**
* Begin transaction
+ *
+ * @return void
*/
public function beginTransaction()
{
@@ -218,6 +222,8 @@ public function beginTransaction()
/**
* Commit
+ *
+ * @return void
*/
public function commit()
{
Oops, something went wrong.

0 comments on commit 1f24eba

Please sign in to comment.