Merge pull request #48 from mikey179/master

upgrade to stubbles-core 3.4.0 and prepare release
stubbles · Jan 21, 2014 · 8e18726 · 8e18726
2 parents 2364bcd + 72afeda
commit 8e18726
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-2.3.3 (2013-12-??)
+2.4.0 (2014-01-21)
 ------------------
 
   * fixed #45 ParamBrokerMap should work with lowercase versions of built-in types as well

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "description": "Stubbles Input enables to handle input data via validation and filtering.",
     "require": {
         "php": ">=5.3.0",
-        "stubbles/core": "~3.1"
+        "stubbles/core": "~3.4"
     },
     "require-dev": {
         "mikey179/vfsStream": "~1.2",
@@ -20,7 +20,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3.x-dev"
+            "dev-master": "2.4.x-dev"
         }
     },
     "minimum-stability": "dev",

diff --git a/composer.lock b/composer.lock
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -1,3 +1,14 @@
+auxiliary.org-netbeans-modules-php-phpunit.bootstrap_2e_create_2e_tests=false
+auxiliary.org-netbeans-modules-php-phpunit.bootstrap_2e_enabled=true
+auxiliary.org-netbeans-modules-php-phpunit.bootstrap_2e_path=vendor/autoload.php
+auxiliary.org-netbeans-modules-php-phpunit.configuration_2e_enabled=true
+auxiliary.org-netbeans-modules-php-phpunit.configuration_2e_path=phpunit.xml.dist
+auxiliary.org-netbeans-modules-php-phpunit.customSuite_2e_enabled=false
+auxiliary.org-netbeans-modules-php-phpunit.customSuite_2e_path=
+auxiliary.org-netbeans-modules-php-phpunit.phpUnit_2e_enabled=false
+auxiliary.org-netbeans-modules-php-phpunit.phpUnit_2e_path=
+auxiliary.org-netbeans-modules-php-phpunit.test_2e_groups_2e_ask=false
+auxiliary.org-netbeans-modules-php-phpunit.test_2e_run_2e_all=false
 file.reference.docs-api=docs/api
 file.reference.src-test=vendor/stubbles/core/src/test
 file.reference.src-test-1=vendor/mikey179/vfsStream/src/test
@@ -8,15 +19,10 @@ ignore.path=\
 include.path=\
     ${php.global.include.path}
 php.version=PHP_53
-phpunit.bootstrap=vendor/autoload.php
-phpunit.bootstrap.create.tests=false
-phpunit.configuration=phpunit.xml.dist
-phpunit.run.test.files=false
-phpunit.suite=
-phpunit.test.groups.ask=false
 source.encoding=UTF-8
 src.dir=.
 tags.asp=false
 tags.short=true
 test.src.dir=src/test/php
+testing.providers=PhpUnit
 web.root=.
diff --git a/src/main/php/net/stubbles/input/error/PropertyBasedParamErrorMessages.php b/src/main/php/net/stubbles/input/error/PropertyBasedParamErrorMessages.php
@@ -55,7 +55,7 @@ public function __construct(ResourceLoader $resourceLoader)
      * @param   string  $locale
      * @return  PropertyBasedParamErrorMessages
      * @Inject(optional=true)
-     * @Named('net.stubbles.locale')
+     * @Property('net.stubbles.locale')
      */
     public function setLocale($locale)
     {

diff --git a/src/test/php/net/stubbles/input/error/PropertyBasedParamErrorMessagesTestCase.php b/src/test/php/net/stubbles/input/error/PropertyBasedParamErrorMessagesTestCase.php
@@ -214,9 +214,9 @@ public function annotationsPresentOnSetLocaleMethod()
         $setLocaleMethod = lang\reflect($this->errorMessages, 'setLocale');
         $this->assertTrue($setLocaleMethod->hasAnnotation('Inject'));
         $this->assertTrue($setLocaleMethod->getAnnotation('Inject')->isOptional());
-        $this->assertTrue($setLocaleMethod->hasAnnotation('Named'));
+        $this->assertTrue($setLocaleMethod->hasAnnotation('Property'));
         $this->assertEquals('net.stubbles.locale',
-                            $setLocaleMethod->getAnnotation('Named')->getName()
+                            $setLocaleMethod->getAnnotation('Property')->getValue()
         );
     }
 }