Merge branch '4.4' into 5.0

javiereguiluz · javiereguiluz · commit c550130e69dc · 2020-04-20T09:37:21.000+02:00
* 4.4:
  [Workflow] Replace has_role by is_granted
  [Console] Return an integer with the exit status as the result
diff --git a/components/console/helpers/questionhelper.rst b/components/console/helpers/questionhelper.rst
@@ -40,7 +40,7 @@ the following to your command::
             $question = new ConfirmationQuestion('Continue with this action?', false);
 
             if (!$helper->ask($input, $output, $question)) {
-                return;
+                return 0;
             }
         }
     }
diff --git a/workflow.rst b/workflow.rst
@@ -541,7 +541,7 @@ transition. The value of this option is any valid expression created with the
 
                     <framework:transition name="reject">
                         <!-- or any valid expression language with "subject" referring to the post -->
-                        <framework:guard>has_role("ROLE_ADMIN") and subject.isStatusReviewed()</framework:guard>
+                        <framework:guard>is_granted("ROLE_ADMIN") and subject.isStatusReviewed()</framework:guard>
                         <framework:from>reviewed</framework:from>
                         <framework:to>rejected</framework:to>
                     </framework:transition>
@@ -576,7 +576,7 @@ transition. The value of this option is any valid expression created with the
                         ],
                         'reject' => [
                             // or any valid expression language with "subject" referring to the post
-                            'guard' => 'has_role("ROLE_ADMIN") and subject.isStatusReviewed()',
+                            'guard' => 'is_granted("ROLE_ADMIN") and subject.isStatusReviewed()',
                             'from' => 'reviewed',
                             'to' => 'rejected',
                         ],

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ the following to your command::`
`40`	`40`	`$question = new ConfirmationQuestion('Continue with this action?', false);`
`41`	`41`
`42`	`42`	`if (!$helper->ask($input, $output, $question)) {`
`43`		`- return;`
	`43`	`+ return 0;`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`