Skip to content

Commit c9bde88

Browse files
EvanDotProEvanDotPro
committed
Merge pull request #20 from SpiffyJr/pr/refactor
Refactored for latest ZfcBase/ZfcUser changes.
2 parents f011ae1 + cf5f4c8 commit c9bde88

File tree

14 files changed

+107
-213
lines changed

14 files changed

+107
-213
lines changed

‎Module.php‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,20 @@
33
namespace ZfcUserDoctrineORM;
44

55
use Doctrine\ORM\Mapping\Driver\XmlDriver;
6-
use Zend\EventManager\StaticEventManager;
7-
use ZfcUserDoctrineORM\Event\ResolveTargetEntityListener;
86
use ZfcUser\Module as ZfcUser;
97

108
class Module
119
{
1210
public function onBootstrap($e)
1311
{
14-
$app = $e->getParam('application');
15-
$sm = $app->getServiceManager();
16-
$em = $sm->get('zfcuser_doctrine_em');
17-
$evm = $em->getEventManager();
18-
19-
$listener = new ResolveTargetEntityListener;
20-
$listener->addResolveTargetEntity(
21-
'ZfcUser\Model\UserInterface',
22-
ZfcUser::getOption('user_model_class'),
23-
array()
24-
);
25-
$evm->addEventListener(\Doctrine\ORM\Events::loadClassMetadata, $listener);
12+
$app = $e->getParam('application');
13+
$sm = $app->getServiceManager();
14+
$options = $sm->get('zfcuser_module_options');
2615

2716
// Add the default entity driver only if specified in configuration
28-
if (ZfcUser::getOption('enable_default_entities')) {
17+
if ($options->getEnableDefaultEntities()) {
2918
$chain = $sm->get('doctrine.driver.orm_default');
30-
$chain->addDriver(new XmlDriver(__DIR__ . '/config/xml/entity'), 'ZfcUserDoctrineORM\Entity');
19+
$chain->addDriver(new XmlDriver(__DIR__ . '/config/xml/zfcuserdoctrineorm'), 'ZfcUserDoctrineORM\Entity');
3120
}
3221
}
3322

@@ -53,19 +42,14 @@ public function getServiceConfiguration()
5342

5443
),
5544
'factories' => array(
56-
'zfcuser_user_repository' => function ($sm) {
57-
$mapper = $sm->get('zfcuser_user_mapper');
58-
return new Repository\User($mapper);
45+
'zfcuser_module_options' => function ($sm) {
46+
$config = $sm->get('Configuration');
47+
return new Options\ModuleOptions(isset($config['zfcuser']) ? $config['zfcuser'] : array());
5948
},
60-
6149
'zfcuser_user_mapper' => function ($sm) {
6250
return new \ZfcUserDoctrineORM\Mapper\User(
63-
$sm->get('zfcuser_doctrine_em')
64-
);
65-
},
66-
'zfcuser_usermeta_mapper' => function ($sm) {
67-
return new \ZfcUserDoctrineORM\Mapper\UserMeta(
68-
$sm->get('zfcuser_doctrine_em')
51+
$sm->get('zfcuser_doctrine_em'),
52+
$sm->get('zfcuser_module_options')
6953
);
7054
},
7155
),

‎config/module.config.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,16 @@
22
return array(
33
'doctrine' => array(
44
'driver' => array(
5-
'zfcuser_model' => array(
5+
'zfcuser_entity' => array(
66
'class' => 'Doctrine\ORM\Mapping\Driver\XmlDriver',
7-
'paths' => __DIR__ . '/xml/model'
7+
'paths' => __DIR__ . '/xml/zfcuser'
88
),
99

1010
'orm_default' => array(
1111
'drivers' => array(
12-
'ZfcUser\Model' => 'zfcuser_model'
12+
'ZfcUser\Entity' => 'zfcuser_entity'
1313
)
1414
)
1515
)
1616
),
17-
18-
'zfcuser' => array(
19-
'enable_default_entities' => true,
20-
21-
'user_model_class' => 'ZfcUserDoctrineORM\Entity\User',
22-
'usermeta_model_class' => 'ZfcUserDoctrineORM\Entity\UserMeta',
23-
)
2417
);

‎config/xml/entity/ZfcUserDoctrineORM.Entity.UserMeta.dcm.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎config/xml/model/ZfcUser.Model.User.dcm.xml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎config/xml/model/ZfcUser.Model.UserMeta.dcm.xml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎config/xml/zfcuser/ZfcUser.Entity.User.dcm.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
5+
http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
6+
7+
<mapped-superclass name="ZfcUser\Entity\User" table="user">
8+
9+
<id name="id" type="integer" column="id">
10+
<generator strategy="AUTO" />
11+
</id>
12+
13+
<field name="username" type="string" length="255" unique="true" nullable="true" />
14+
<field name="email" type="string" unique="true" length="255" />
15+
<field name="displayName" column="display_name" type="string" length="50" nullable="true" />
16+
<field name="password" type="string" length="128" />
17+
18+
</mapped-superclass>
19+
20+
</doctrine-mapping>

config/xml/entity/ZfcUserDoctrineORM.Entity.User.dcm.xml renamed to config/xml/zfcuserdoctrineorm/ZfcUserDoctrineORM.Entity.User.dcm.xml

File renamed without changes.

‎src/ZfcUserDoctrineORM/Entity/User.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace ZfcUserDoctrineORM\Entity;
44

5-
use ZfcUser\Model\User as UserModel;
5+
use ZfcUser\Entity\User as ZfcUserEntity;
66

7-
class User extends UserModel
7+
class User extends ZfcUserEntity
88
{}

‎src/ZfcUserDoctrineORM/Entity/UserMeta.php‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/ZfcUserDoctrineORM/Event/ResolveTargetEntityListener.php‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)