cycle / annotated

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.6.inc

Braces -1 removed lines

@@ -1,2 +1,1 @@
 <?php
-/** Why me?

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.4.inc

Braces -1 removed lines

@@ -1,2 +1,1 @@
 <?php
-/** Why me?
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.6.inc

Braces +1 added lines, -10 removed lines

@@ -22,13 +22,4 @@
  * merge conflict boundaries will still be detected correctly.
  */
 
-$string =
-		<<<"EOD"
-		Merge conflicts in PHP 7.3 indented heredocs
-<<<<<<< HEAD
-		can be problematic.
-=======
-		should also be detected.
->>>>>>> ref/heads/other-branchname
-		And now they are.
-		EOD;
+$string
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.3.inc

Braces +1 added lines, -19 removed lines

@@ -22,22 +22,4 @@
 <<<<<<< HEAD
 $a = 1;
 =======
-$a = 2;
->>>>>>> master
-
-/*
- * The above tests are based on "normal" tokens.
- * The below test checks that once the tokenizer breaks down because of
- * unexpected merge conflict boundaries - i.e. after the first merge conflict
- * opener in non-comment, non-heredoc/nowdoc, non-inline HTML code -, subsequent
- * merge conflict boundaries will still be detected correctly.
- */
-?>
-
-<div class="abc">
-<<<<<<< HEAD
-	<p id="test-this">Testing a merge conflict.</p>
-=======
-	<p id="test-that">Another text string.</p>
->>>>>>> ref/heads/feature-branch
-</div>
+$a
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.2.inc

Braces -5 removed lines

@@ -24,8 +24,3 @@
 
 // Comment
 <<<<<<< HEAD
-// Second comment line. NOTE: The above opener breaks the tokenizer.
-=======
-// New second comment line
->>>>>>> master
-// Third comment line

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.4.inc

Braces +1 added lines, -5 removed lines

@@ -64,8 +64,4 @@
 <<<<<<< HEAD
 can be problematic.
 EOD;
-$a = 1;
-=======
-should also be detected.
-EOT;
->>>>>>> ref/heads/other-branchname
+$a
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.1.inc

Braces +1 added lines, -2 removed lines

@@ -57,5 +57,4 @@
 
 // Test that stray boundaries, i.e. an opener without closer and such, are detected.
 <<<<<<< HEAD
-$a = 1;
-=======
+$a
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.5.inc

Braces +1 added lines, -10 removed lines

@@ -22,13 +22,4 @@
  * merge conflict boundaries will still be detected correctly.
  */
 
-$string =
-<<<'EOD'
-can be problematic.
-<<<<<<< HEAD
-were previously not detected.
-=======
-should also be detected.
->>>>>>> ref/heads/other-branchname
-And now they are.
-EOD;
+$string
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.1.inc

Braces +107 added lines, -50 removed lines

@@ -1,27 +1,40 @@ 
 <?php
 
-if ($something) echo 'hello';
+if ($something) {
+    echo 'hello';
+}
 
 if ($something) {
     echo 'hello';
-} else echo 'hi';
+} else {
+    echo 'hi';
+}
 
 if ($something) {
     echo 'hello';
-} else if ($else) echo 'hi';
+} else if ($else) {
+    echo 'hi';
+}
 
-foreach ($something as $thing) echo 'hello';
+foreach ($something as $thing) {
+    echo 'hello';
+}
 
-for ($i; $i > 0; $i--) echo 'hello';
+for ($i; $i > 0; $i--) {
+    echo 'hello';
+}
 
-while ($something) echo 'hello';
+while ($something) {
+    echo 'hello';
+}
 
 do {
     $i--;
 } while ($something);
 
-if(true)
+if(true) {
   $someObject->{$name};
+}
 
 if (true) :
     $foo = true;
@@ -42,31 +55,38 @@ 
 while (!$this->readLine($tokens, $tag));
 while (!$this->readLine($tokens, $tag)); //skip to end of file
 
-foreach ($cookies as $cookie)
+foreach ($cookies as $cookie) {
     if ($cookie->match($uri, $matchSessionCookies, $now))
         $ret[] = $cookie;
+}
 
-foreach ($stringParade as $hit)
-    $hitParade[] = $hit + 0; //cast to integer
+foreach ($stringParade as $hit) {
+    $hitParade[] = $hit + 0;
+}
+//cast to integer
 
 if ($foo) :
     echo 'true';
 elseif ($something) :
     echo 'foo';
-else:
+else {
+    :
     echo 'false';
+}
 endif;
 
 function test()
 {
-    if ($a)
-        $a.=' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : ''));
-}
+    if ($a) {
+            $a.=' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : ''));
+    }
+    }
 
