Merge pull request #95 from BedrockStreaming/fix/cast-string

BedrockStreaming · Aug 9, 2023 · 658a73e · 658a73e
2 parents c00c1f3 + 53a23b1
commit 658a73e
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 36 deletions.
diff --git a/src/Client/Client.php b/src/Client/Client.php
@@ -138,8 +138,6 @@ public function handleEvent($event, $name = null)
      * @param Event  $event
      * @param string $method
      *
-     * @return mixed
-     *
      * @throws Exception
      */
     private function getEventValue($event, $method)
@@ -187,7 +185,7 @@ private function replaceConfigPlaceholder($event, $eventName, $string)
         if ((preg_match_all('/<([^>]*)>/', $string, $matches) > 0) and ($this->propertyAccessor !== null)) {
             $tokens = $matches[1];
             foreach ($tokens as $token) {
-                $value = $this->propertyAccessor->getValue($event, $token);
+                $value = (string) $this->propertyAccessor->getValue($event, $token);
                 $string = str_replace('<'.$token.'>', $value, $string);
             }
         }
@@ -198,7 +196,6 @@ private function replaceConfigPlaceholder($event, $eventName, $string)
     /**
      * Merge config tags with tags manually sent with the event
      *
-     * @param mixed $event
      * @param array $config
      *
      * @return array of tags

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -15,9 +15,6 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('m6_statsd');
@@ -100,8 +97,6 @@ private function addClientsSection($rootNode)
 
     /**
      * addDefaultEventSection
-     *
-     * @param mixed $rootNode
      */
     private function addDefaultEventSection($rootNode)
     {

diff --git a/src/DependencyInjection/M6WebStatsdExtension.php b/src/DependencyInjection/M6WebStatsdExtension.php
@@ -19,9 +19,6 @@
  */
 class M6WebStatsdExtension extends Extension
 {
-    /**
-     * {@inheritDoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();

diff --git a/src/Event/ConsoleCommandEvent.php b/src/Event/ConsoleCommandEvent.php
@@ -12,9 +12,6 @@
  */
 class ConsoleCommandEvent extends ConsoleEvent
 {
-    /**
-     * {@inheritDoc}
-     */
     protected static function support(BaseConsoleEvent $e)
     {
         return $e instanceof BaseEvent;

diff --git a/src/Event/ConsoleErrorEvent.php b/src/Event/ConsoleErrorEvent.php
@@ -12,9 +12,6 @@
  */
 class ConsoleErrorEvent extends ConsoleEvent
 {
-    /**
-     * {@inheritDoc}
-     */
     protected static function support(BaseConsoleEvent $e)
     {
         return $e instanceof BaseEvent;

diff --git a/src/Event/ConsoleEvent.php b/src/Event/ConsoleEvent.php
@@ -54,8 +54,6 @@ final public function __construct(BaseConsoleEvent $originalEvent, $startTime =
      *
      * @param string $name
      * @param array  $parameters
-     *
-     * @return mixed
      */
     public function __call($name, $parameters)
     {

diff --git a/src/Event/ConsoleTerminateEvent.php b/src/Event/ConsoleTerminateEvent.php
@@ -12,9 +12,6 @@
  */
 class ConsoleTerminateEvent extends ConsoleEvent
 {
-    /**
-     * {@inheritDoc}
-     */
     protected static function support(BaseConsoleEvent $e)
     {
         return $e instanceof BaseEvent;

diff --git a/src/Listener/ConsoleListener.php b/src/Listener/ConsoleListener.php
@@ -15,15 +15,21 @@
  */
 class ConsoleListener
 {
-    /** @var EventDispatcherInterface */
-    protected $eventDispatcher = null;
+    /** @var ?EventDispatcherInterface */
+    protected $eventDispatcher;
 
     /**
      * Time when command started
      *
-     * @var float
+     * @var ?float
      */
-    protected $startTime = null;
+    protected $startTime;
+
+    public function __construct()
+    {
+        $this->startTime = null;
+        $this->eventDispatcher = null;
+    }
 
     /**
      * Define event dispatch

diff --git a/src/Statsd/MonitorableEventInterface.php b/src/Statsd/MonitorableEventInterface.php
@@ -11,8 +11,6 @@ interface MonitorableEventInterface
 {
     /**
      * the measured value
-     *
-     * @return mixed
      */
     public function getValue();
 

diff --git a/src/Statsd/StatsdEvent.php b/src/Statsd/StatsdEvent.php
@@ -13,8 +13,6 @@ class StatsdEvent extends GenericEvent implements MonitorableEventInterface
 {
     /**
      * getTiming
-     *
-     * @return mixed
      */
     public function getTiming()
     {
@@ -23,8 +21,6 @@ public function getTiming()
 
     /**
      * getValue
-     *
-     * @return mixed
      */
     public function getValue()
     {

diff --git a/src/Validator/Constraints/NodeValidator.php b/src/Validator/Constraints/NodeValidator.php
@@ -15,9 +15,6 @@
  */
 class NodeValidator extends ConstraintValidator
 {
-    /**
-     * {@inheritDoc}
-     */
     public function validate($value, Constraint $constraint)
     {
         if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,8 +11,6 @@ interface MonitorableEventInterface @@
     {
         /**
          * the measured value
-         *
-         * @return mixed
          */
         public function getValue();
@@ Expand Down @@