Skip to content

Commit b99b405

Browse files
ModelUtils is moved to the new version model
1 parent 5b49968 commit b99b405

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1380
-1809
lines changed

examples/NoteBook/Book.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020
namespace Pluf\NoteBook;
2121

22-
use Pluf_Model;
2322
use Pluf\Data\Schema;
2423
use Pluf\Db\Expression;
2524

@@ -34,13 +33,13 @@
3433
* mapped=false,
3534
* )
3635
*/
37-
class Book extends Pluf_Model
36+
class Book extends \Pluf\Data\Model
3837
{
3938

4039
/**
4140
*
4241
* {@inheritdoc}
43-
* @see Pluf_Model::init()
42+
* @see \Pluf\Data\Model::init()
4443
*/
4544
function init()
4645
{
@@ -93,7 +92,7 @@ function init()
9392
/**
9493
*
9594
* {@inheritdoc}
96-
* @see Pluf_Model::preSave()
95+
* @see \Pluf\Data\Model::preSave()
9796
*/
9897
function preSave($create = false)
9998
{

examples/NoteBook/Item.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22
namespace Pluf\NoteBook;
33

4-
use Pluf_Model;
54
use Pluf\Data\Schema;
65

76
/*
@@ -27,7 +26,7 @@
2726
* @author maso
2827
*
2928
*/
30-
class Item extends Pluf_Model
29+
class Item extends \Pluf\Data\Model
3130
{
3231

3332
function init()
@@ -74,15 +73,15 @@ function init()
7473
'inverseJoinModel' => Book::class,
7574
'inverseJoinProperty' => 'id',
7675
// do not create columne
77-
'mapped' => true,
76+
'mapped' => true
7877
]
7978
];
8079
}
8180

8281
/**
8382
*
8483
* {@inheritdoc}
85-
* @see Pluf_Model::preSave()
84+
* @see \Pluf\Data\Model::preSave()
8685
*/
8786
function preSave($create = false)
8887
{

examples/NoteBook/Tag.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
namespace Pluf\NoteBook;
33

44
use Pluf\Data\Schema;
5-
use Pluf_Model;
65

7-
class Tag extends Pluf_Model
6+
class Tag extends \Pluf\Data\Model
87
{
98

109
/**
1110
*
1211
* {@inheritdoc}
13-
* @see Pluf_Model::init()
12+
* @see \Pluf\Data\Model::init()
1413
*/
1514
function init()
1615
{

examples/Relation/ManyToManyOne.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,20 @@
1919
*/
2020
namespace Pluf\Relation;
2121

22-
use Pluf_Model;
2322
use Pluf\Data\Schema;
2423

2524
/**
2625
*
2726
* @author maso
2827
*
2928
*/
30-
class ManyToManyOne extends Pluf_Model
29+
class ManyToManyOne extends \Pluf\Data\Model
3130
{
3231

3332
/**
3433
*
3534
* {@inheritdoc}
36-
* @see Pluf_Model::init()
35+
* @see \Pluf\Data\Model::init()
3736
*/
3837
function init()
3938
{

examples/Relation/ManyToManyTwo.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,19 @@
1919
namespace Pluf\Relation;
2020

2121
use Pluf\Data\Schema;
22-
use Pluf_Model;
2322

2423
/**
2524
*
2625
* @author maso
2726
*
2827
*/
29-
class ManyToManyTwo extends Pluf_Model
28+
class ManyToManyTwo extends \Pluf\Data\Model
3029
{
3130

3231
/**
3332
*
3433
* {@inheritdoc}
35-
* @see Pluf_Model::init()
34+
* @see \Pluf\Data\Model::init()
3635
*/
3736
function init()
3837
{

examples/Relation/Model.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,19 @@
1919
namespace Pluf\Relation;
2020

2121
use Pluf\Data\Schema;
22-
use Pluf_Model;
2322

2423
/**
2524
*
2625
* @author maso
2726
*
2827
*/
29-
class Model extends Pluf_Model
28+
class Model extends \Pluf\Data\Model
3029
{
3130

3231
/**
3332
*
3433
* {@inheritdoc}
35-
* @see Pluf_Model::init()
34+
* @see \Pluf\Data\Model::init()
3635
*/
3736
function init()
3837
{
@@ -87,7 +86,7 @@ function init()
8786
/**
8887
*
8988
* {@inheritdoc}
90-
* @see Pluf_Model::loadViews()
89+
* @see \Pluf\Data\Model::loadViews()
9190
*/
9291
public function loadViews(): array
9392
{
@@ -104,7 +103,7 @@ public function loadViews(): array
104103
/**
105104
*
106105
* {@inheritdoc}
107-
* @see Pluf_Model::loadIndexes()
106+
* @see \Pluf\Data\Model::loadIndexes()
108107
*/
109108
public function loadIndexes(): array
110109
{

examples/Relation/ModelCount.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,19 @@
1919
namespace Pluf\Relation;
2020

2121
use Pluf\Data\Schema;
22-
use Pluf_Model;
2322

2423
/**
2524
*
2625
* @author maso
2726
*
2827
*/
29-
class ModelCount extends Pluf_Model
28+
class ModelCount extends \Pluf\Data\Model
3029
{
3130

3231
/**
3332
*
3433
* {@inheritdoc}
35-
* @see Pluf_Model::init()
34+
* @see \Pluf\Data\Model::init()
3635
*/
3736
function init()
3837
{

examples/Relation/ModelRecurse.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
namespace Pluf\Relation;
2020

2121
use Pluf\Data\Schema;
22-
use Pluf_Model;
2322

24-
class ModelRecurse extends Pluf_Model
23+
class ModelRecurse extends \Pluf\Data\Model
2524
{
2625

2726
function init()

examples/Relation/RelatedToTestModel.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,20 @@
1919
namespace Pluf\Relation;
2020

2121
use Pluf\Data\Schema;
22-
use Pluf_Model;
2322

2423
/**
2524
*
2625
* @author maso
2726
*
2827
*/
29-
class RelatedToTestModel extends Pluf_Model
28+
class RelatedToTestModel extends \Pluf\Data\Model
3029
{
3130

3231
/**
3332
* load data model
3433
*
3534
* {@inheritdoc}
36-
* @see Pluf_Model::init()
35+
* @see \Pluf\Data\Model::init()
3736
*/
3837
function init()
3938
{
@@ -75,7 +74,7 @@ function init()
7574
/**
7675
*
7776
* {@inheritdoc}
78-
* @see Pluf_Model::loadIndexes()
77+
* @see \Pluf\Data\Model::loadIndexes()
7978
*/
8079
public function loadIndexes(): array
8180
{

examples/Relation/RelatedToTestModel2.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
*/
1919
namespace Pluf\Relation;
2020

21-
use Pluf_Model;
2221
use Pluf\Data\Schema;
2322

24-
class RelatedToTestModel2 extends Pluf_Model
23+
class RelatedToTestModel2 extends \Pluf\Data\Model
2524
{
2625

2726
/**
2827
* Load data model
2928
*
3029
* {@inheritdoc}
31-
* @see Pluf_Model::init()
30+
* @see \Pluf\Data\Model::init()
3231
*/
3332
function init()
3433
{

0 commit comments

Comments
 (0)