-if ($a)
+if ($a) {
     foreach ($b as $c) {
         if ($d) {
             $e=$f;
+}
             $g=$h;
         } elseif ($i==0) {
             $j=$k;
@@ -75,7 +95,8 @@ 
 
 ?>
 <div style="text-align: right;">
-    <?php if ($model->scenario == 'simple') $widget->renderPager() ?>
+    <?php if ($model->scenario == 'simple') {
+    $widget->renderPager() ?>
 </div>
 
 <?php
@@ -83,6 +104,7 @@ 
     case Shop_Customer :: ERROR_INVALID_GENDER: ?>
         Ung&uuml;ltiges Geschlecht!
     <?php break;
+}
     case Shop_Customer :: ERROR_EMAIL_IN_USE: ?>
         Die eingetragene E-Mail-Adresse ist bereits registriert.
     <?php break;
@@ -95,8 +117,10 @@ 
             echo 'foo';
         endswitch;
     endif;
-else:
+else {
+    :
     echo 'foo';
+}
 endif;
 
 // ELSE IF split over multiple lines (not inline)
@@ -117,85 +141,109 @@ 
 }
 
 $stuff = [1,2,3];
-foreach($stuff as $num)
+foreach($stuff as $num) {
     if ($num %2 ) {
         echo "even";
+}
     } else {
         echo "odd";
     }
 
 $i = 0;
-foreach($stuff as $num)
+foreach($stuff as $num) {
     do {
         echo $i;
+}
         $i++;
     } while ($i < 5);
 
-foreach($stuff as $num)
+foreach($stuff as $num) {
     if (true) {
         echo "true1\n";
+}
     }
     if (true) {
         echo "true2\n";
     }
 
-if ($foo) echo 'foo';
-elseif ($bar) echo 'bar';
-else echo 'baz';
+if ($foo) {
+    echo 'foo';
+} elseif ($bar) {
+    echo 'bar';
+} else {
+    echo 'baz';
+}
 
 switch ($type) {
     case 1:
         if ($foo) {
             return true;
-        } elseif ($baz)
-            return true;
-        else {
+        } elseif ($baz) {
+                    return true;
+        } else {
             echo 'else';
         }
     break;
 }
 
-foreach ($sql as $s)
+foreach ($sql as $s) {
         if (!$this->execute) echo "<pre>",$s.";\n</pre>";
+}
         else {
             $ok = $this->connDest->Execute($s);
-            if (!$ok)
-                if ($this->neverAbort) $ret = false;
-                else return false;
+            if (!$ok) {
+                            if ($this->neverAbort) $ret = false;
+            } else {
+                    return false;
+                }
         }
 
-if ($bar)
-    if ($foo) echo 'hi'; // lol
+if ($bar) {
+    if ($foo) echo 'hi';
+}
+// lol
 
-if ($level == 'district')
+if ($level == 'district') {
     \DB::update(<<<EOD
 some
 text
 here
 EOD
     );
+}
 
-if ($level == 'district')
+if ($level == 'district') {
     $var = <<<EOD
 some
 text
 here
 EOD;
+}
 
-if ($a && $a === Foo::VARIABLE && ($a === Foo::METHOD || $a === Foo::FUNCTION))
+if ($a && $a === Foo::VARIABLE && ($a === Foo::METHOD || $a === Foo::FUNCTION)) {
     echo 'hi';
+}
 
-$out = array_map(function ($test) { if ($test) return 1; else return 2; }, $input); // comment
+$out = array_map(function ($test) { if ($test) {
+    return 1;
+} else {
+    return 2;
+}
+}, $input); // comment
 
 for ($x=0;$x<5;$x++):
-    if ($x) continue;
-endfor;
+    if ($x) {
+        continue;
+    }
+    endfor;
 
 for ($x=0;$x<5;$x++):
-    if ($x) continue ?> <?php
+    if ($x) {
+        continue ?> <?php
 endfor;
+    }
 
-if (true)
+if (true) {
     try {
     }
     catch(Exception $e) {
@@ -209,6 +257,7 @@ 
                     "foobarbaz"
                 )
             );
+}
         break;
 }
 
@@ -219,9 +268,10 @@ 
 while ($i < 10);
 
 if ($this) {
-    if ($that)
-        foo(${$a[$b]});
-}
+    if ($that) {
+            foo(${$a[$b]});
+    }
+    }
 
 while (!$this->readLine($tokens, $tag)); //phpcs:ignore Standard.Category.Sniff
 
@@ -229,18 +279,25 @@ 
 
 while (!$this->readLine($tokens, $tag)); /* comment */
 
-foreach ($stringParade as $hit)
-    $hitParade[] = $hit + 0; // phpcs:ignore Standard.Category.Sniff
+foreach ($stringParade as $hit) {
+    $hitParade[] = $hit + 0;
+}
+// phpcs:ignore Standard.Category.Sniff
 
-if ($bar)
-    if ($foo) echo 'hi'; /* @phpcs:ignore Standard.Category.Sniff */
+if ($bar) {
+    if ($foo) echo 'hi';
+}
+/* @phpcs:ignore Standard.Category.Sniff */
 
-if (true) $callable = function () {
+if (true) {
+    $callable = function () {
     return true;
+}
 };
 
-foreach ([] as $a)
-echo 'bar';
+foreach ([] as $a) {
+    echo 'bar';
+}
 {
     echo 'baz';
 }