Subversion-Projekte lars-tiefland.laravel_shop

Revision

Revision 148 | Zur aktuellen Revision | Ganze Datei anzeigen | Leerzeichen ignorieren | Details | Blame | Letzte Änderung | Log anzeigen | RSS feed

Revision 148 Revision 688
Zeile 1127... Zeile 1127...
1127
        if ('?' !== $returnType && 'docblock' !== $this->patchTypes['force']) {
1127
        if ('?' !== $returnType && 'docblock' !== $this->patchTypes['force']) {
1128
            $fixedCode[$i - 1] = preg_replace('/\)(?::[^;\n]++)?(;?\n)/', "): $returnType\\1", $code[$i - 1]);
1128
            $fixedCode[$i - 1] = preg_replace('/\)(?::[^;\n]++)?(;?\n)/', "): $returnType\\1", $code[$i - 1]);
1129
        }
1129
        }
Zeile 1130... Zeile 1130...
1130
 
1130
 
-
 
1131
        $end = $method->isGenerator() ? $i : $method->getEndLine();
-
 
1132
        $inClosure = false;
1131
        $end = $method->isGenerator() ? $i : $method->getEndLine();
1133
        $braces = 0;
-
 
1134
        for (; $i < $end; ++$i) {
-
 
1135
            if (!$inClosure) {
-
 
1136
                $inClosure = str_contains($code[$i], 'function (');
-
 
1137
            }
-
 
1138
 
-
 
1139
            if ($inClosure) {
-
 
1140
                $braces += substr_count($code[$i], '{') - substr_count($code[$i], '}');
-
 
1141
                $inClosure = $braces > 0;
-
 
1142
 
-
 
1143
                continue;
-
 
1144
            }
1132
        for (; $i < $end; ++$i) {
1145
 
1133
            if ('void' === $returnType) {
1146
            if ('void' === $returnType) {
1134
                $fixedCode[$i] = str_replace('    return null;', '    return;', $code[$i]);
1147
                $fixedCode[$i] = str_replace('    return null;', '    return;', $code[$i]);
1135
            } elseif ('mixed' === $returnType || '?' === $returnType[0]) {
1148
            } elseif ('mixed' === $returnType || '?' === $returnType[0]) {
1136
                $fixedCode[$i] = str_replace('    return;', '    return null;', $code[$i]);
1149
                $fixedCode[$i] = str_replace('    return;', '    return null;', $code[$i]);