Skip to content

Commit

Permalink
Создана сущность Student
Browse files Browse the repository at this point in the history
  • Loading branch information
nazargulov committed Apr 4, 2014
1 parent c9b442f commit 6c2bee0
Show file tree
Hide file tree
Showing 9 changed files with 450 additions and 158 deletions.
433 changes: 284 additions & 149 deletions .idea/workspace.xml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"homepage": "http://framework.zend.com/",
"require": {
"php": ">=5.3.3",
"zendframework/zendframework": "2.2.*",
"zendframework/zendframework": "dev-master",
"zendframework/zend-developer-tools": "dev-master",
"zf-commons/zfc-user": "dev-master",
"doctrine/doctrine-module": "0.*",
"doctrine/doctrine-orm-module": "0.*",
"doctrine/doctrine-module": "dev-master",
"doctrine/doctrine-orm-module": "dev-master",
"doctrine/common": "dev-master",
"doctrine/orm": "dev-master",
"hybridauth/hybridauth": "dev-master",
"socalnick/scn-social-auth": "dev-master"

Expand Down
Binary file modified composer.phar
Binary file not shown.
4 changes: 3 additions & 1 deletion config/application.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
// This should be an array of module namespaces used in the application.
'modules' => array(
'Application',
'ZendDeveloperTools',
'ZfcBase',
'ZfcUser',
'DoctrineModule',
'DoctrineORMModule',
'ScnSocialAuth',

//
// Custom module
'User',
'Secret',
),

Expand Down
2 changes: 1 addition & 1 deletion config/autoload/zfcuser.global.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* instead of the default one provided. Default is ZfcUser\Entity\User.
* The entity class should implement ZfcUser\Entity\UserInterface
*/
//'user_entity_class' => 'ZfcUser\Entity\User',
//'user_entity_class' => 'User\Entity\User',

/**
* Enable registration
Expand Down
155 changes: 155 additions & 0 deletions module/User/src/User/Entity/User.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
<?php
/**
* Created by PhpStorm.
* User: Администратор
* Date: 04.04.14
* Time: 22:40
*/

namespace User\Entity;

use Doctrine\ORM\Mapping as ORM;
/** @ORM\Entity */
class Student {
/**
* @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO")
* @ORM\Column(type="integer")
*/
protected $id;

/** @ORM\Column(type="string") */
protected $name;

/** @ORM\Column(type="string") */
protected $email;

/** @ORM\Column(type="integer") */
protected $levelLanguage;

/** @ORM\Column(type="integer") */
protected $phone;

/** @ORM\Column(type="blob") */
protected $photo;

/**
* set id
* @param $id
* @return $this
*/
public function setId($id)
{
$this->id = $id;
return $this;
}

/**
* get id
* @return mixed
*/
public function getId()
{
return $this->id;
}

/**
* set name
* @param $name
* @return $this
*/
public function setName($name)
{
$this->name = $name;
return $this;
}

/**
* get name
* @return mixed
*/
public function getName()
{
return $this->name;
}

/**
* set email
* @param $email
* @return $this
*/
public function setEmail($email)
{
$this->email = $email;
return $this;
}

/**
* get email
* @return mixed
*/
public function getEmail()
{
return $this->email;
}

/**
* set levelLanguage
* @param $levelLanguage
* @return $this
*/
public function setLevelLanguage($levelLanguage)
{
$this->levelLanguage = $levelLanguage;
return $this;
}

/**
* get levelLanguage
* @return mixed
*/
public function getLevelLanguage()
{
return $this->levelLanguage;
}

/**
* set phone
* @param $phone
* @return $this
*/
public function setPhone($phone)
{
$this->phone = $phone;
return $this;
}

/**
* get phone
* @return mixed
*/
public function getPhone()
{
return $this->phone;
}

/**
* set photo
* @param $photo
* @return $this
*/
public function setPhoto($photo)
{
$this->photo = $photo;
return $this;
}

/**
* get photo
* @return mixed
*/
public function getPhoto()
{
return $this->photo;
}
}
2 changes: 1 addition & 1 deletion vendor/hybridauth/hybridauth
Submodule hybridauth updated from 6d8947 to d89bbf
2 changes: 1 addition & 1 deletion vendor/socalnick/scn-social-auth
Submodule scn-social-auth updated from 846110 to a73796
2 changes: 1 addition & 1 deletion vendor/zf-commons/zfc-user
Submodule zfc-user updated from 397ffe to 48c2f8

0 comments on commit 6c2bee0

Please sign in to comment.