Skip to content

Commit a2c9705

Browse files
committed
Fix Doctrine dependencies
1 parent d1bd30e commit a2c9705

3 files changed

Lines changed: 29 additions & 22 deletions

File tree

composer.json

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
{
2-
"name": "mathematicator-core/statistic",
3-
"description": "Smart statistic algorithms.",
4-
"homepage": "https://github.com/mathematicator-core/statistic",
5-
"authors": [
6-
{
7-
"name": "Jan Barášek",
8-
"homepage": "http://baraja.cz"
9-
}
10-
],
11-
"require": {
12-
"php": ">=7.1.0"
13-
},
14-
"autoload": {
15-
"classmap": [
16-
"src/"
17-
]
18-
},
19-
"minimum-stability": "stable"
2+
"name": "mathematicator-core/statistic",
3+
"description": "Smart statistic algorithms.",
4+
"homepage": "https://github.com/mathematicator-core/statistic",
5+
"authors": [
6+
{
7+
"name": "Jan Barášek",
8+
"homepage": "http://baraja.cz"
9+
}
10+
],
11+
"require": {
12+
"php": ">=7.1.0",
13+
"baraja-core/doctrine": "~1.0",
14+
"nette/tester": "^2.0"
15+
},
16+
"autoload": {
17+
"classmap": [
18+
"src/"
19+
]
20+
},
21+
"minimum-stability": "stable"
2022
}

src/Entity/Sequence.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Mathematicator\Statistics\Entity;
46

57

8+
use Baraja\Doctrine\UUID\UuidIdentifier;
69
use Doctrine\ORM\Mapping as ORM;
710
use Nette\SmartObject;
811
use Nette\Utils\Strings;
9-
use ShopUp\Database\UUID\UuidIdentifier;
1012

1113
/**
1214
* @ORM\Entity()
@@ -63,7 +65,7 @@ public function getSequence(): array
6365
}
6466

6567
/**
66-
* @return null|string
68+
* @return string|null
6769
*/
6870
public function getData(): ?string
6971
{
@@ -108,6 +110,9 @@ public function updateData(): void
108110
}
109111
}
110112

113+
/**
114+
* @return string|null
115+
*/
111116
public function getFormula(): ?string
112117
{
113118
return $this->getDataType('F');

src/StatisticsManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
namespace Model\Math\Statistics;
44

55

6+
use Baraja\Doctrine\EntityManager;
7+
use Baraja\Doctrine\EntityManagerException;
68
use Mathematicator\Statistics\Entity\Sequence;
79
use Nette\Utils\Strings;
810
use Nette\Utils\Validators;
9-
use ShopUp\Database\EntityManager;
10-
use ShopUp\Database\EntityManagerException;
1111

1212
class StatisticsManager
1313
{

0 commit comments

Comments
 (0)