Adds some wrapping around

heiglandreas · Mar 21, 2017 · 73f9c57 · 73f9c57
1 parent 62a039b
commit 73f9c57
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 13 deletions.
diff --git a/src/Calculator/WordsWithNSyllablesOnlyPercentCalculator.php b/src/Calculator/WordsWithNSyllablesOnlyPercentCalculator.php
@@ -35,8 +35,10 @@ class WordsWithNSyllablesOnlyPercentCalculator implements CalculatorInterface
 
     protected $wordCounter;
 
-    public function __construct(WordsWithNSyllablesOnlyCounter $wordsWithNSyllablesOnlyCounter, WordCounter $wordCounter)
-    {
+    public function __construct(
+        WordsWithNSyllablesOnlyCounter $wordsWithNSyllablesOnlyCounter,
+        WordCounter $wordCounter
+    ) {
         $this->wordsWithNSyllablesOnlyCounter = $wordsWithNSyllablesOnlyCounter;
         $this->wordCounter = $wordCounter;
     }

diff --git a/src/Service/WienerSachtextFormel1CalculatorFactory.php b/src/Service/WienerSachtextFormel1CalculatorFactory.php
@@ -40,10 +40,16 @@ class WienerSachtextFormel1CalculatorFactory
     public static function getCalculator()
     {
         return new WienerSachtextFormel1Calculator(
-            new WordsWithNSyllablesPercentCalculator(WordsWithNSyllablesCounterFactory::getCalculator('de_DE', 3), WordCounterFactory::getCalculator()),
+            new WordsWithNSyllablesPercentCalculator(
+                WordsWithNSyllablesCounterFactory::getCalculator('de_DE', 3),
+                WordCounterFactory::getCalculator()
+            ),
             new AverageSentenceLengthCalculator(WordCounterFactory::getCalculator(), new SentenceCounter()),
             new WordsWithNCharsPercentCalculator(new WordsWithNCharsCounter(6), WordCounterFactory::getCalculator()),
-            new WordsWithNSyllablesOnlyPercentCalculator(WordsWithNSyllablesOnlyCounterFactory::getCalculator('de_DE', 1), WordCounterFactory::getCalculator())
+            new WordsWithNSyllablesOnlyPercentCalculator(
+                WordsWithNSyllablesOnlyCounterFactory::getCalculator('de_DE', 1),
+                WordCounterFactory::getCalculator()
+            )
         );
     }
 }
