Skip to content

Commit ad3d392

Browse files
committed
Reformat code
1 parent 36bc352 commit ad3d392

File tree

6 files changed

+32
-40
lines changed

6 files changed

+32
-40
lines changed

src/Exceptions/CanNotSolveException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public static function canNotSolve(array $tokens, int $level = 0): void
3939
throw new self('Can not solve "' . $buffer . '".');
4040
}
4141

42+
4243
/**
4344
* @param string $function
4445
* @throws CanNotSolveException
@@ -47,5 +48,4 @@ public static function notImplemented(string $function): void
4748
{
4849
throw new self('This function does not implemented "' . $function . '".');
4950
}
50-
5151
}

src/IntegralResult.php

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,25 @@
1111
final class IntegralResult
1212
{
1313

14-
/**
15-
* @var IToken[]
16-
*/
14+
/** @var IToken[] */
1715
private $queryTokens;
1816

19-
/**
20-
* @var string
21-
*/
17+
/** @var string */
2218
private $queryLaTeX;
2319

24-
/**
25-
* @var string|null
26-
*/
20+
/** @var string|null */
2721
private $result;
2822

29-
/**
30-
* @var string
31-
*/
23+
/** @var string */
3224
private $differential;
3325

34-
/**
35-
* @var bool
36-
*/
26+
/** @var bool */
3727
private $singleToken;
3828

39-
/**
40-
* @var Step[]
41-
*/
29+
/** @var Step[] */
4230
private $steps = [];
4331

32+
4433
/**
4534
* @param IToken[] $queryTokens
4635
* @param string $queryLaTeX
@@ -55,6 +44,7 @@ public function __construct(array $queryTokens, string $queryLaTeX, string $diff
5544
$this->singleToken = $singleToken;
5645
}
5746

47+
5848
/**
5949
* @return bool
6050
*/
@@ -63,6 +53,7 @@ public function isFinalResult(): bool
6353
return strpos($this->getResult(), '?') === false;
6454
}
6555

56+
6657
/**
6758
* @return string
6859
*/
@@ -71,6 +62,7 @@ public function getResult(): string
7162
return $this->result ?? '';
7263
}
7364

65+
7466
/**
7567
* @internal
7668
* @param string $result
@@ -80,6 +72,7 @@ public function setResult(string $result): void
8072
$this->result = $result;
8173
}
8274

75+
8376
/**
8477
* @return string
8578
*/
@@ -88,6 +81,7 @@ public function getDifferential(): string
8881
return $this->differential;
8982
}
9083

84+
9185
/**
9286
* @return bool
9387
*/
@@ -96,6 +90,7 @@ public function isSingleToken(): bool
9690
return $this->singleToken;
9791
}
9892

93+
9994
/**
10095
* @return IToken[]
10196
*/
@@ -104,6 +99,7 @@ public function getQueryTokens(): array
10499
return $this->queryTokens;
105100
}
106101

102+
107103
/**
108104
* @return string
109105
*/
@@ -114,6 +110,7 @@ public function getQueryLaTeX(): string
114110
. ' \ d' . $this->getDifferential();
115111
}
116112

113+
117114
/**
118115
* @return Step[]
119116
*/
@@ -122,6 +119,7 @@ public function getSteps(): array
122119
return $this->steps;
123120
}
124121

122+
125123
/**
126124
* @param Step $step
127125
* @return IntegralResult
@@ -132,5 +130,4 @@ public function addStep(Step $step): self
132130

133131
return $this;
134132
}
135-
136133
}

src/IntegralSolver.php

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,19 @@
2828
class IntegralSolver
2929
{
3030

31-
/**
32-
* @var Rule[]
33-
*/
31+
/** @var Rule[] */
3432
public $rules = [];
3533

36-
/**
37-
* @var Tokenizer
38-
*/
34+
/** @var Tokenizer */
3935
private $tokenizer;
4036

41-
/**
42-
* @var QueryNormalizer
43-
*/
37+
/** @var QueryNormalizer */
4438
private $queryNormalizer;
4539

46-
/**
47-
* @var Solver
48-
*/
40+
/** @var Solver */
4941
private $solver;
5042

43+
5144
/**
5245
* @param Tokenizer $tokenizer
5346
* @param QueryNormalizer $queryNormalizer
@@ -60,6 +53,7 @@ public function __construct(Tokenizer $tokenizer, QueryNormalizer $queryNormaliz
6053
$this->solver = $solver;
6154
}
6255

56+
6357
/**
6458
* @param string $query
6559
* @param string|null $differential
@@ -77,6 +71,7 @@ public function process(string $query, ?string $differential = null): IntegralRe
7771
return $this->processByTokens($tokens, $differential);
7872
}
7973

74+
8075
/**
8176
* @param IToken[] $tokens
8277
* @param string|null $differential
@@ -138,6 +133,7 @@ public function processByTokens(array $tokens, ?string $differential = null): In
138133
return $result;
139134
}
140135

136+
141137
/**
142138
* @param Rule $rule
143139
* @return IntegralSolver
@@ -149,6 +145,7 @@ public function addRule(Rule $rule): self
149145
return $this;
150146
}
151147

148+
152149
/**
153150
* @param IToken[] $tokens
154151
* @return mixed[]
@@ -186,6 +183,7 @@ private function explodeToParts(array $tokens): array
186183
];
187184
}
188185

186+
189187
/**
190188
* @param IToken[] $tokens
191189
* @param string|null $preferenceDifferential
@@ -212,5 +210,4 @@ private function resolveDifferential(array $tokens, ?string $preferenceDifferent
212210

213211
return $variables === [] ? 'x' : array_keys($variables)[0];
214212
}
215-
216213
}

src/Rules/Rule.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77

88
interface Rule
99
{
10-
1110
}

src/Solver/Solver.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public function solvePart(array $tokens): string
3030
return '';
3131
}
3232

33+
3334
/**
3435
* @param IToken $token
3536
* @return string
@@ -57,6 +58,4 @@ private function solvePrimitiveIntegral(IToken $token): string
5758

5859
return '?';
5960
}
60-
61-
6261
}

tests/IntegralSolverTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
class IntegralSolverTest extends TestCase
1616
{
1717

18-
/**
19-
* @var IntegralSolver
20-
*/
18+
/** @var IntegralSolver */
2119
private $integralSolver;
2220

21+
2322
/**
2423
* @param IntegralSolver $integralSolver
2524
*/
@@ -28,6 +27,7 @@ public function __construct(IntegralSolver $integralSolver)
2827
$this->integralSolver = $integralSolver;
2928
}
3029

30+
3131
/**
3232
* @dataProvider getQueries
3333
* @param string $query
@@ -38,6 +38,7 @@ public function testOne(string $query, string $result): void
3838
Assert::same($result, $this->integralSolver->process($query)->getResult());
3939
}
4040

41+
4142
/**
4243
* @return string[][]
4344
*/
@@ -51,7 +52,6 @@ public function getQueries(): array
5152
['1+x', 'x+(x^2)/2+c'],
5253
];
5354
}
54-
5555
}
5656

5757
if (isset($_SERVER['NETTE_TESTER_RUNNER'])) {

0 commit comments

Comments
 (0)