Merge pull request #190 from symfony-cmf/prepare-1.3

dbu · dbu · commit 2795f93d0a0d · 2016-03-31T11:52:13.000+02:00
prepare for 1.3 release
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ env:
 matrix:
   include:
     - php: 5.6
-      env: DEPS=dev
+      env: DEPS=dev SYMFONY_VERSION=2.8.*
     - php: 5.3
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 Changelog
 =========
+1.3.0
+-----
 
 1.3.0-RC1
 ---------
diff --git a/PublishWorkflow/AlwaysPublishedWorkflowChecker.php b/PublishWorkflow/AlwaysPublishedWorkflowChecker.php
@@ -26,8 +26,6 @@
  */
 class AlwaysPublishedWorkflowChecker implements SecurityContextInterface
 {
-    /**
-     */
     public function getToken()
     {
         return;
diff --git a/composer.json b/composer.json
@@ -14,13 +14,13 @@
     "require": {
         "php": "^5.3.9|^7.0",
         "symfony/framework-bundle": "^2.3",
-        "symfony-cmf/slugifier-api": "^1.0@rc"
+        "symfony-cmf/slugifier-api": "^1.0"
     },
     "require-dev": {
         "symfony/security-bundle": "^2.1",
         "mockery/mockery": "^0.9.4",
-        "symfony-cmf/routing-bundle": "^1.2.0-RC3",
-        "symfony-cmf/testing": "^1.3@dev",
+        "symfony-cmf/routing-bundle": "^1.2",
+        "symfony-cmf/testing": "^1.3",
         "sonata-project/admin-bundle": "^2.2",
         "doctrine/dbal": "2.5.*"
     },

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@`
`26`	`26`	`*/`
`27`	`27`	`class AlwaysPublishedWorkflowChecker implements SecurityContextInterface`
`28`	`28`	`{`
`29`		`- /**`
`30`		`- */`
`31`	`29`	`public function getToken()`
`32`	`30`	`{`
`33`	`31`	`return;`