diff --git a/src/Service/WienerSachtextFormel2CalculatorFactory.php b/src/Service/WienerSachtextFormel2CalculatorFactory.php
@@ -39,7 +39,10 @@ class WienerSachtextFormel2CalculatorFactory
     public static function getCalculator()
     {
         return new WienerSachtextFormel2Calculator(
-            new WordsWithNSyllablesPercentCalculator(WordsWithNSyllablesCounterFactory::getCalculator('de_DE', 3), WordCounterFactory::getCalculator()),
+            new WordsWithNSyllablesPercentCalculator(
+                WordsWithNSyllablesCounterFactory::getCalculator('de_DE', 3),
+                WordCounterFactory::getCalculator()
+            ),
             new AverageSentenceLengthCalculator(WordCounterFactory::getCalculator(), new SentenceCounter()),
             new WordsWithNCharsPercentCalculator(new WordsWithNCharsCounter(6), WordCounterFactory::getCalculator())
         );

diff --git a/src/Service/WienerSachtextFormel3CalculatorFactory.php b/src/Service/WienerSachtextFormel3CalculatorFactory.php
@@ -37,7 +37,10 @@ class WienerSachtextFormel3CalculatorFactory
     public static function getCalculator()
     {
         return new WienerSachtextFormel3Calculator(
-            new WordsWithNSyllablesPercentCalculator(WordsWithNSyllablesCounterFactory::getCalculator('de_DE', 3), new WordCounter()),
+            new WordsWithNSyllablesPercentCalculator(
+                WordsWithNSyllablesCounterFactory::getCalculator('de_DE', 3),
+                new WordCounter()
+            ),
             new AverageSentenceLengthCalculator(new WordCounter(), new SentenceCounter())
         );
     }

diff --git a/src/Service/WienerSachtextFormel4CalculatorFactory.php b/src/Service/WienerSachtextFormel4CalculatorFactory.php
@@ -37,7 +37,10 @@ class WienerSachtextFormel4CalculatorFactory
     public static function getCalculator()
     {
         return new WienerSachtextFormel4Calculator(
-            new WordsWithNSyllablesPercentCalculator(WordsWithNSyllablesCounterFactory::getCalculator('de_DE', 3), new WordCounter()),
+            new WordsWithNSyllablesPercentCalculator(
+                WordsWithNSyllablesCounterFactory::getCalculator('de_DE', 3),
+                new WordCounter()
+            ),
             new AverageSentenceLengthCalculator(new WordCounter(), new SentenceCounter())
         );
     }

diff --git a/src/Util/SyllableFilter.php b/src/Util/SyllableFilter.php
@@ -84,7 +84,7 @@ public function run(t\TokenRegistry $tokens)
      *
      * @return mixed
      */
-    protected function _concatenate(t\TokenRegistry $tokens)
+    protected function _concatenate(t\TokenRegistry $tokens) // @codingStandardsIgnoreLine
     {
         $syllables = [];
         foreach ($tokens as $token) {

diff --git a/src/Util/WordsWithNSyllablesFilter.php b/src/Util/WordsWithNSyllablesFilter.php
@@ -94,7 +94,7 @@ public function run(t\TokenRegistry $tokens)
      *
      * @return mixed
      */
-    protected function _concatenate(t\TokenRegistry $tokens)
+    protected function _concatenate(t\TokenRegistry $tokens) // @codingStandardsIgnoreLine
     {
         $wordsWithNSyllables = [];
         foreach ($tokens as $token) {

diff --git a/src/Util/WordsWithNSyllablesOnlyFilter.php b/src/Util/WordsWithNSyllablesOnlyFilter.php
@@ -94,7 +94,7 @@ public function run(t\TokenRegistry $tokens)
      *
      * @return mixed
      */
-    protected function _concatenate(t\TokenRegistry $tokens)
+    protected function _concatenate(t\TokenRegistry $tokens) // @codingStandardsIgnoreLine
     {
         $wordsWithNSyllables = [];
         foreach ($tokens as $token) {

diff --git a/tests/Calculator/CharacterWithoutWhitespaceCounterTest.php b/tests/Calculator/CharacterWithoutWhitespaceCounterTest.php
@@ -40,7 +40,11 @@ class CharacterWithoutWhitespaceCounterTest extends \PHPUnit_Framework_TestCase
 {
     public function testThatCountingcharactersWorksWithoutWhitespace()
     {
-        $text = new Text('Dieser text' . "\t" . 'enthält die ein oder andere Silbe des Donaudampfschifffahrtskapitäns');
+        $text = new Text(
+            'Dieser text' .
+            "\t" .
+            'enthält die ein oder andere Silbe des Donaudampfschifffahrtskapitäns'
+        );
 
         $calculator = new CharacterWithoutWhitespaceCounter();
 

diff --git a/tests/Calculator/FleschReadingEaseCalculatorGermanTest.php b/tests/Calculator/FleschReadingEaseCalculatorGermanTest.php
@@ -45,7 +45,10 @@ public function testThatReadingEaseIsCalculatedProperly()
 
         $text = new Text('Dieser text enthält die ein oder andere Silbe des Donaudampfschifffahrtskapitäns');
 
-        $fleshReadingEaseCalculator = new FleschReadingEaseCalculatorGerman($averageSentenceLengthCalculator, $averageSyllablesPerWordCalculator);
+        $fleshReadingEaseCalculator = new FleschReadingEaseCalculatorGerman(
+            $averageSentenceLengthCalculator,
+            $averageSyllablesPerWordCalculator
+        );
 
         $this->assertEquals(87, (int) $fleshReadingEaseCalculator->calculate($text));
     }

diff --git a/tests/Calculator/FleschReadingEaseCalculatorTest.php b/tests/Calculator/FleschReadingEaseCalculatorTest.php
@@ -45,7 +45,10 @@ public function testThatReadingEaseIsCalculatedProperly()
 
         $text = new Text('Dieser text enthält die ein oder andere Silbe des Donaudampfschifffahrtskapitäns');
 
-        $fleshReadingEaseCalculator = new FleschReadingEaseCalculator($averageSentenceLengthCalculator, $averageSyllablesPerWordCalculator);
+        $fleshReadingEaseCalculator = new FleschReadingEaseCalculator(
+            $averageSentenceLengthCalculator,
+            $averageSyllablesPerWordCalculator
+        );
 
         $this->assertEquals(74, (int) $fleshReadingEaseCalculator->calculate($text));
     }