gergely/kekrozsak
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgraded to Symfony 2.1-beta2

Browse Source
This commit is contained in:
Polonkai Gergely 2012-07-15 14:56:31 +02:00
parent c1232c9792
commit bb7aee6fee
455 changed files with 21001 additions and 18480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -26,7 +26,7 @@ http://getcomposer.org/ or just run the following command:
Then, use the `create-project` command to generate a new Symfony application: Then, use the `create-project` command to generate a new Symfony application:
composer.phar create-project symfony/framework-standard-edition path/to/install php composer.phar create-project symfony/framework-standard-edition path/to/install
Composer will install Symfony and all its dependencies under the Composer will install Symfony and all its dependencies under the
`path/to/install` directory. `path/to/install` directory.
@ -73,7 +73,7 @@ To see a real-live Symfony page in action, access the following page:
web/app_dev.php/demo/hello/Fabien web/app_dev.php/demo/hello/Fabien
3) Getting started with Symfony 4) Getting started with Symfony
------------------------------- -------------------------------
This distribution is meant to be the starting point for your Symfony This distribution is meant to be the starting point for your Symfony
@ -98,9 +98,9 @@ playing with it, you can remove it by following these steps:
* remove the `web/bundles/acmedemo` directory; * remove the `web/bundles/acmedemo` directory;
* remove the inclusion of the security configuration in * remove the `security.providers`, `security.firewall.login` and
`app/config/config.yml` (remove the `- { resource: security.yml }` line) `security.firewall.secured_area` entries in the `security.yml` file or
or tweak the security configuration to fit your needs. tweak the security configuration to fit your needs.
What's inside? What's inside?
--------------- ---------------

21
app/SymfonyRequirements.php
View File

@ -14,6 +14,17 @@
* It can be a mandatory requirement or an optional recommendation. * It can be a mandatory requirement or an optional recommendation.
* There is a special subclass, named PhpIniRequirement, to check a php.ini configuration. * There is a special subclass, named PhpIniRequirement, to check a php.ini configuration.
* *
* This file must be compatible with PHP 5.2+.
*
* ************** CAUTION **************
*
* DO NOT EDIT THIS FILE AS IT WILL BE OVERRIDEN BY COMPOSER
*
* If you want to change this file, edit the one in the
* SensioDistributionBundle instead.
*
* ************** CAUTION **************
*
* @author Tobias Schultze <http://tobion.de> * @author Tobias Schultze <http://tobion.de>
*/ */
class Requirement class Requirement
@ -386,12 +397,18 @@ class SymfonyRequirements extends RequirementCollection
); );
$this->addRequirement( $this->addRequirement(
is_dir(__DIR__.'/../vendor/symfony'), is_dir(__DIR__.'/../vendor/composer'),
'Vendor libraries must be installed', 'Vendor libraries must be installed',
'Vendor libraries are missing. Install composer following instructions from <a href="http://getcomposer.org/">http://getcomposer.org/</a>. ' . 'Vendor libraries are missing. Install composer following instructions from <a href="http://getcomposer.org/">http://getcomposer.org/</a>. ' .
'Then run "<strong>php composer.phar install</strong>" to install them.' 'Then run "<strong>php composer.phar install</strong>" to install them.'
); );
$this->addRequirement(
file_get_contents(__FILE__) == file_get_contents(__DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php'),
'Outdated requirements file',
'Your requirements file is outdated. Run composer install and re-check your configuration.'
);
$baseDir = basename(__DIR__); $baseDir = basename(__DIR__);
$this->addRequirement( $this->addRequirement(
is_writable(__DIR__.'/cache'), is_writable(__DIR__.'/cache'),
@ -413,7 +430,7 @@ class SymfonyRequirements extends RequirementCollection
if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) { if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
$this->addRequirement( $this->addRequirement(
(in_array(date_default_timezone_get(), \DateTimeZone::listIdentifiers())), (in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())),
sprintf('Default timezone is deprecated (%s)', date_default_timezone_get()), sprintf('Default timezone is deprecated (%s)', date_default_timezone_get()),
'Fix your <strong>php.ini</strong> file (list of deprecated timezones http://us.php.net/manual/en/timezones.others.php).' 'Fix your <strong>php.ini</strong> file (list of deprecated timezones http://us.php.net/manual/en/timezones.others.php).'
); );

18
app/autoload.php
View File

@ -2,23 +2,7 @@
use Doctrine\Common\Annotations\AnnotationRegistry; use Doctrine\Common\Annotations\AnnotationRegistry;
if (!$loader = @include __DIR__.'/../vendor/autoload.php') { $loader = require __DIR__.'/../vendor/autoload.php';
$message = <<< EOF
<p>You must set up the project dependencies by running the following commands:</p>
<pre>
curl -s http://getcomposer.org/installer | php
php composer.phar install
</pre>
EOF;
if (PHP_SAPI === 'cli') {
$message = strip_tags($message);
}
die($message);
}
// intl // intl
if (!function_exists('intl_get_error_code')) { if (!function_exists('intl_get_error_code')) {

581
app/bootstrap.php.cache
View File

@ -72,6 +72,21 @@ interface ContainerInterface
namespace Symfony\Component\DependencyInjection
{
interface IntrospectableContainerInterface extends ContainerInterface
{
function initialized($id);
}
}
namespace Symfony\Component\DependencyInjection namespace Symfony\Component\DependencyInjection
{ {
@ -341,6 +356,23 @@ class Container implements IntrospectableContainerInterface
namespace Symfony\Component\HttpKernel
{
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
interface TerminableInterface
{
function terminate(Request $request, Response $response);
}
}
namespace Symfony\Component\HttpKernel namespace Symfony\Component\HttpKernel
{ {
@ -419,6 +451,9 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
function getLogDir(); function getLogDir();
function getCharset();
} }
} }
@ -467,7 +502,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $classes; protected $classes;
protected $errorReportingLevel; protected $errorReportingLevel;
const VERSION = '2.1.0-BETA1'; const VERSION = '2.1.0-BETA2';
const VERSION_ID = '20100'; const VERSION_ID = '20100';
const MAJOR_VERSION = '2'; const MAJOR_VERSION = '2';
const MINOR_VERSION = '1'; const MINOR_VERSION = '1';
@ -736,6 +771,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
} }
public function getCharset()
{
return 'UTF-8';
}
protected function initializeBundles() protected function initializeBundles()
{ {
$this->bundles = array(); $this->bundles = array();
@ -837,7 +878,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
'kernel.cache_dir' => $this->getCacheDir(), 'kernel.cache_dir' => $this->getCacheDir(),
'kernel.logs_dir' => $this->getLogDir(), 'kernel.logs_dir' => $this->getLogDir(),
'kernel.bundles' => $bundles, 'kernel.bundles' => $bundles,
'kernel.charset' => 'UTF-8', 'kernel.charset' => $this->getCharset(),
'kernel.container_class' => $this->getContainerClass(), 'kernel.container_class' => $this->getContainerClass(),
), ),
$this->getEnvParameters() $this->getEnvParameters()
@ -971,177 +1012,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
namespace Symfony\Component\ClassLoader
{
class ClassCollectionLoader
{
static private $loaded;
static public function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
{
if (isset(self::$loaded[$name])) {
return;
}
self::$loaded[$name] = true;
if ($adaptive) {
$classes = array_diff($classes, get_declared_classes(), get_declared_interfaces());
$name = $name.'-'.substr(md5(implode('|', $classes)), 0, 5);
}
$cache = $cacheDir.'/'.$name.$extension;
$reload = false;
if ($autoReload) {
$metadata = $cacheDir.'/'.$name.$extension.'.meta';
if (!is_file($metadata) || !is_file($cache)) {
$reload = true;
} else {
$time = filemtime($cache);
$meta = unserialize(file_get_contents($metadata));
if ($meta[1] != $classes) {
$reload = true;
} else {
foreach ($meta[0] as $resource) {
if (!is_file($resource) || filemtime($resource) > $time) {
$reload = true;
break;
}
}
}
}
}
if (!$reload && is_file($cache)) {
require_once $cache;
return;
}
$files = array();
$content = '';
foreach ($classes as $class) {
if (!class_exists($class) && !interface_exists($class) && (!function_exists('trait_exists') || !trait_exists($class))) {
throw new \InvalidArgumentException(sprintf('Unable to load class "%s"', $class));
}
$r = new \ReflectionClass($class);
$files[] = $r->getFileName();
$c = preg_replace(array('/^\s*<\?php/', '/\?>\s*$/'), '', file_get_contents($r->getFileName()));
if (!$r->inNamespace()) {
$c = "\nnamespace\n{\n".self::stripComments($c)."\n}\n";
} else {
$c = self::fixNamespaceDeclarations('<?php '.$c);
$c = preg_replace('/^\s*<\?php/', '', $c);
}
$content .= $c;
}
if (!is_dir(dirname($cache))) {
mkdir(dirname($cache), 0777, true);
}
self::writeCacheFile($cache, '<?php '.$content);
if ($autoReload) {
self::writeCacheFile($metadata, serialize(array($files, $classes)));
}
}
static public function fixNamespaceDeclarations($source)
{
if (!function_exists('token_get_all')) {
return $source;
}
$output = '';
$inNamespace = false;
$tokens = token_get_all($source);
for ($i = 0, $max = count($tokens); $i < $max; $i++) {
$token = $tokens[$i];
if (is_string($token)) {
$output .= $token;
} elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
continue;
} elseif (T_NAMESPACE === $token[0]) {
if ($inNamespace) {
$output .= "}\n";
}
$output .= $token[1];
while (($t = $tokens[++$i]) && is_array($t) && in_array($t[0], array(T_WHITESPACE, T_NS_SEPARATOR, T_STRING))) {
$output .= $t[1];
}
if (is_string($t) && '{' === $t) {
$inNamespace = false;
--$i;
} else {
$output = rtrim($output);
$output .= "\n{";
$inNamespace = true;
}
} else {
$output .= $token[1];
}
}
if ($inNamespace) {
$output .= "}\n";
}
return $output;
}
static private function writeCacheFile($file, $content)
{
$tmpFile = tempnam(dirname($file), basename($file));
if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
@chmod($file, 0666 & ~umask());
return;
}
throw new \RuntimeException(sprintf('Failed to write cache file "%s".', $file));
}
static private function stripComments($source)
{
if (!function_exists('token_get_all')) {
return $source;
}
$output = '';
foreach (token_get_all($source) as $token) {
if (is_string($token)) {
$output .= $token;
} elseif (!in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
$output .= $token[1];
}
}
$output = preg_replace(array('/\s+$/Sm', '/\n+/S'), "\n", $output);
return $output;
}
}
}
namespace Symfony\Component\ClassLoader namespace Symfony\Component\ClassLoader
{ {
@ -1155,7 +1025,7 @@ class ApcClassLoader
public function __construct($prefix, $classFinder) public function __construct($prefix, $classFinder)
{ {
if (!extension_loaded('apc')) { if (!extension_loaded('apc')) {
throw new \RuntimeException('Unable to use ApcUniversalClassLoader as APC is not enabled.'); throw new \RuntimeException('Unable to use ApcClassLoader as APC is not enabled.');
} }
if (!method_exists($classFinder, 'findFile')) { if (!method_exists($classFinder, 'findFile')) {
@ -1242,6 +1112,26 @@ interface BundleInterface extends ContainerAwareInterface
namespace Symfony\Component\DependencyInjection
{
abstract class ContainerAware implements ContainerAwareInterface
{
protected $container;
public function setContainer(ContainerInterface $container = null)
{
$this->container = $container;
}
}
}
namespace Symfony\Component\HttpKernel\Bundle namespace Symfony\Component\HttpKernel\Bundle
{ {
@ -1449,6 +1339,349 @@ class ConfigCache
} }
} }
} }
namespace Symfony\Component\HttpKernel
{
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
use Symfony\Component\HttpKernel\Event\PostResponseEvent;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
class HttpKernel implements HttpKernelInterface, TerminableInterface
{
protected $dispatcher;
protected $resolver;
public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver)
{
$this->dispatcher = $dispatcher;
$this->resolver = $resolver;
}
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
{
try {
return $this->handleRaw($request, $type);
} catch (\Exception $e) {
if (false === $catch) {
throw $e;
}
return $this->handleException($e, $request, $type);
}
}
public function terminate(Request $request, Response $response)
{
$this->dispatcher->dispatch(KernelEvents::TERMINATE, new PostResponseEvent($this, $request, $response));
}
private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
{
$event = new GetResponseEvent($this, $request, $type);
$this->dispatcher->dispatch(KernelEvents::REQUEST, $event);
if ($event->hasResponse()) {
return $this->filterResponse($event->getResponse(), $request, $type);
}
if (false === $controller = $this->resolver->getController($request)) {
throw new NotFoundHttpException(sprintf('Unable to find the controller for path "%s". Maybe you forgot to add the matching route in your routing configuration?', $request->getPathInfo()));
}
$event = new FilterControllerEvent($this, $controller, $request, $type);
$this->dispatcher->dispatch(KernelEvents::CONTROLLER, $event);
$controller = $event->getController();
$arguments = $this->resolver->getArguments($request, $controller);
$response = call_user_func_array($controller, $arguments);
if (!$response instanceof Response) {
$event = new GetResponseForControllerResultEvent($this, $request, $type, $response);
$this->dispatcher->dispatch(KernelEvents::VIEW, $event);
if ($event->hasResponse()) {
$response = $event->getResponse();
}
if (!$response instanceof Response) {
$msg = sprintf('The controller must return a response (%s given).', $this->varToString($response));
if (null === $response) {
$msg .= ' Did you forget to add a return statement somewhere in your controller?';
}
throw new \LogicException($msg);
}
}
return $this->filterResponse($response, $request, $type);
}
private function filterResponse(Response $response, Request $request, $type)
{
$event = new FilterResponseEvent($this, $request, $type, $response);
$this->dispatcher->dispatch(KernelEvents::RESPONSE, $event);
return $event->getResponse();
}
private function handleException(\Exception $e, $request, $type)
{
$event = new GetResponseForExceptionEvent($this, $request, $type, $e);
$this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
if (!$event->hasResponse()) {
throw $e;
}
try {
return $this->filterResponse($event->getResponse(), $request, $type);
} catch (\Exception $e) {
return $event->getResponse();
}
}
private function varToString($var)
{
if (is_object($var)) {
return sprintf('Object(%s)', get_class($var));
}
if (is_array($var)) {
$a = array();
foreach ($var as $k => $v) {
$a[] = sprintf('%s => %s', $k, $this->varToString($v));
}
return sprintf("Array(%s)", implode(', ', $a));
}
if (is_resource($var)) {
return sprintf('Resource(%s)', get_resource_type($var));
}
if (null === $var) {
return 'null';
}
if (false === $var) {
return 'false';
}
if (true === $var) {
return 'true';
}
return (string) $var;
}
}
}
namespace Symfony\Bundle\FrameworkBundle
{
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\HttpKernel as BaseHttpKernel;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
class HttpKernel extends BaseHttpKernel
{
protected $container;
private $esiSupport;
public function __construct(EventDispatcherInterface $dispatcher, ContainerInterface $container, ControllerResolverInterface $controllerResolver)
{
parent::__construct($dispatcher, $controllerResolver);
$this->container = $container;
}
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
{
$request->headers->set('X-Php-Ob-Level', ob_get_level());
$this->container->enterScope('request');
$this->container->set('request', $request, 'request');
try {
$response = parent::handle($request, $type, $catch);
} catch (\Exception $e) {
$this->container->leaveScope('request');
throw $e;
}
$this->container->leaveScope('request');
return $response;
}
public function forward($controller, array $attributes = array(), array $query = array())
{
$attributes['_controller'] = $controller;
$subRequest = $this->container->get('request')->duplicate($query, null, $attributes);
return $this->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
}
public function render($controller, array $options = array())
{
$options = array_merge(array(
'attributes' => array(),
'query' => array(),
'ignore_errors' => !$this->container->getParameter('kernel.debug'),
'alt' => array(),
'standalone' => false,
'comment' => '',
), $options);
if (!is_array($options['alt'])) {
$options['alt'] = array($options['alt']);
}
if (null === $this->esiSupport) {
$this->esiSupport = $this->container->has('esi') && $this->container->get('esi')->hasSurrogateEsiCapability($this->container->get('request'));
}
if ($this->esiSupport && (true === $options['standalone'] || 'esi' === $options['standalone'])) {
$uri = $this->generateInternalUri($controller, $options['attributes'], $options['query']);
$alt = '';
if ($options['alt']) {
$alt = $this->generateInternalUri($options['alt'][0], isset($options['alt'][1]) ? $options['alt'][1] : array(), isset($options['alt'][2]) ? $options['alt'][2] : array());
}
return $this->container->get('esi')->renderIncludeTag($uri, $alt, $options['ignore_errors'], $options['comment']);
}
if ('js' === $options['standalone']) {
$uri = $this->generateInternalUri($controller, $options['attributes'], $options['query'], false);
$defaultContent = null;
if ($template = $this->container->getParameter('templating.hinclude.default_template')) {
$defaultContent = $this->container->get('templating')->render($template);
}
return $this->renderHIncludeTag($uri, $defaultContent);
}
$request = $this->container->get('request');
if (0 === strpos($controller, '/')) {
$subRequest = Request::create($request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());
if ($session = $request->getSession()) {
$subRequest->setSession($session);
}
} else {
$options['attributes']['_controller'] = $controller;
if (!isset($options['attributes']['_format'])) {
$options['attributes']['_format'] = $request->getRequestFormat();
}
$options['attributes']['_route'] = '_internal';
$subRequest = $request->duplicate($options['query'], null, $options['attributes']);
$subRequest->setMethod('GET');
}
$level = ob_get_level();
try {
$response = $this->handle($subRequest, HttpKernelInterface::SUB_REQUEST, false);
if (!$response->isSuccessful()) {
throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $request->getUri(), $response->getStatusCode()));
}
if (!$response instanceof StreamedResponse) {
return $response->getContent();
}
$response->sendContent();
} catch (\Exception $e) {
if ($options['alt']) {
$alt = $options['alt'];
unset($options['alt']);
$options['attributes'] = isset($alt[1]) ? $alt[1] : array();
$options['query'] = isset($alt[2]) ? $alt[2] : array();
return $this->render($alt[0], $options);
}
if (!$options['ignore_errors']) {
throw $e;
}
while (ob_get_level() > $level) {
ob_get_clean();
}
}
}
public function generateInternalUri($controller, array $attributes = array(), array $query = array(), $secure = true)
{
if (0 === strpos($controller, '/')) {
return $controller;
}
$path = http_build_query($attributes, '', '&');
$uri = $this->container->get('router')->generate($secure ? '_internal' : '_internal_public', array(
'controller' => $controller,
'path' => $path ?: 'none',
'_format' => $this->container->get('request')->getRequestFormat(),
));
if ($queryString = http_build_query($query, '', '&')) {
$uri .= '?'.$queryString;
}
return $uri;
}
public function renderHIncludeTag($uri, $defaultContent = null)
{
return sprintf('<hx:include src="%s">%s</hx:include>', $uri, $defaultContent);
}
public function hasEsiSupport()
{
return $this->esiSupport;
}
}
}
namespace { return $loader; } namespace { return $loader; }

5
app/config/config.yml
View File

@ -6,7 +6,6 @@ framework:
#esi: ~ #esi: ~
#translator: { fallback: %locale% } #translator: { fallback: %locale% }
secret: %secret% secret: %secret%
charset: UTF-8
router: router:
resource: "%kernel.root_dir%/config/routing.yml" resource: "%kernel.root_dir%/config/routing.yml"
strict_parameters: %kernel.debug% strict_parameters: %kernel.debug%
@ -15,8 +14,8 @@ framework:
validation: { enable_annotations: true } validation: { enable_annotations: true }
templating: { engines: ['twig'] } #assets_version: SomeVersionScheme templating: { engines: ['twig'] } #assets_version: SomeVersionScheme
default_locale: %locale% default_locale: %locale%
session: trust_proxy_headers: false # Should Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP)
auto_start: true session: ~
# Twig Configuration # Twig Configuration
twig: twig:

19
app/config/routing.yml
View File

@ -1,15 +1,12 @@
KekRozsakAdminBundle: KekRozsakAdminBundle:
resource: "@KekRozsakAdminBundle/Controller/DefaultController.php" resource: "@KekRozsakAdminBundle/Controller/"
type: annotation type: annotation
KekRozsakFrontBundle:
resource: "@KekRozsakFrontBundle/Controller/"
type: annotation
KekRozsakSecurityBundle: KekRozsakSecurityBundle:
resource: "@KekRozsakSecurityBundle/Controller/DefaultController.php" resource: "@KekRozsakSecurityBundle/Controller/"
type: annotation type: annotation
KekRozsakFrontBundle_Default:
resource: "@KekRozsakFrontBundle/Controller/DefaultController.php"
type: annotation
KekRozsakFrontBundle_Forum:
resource: "@KekRozsakFrontBundle/Controller/ForumController.php"
type: annotation

7
app/config/security.yml
View File

@ -5,7 +5,7 @@ jms_security_extra:
security: security:
encoders: encoders:
Symfony\Component\Security\Core\User\User: plaintext Symfony\Component\Security\Core\User\User: plaintext
KekRozsak\FrontBundle\Entity\User: KekRozsak\SecurityBundle\Entity\User:
id: kek_rozsak_security.encoder.crypt id: kek_rozsak_security.encoder.crypt
role_hierarchy: role_hierarchy:
@ -15,7 +15,7 @@ security:
providers: providers:
user_db: user_db:
entity: entity:
class: KekRozsak\FrontBundle\Entity\User class: KekRozsak\SecurityBundle\Entity\User
property: username property: username
firewalls: firewalls:
@ -29,6 +29,7 @@ security:
members: members:
pattern: ^/ pattern: ^/
form_login: form_login:
check_path: /login_check check_path: /login_check
login_path: /login login_path: /login
@ -42,7 +43,7 @@ security:
- { path: ^/$, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/cikk/, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/cikk/, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/jelentkezes, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/jelentkezes, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/most-varj, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/most_varj, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/, roles: [ IS_AUTHENTICATED_FULLY, IS_AUTHENTICATED_REMEMBERED ] } - { path: ^/, roles: [ IS_AUTHENTICATED_FULLY, IS_AUTHENTICATED_REMEMBERED ] }
#- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
#- { path: ^/_internal/secure, roles: IS_AUTHENTICATED_ANONYMOUSLY, ip: 127.0.0.1 } #- { path: ^/_internal/secure, roles: IS_AUTHENTICATED_ANONYMOUSLY, ip: 127.0.0.1 }

23
app/upgrade.php Normal file
View File

@ -0,0 +1,23 @@
<?php
// This script is very conservative in what it uses to avoid breaks at all costs
use Sensio\Bundle\DistributionBundle\Upgrade\Upgrade;
use Symfony\Component\Console\Output\ConsoleOutput;
// We don't use the app autoloader in case it is not up to date
require_once __DIR__.'/../vendor/autoload.php';
$upgrade = new Upgrade();
$output = new ConsoleOutput();
$skeletonDir = __DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton';
$files = array(
__DIR__.'/console' => $skeletonDir.'/app/console',
__DIR__.'/autoload.php' => $skeletonDir.'/app/autoload.php',
);
foreach ($files as $file => $skeleton) {
$upgrade->outputConsoleDiff($output, $file, $skeleton);
}

7
composer.json
View File

@ -23,17 +23,20 @@
"post-install-cmd": [ "post-install-cmd": [
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets" "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
], ],
"post-update-cmd": [ "post-update-cmd": [
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets" "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
] ]
}, },
"config": { "config": {
"bin-dir": "bin" "bin-dir": "bin"
}, },
"minimum-stability": "dev",
"extra": { "extra": {
"symfony-app-dir": "app", "symfony-app-dir": "app",
"symfony-web-dir": "web" "symfony-web-dir": "web"

52
composer.lock generated
View File

@ -1,5 +1,5 @@
{ {
"hash": "60f09c83d9f0891b51ac51941970dcd5", "hash": "ab7ccf177098603cace942212179431f",
"packages": [ "packages": [
{ {
"package": "doctrine/common", "package": "doctrine/common",
@ -8,17 +8,20 @@
{ {
"package": "doctrine/dbal", "package": "doctrine/dbal",
"version": "2.2.x-dev", "version": "2.2.x-dev",
"source-reference": "8cc129aa64a8de6447056bce20f0a274fe2a340b" "source-reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730",
"commit-date": "1341779435"
}, },
{ {
"package": "doctrine/doctrine-bundle", "package": "doctrine/doctrine-bundle",
"version": "dev-master", "version": "dev-master",
"source-reference": "94951737d6c692500d6b13bb92871935568a4ba5" "source-reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692",
"commit-date": "1341405737"
}, },
{ {
"package": "doctrine/orm", "package": "doctrine/orm",
"version": "2.2.x-dev", "version": "2.2.x-dev",
"source-reference": "5f66c65c9a8d984899903b54215d0249a45b92d6" "source-reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4",
"commit-date": "1341676080"
}, },
{ {
"package": "jms/aop-bundle", "package": "jms/aop-bundle",
@ -49,7 +52,8 @@
{ {
"package": "kriswallsmith/assetic", "package": "kriswallsmith/assetic",
"version": "dev-master", "version": "dev-master",
"source-reference": "d6f89a3170c5280ad554347dc113eb25fdf00ad7" "source-reference": "d6f89a3170c5280ad554347dc113eb25fdf00ad7",
"commit-date": "1339515714"
}, },
{ {
"package": "monolog/monolog", "package": "monolog/monolog",
@ -58,43 +62,50 @@
{ {
"package": "sensio/distribution-bundle", "package": "sensio/distribution-bundle",
"version": "dev-master", "version": "dev-master",
"source-reference": "a360ad61fe34206a7295c1ef00b5455b2b2e1071" "source-reference": "9a7dbd867fd5061e4bfd660a175aa66122f53d25",
"commit-date": "1341741741"
}, },
{ {
"package": "sensio/framework-extra-bundle", "package": "sensio/framework-extra-bundle",
"version": "dev-master", "version": "dev-master",
"source-reference": "62e41b85947034b0f1dfe31bb8e76920e1488571" "source-reference": "4f54e5d5fb3b54fb107892684018f3704934c48d",
"commit-date": "1341126219"
}, },
{ {
"package": "sensio/generator-bundle", "package": "sensio/generator-bundle",
"version": "dev-master", "version": "dev-master",
"source-reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36" "source-reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36",
"commit-date": "1340138445"
}, },
{ {
"package": "swiftmailer/swiftmailer", "package": "swiftmailer/swiftmailer",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "4.1.x-dev", "alias-pretty-version": "4.2.x-dev",
"alias-version": "4.1.9999999.9999999-dev" "alias-version": "4.2.9999999.9999999-dev"
}, },
{ {
"package": "swiftmailer/swiftmailer", "package": "swiftmailer/swiftmailer",
"version": "dev-master", "version": "dev-master",
"source-reference": "d57ffdeed664d6061cef0047e1f5d3fc3ee3fb99" "source-reference": "f51b5f33c83b48faea75f1285f99a2e8f1c66f75",
"commit-date": "1341746460"
}, },
{ {
"package": "symfony/assetic-bundle", "package": "symfony/assetic-bundle",
"version": "dev-master", "version": "dev-master",
"source-reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc" "source-reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc",
"commit-date": "1340234971"
}, },
{ {
"package": "symfony/monolog-bundle", "package": "symfony/monolog-bundle",
"version": "dev-master", "version": "dev-master",
"source-reference": "0b5046d3d1ef93cd59ceabfa37de2665f5118c7f" "source-reference": "7fe7f711bb04b86ad7f45a9e11a7f8cbaf9bc1a5",
"commit-date": "1341078487"
}, },
{ {
"package": "symfony/swiftmailer-bundle", "package": "symfony/swiftmailer-bundle",
"version": "dev-master", "version": "dev-master",
"source-reference": "d05c9c514a631ee688c53c4cc5505da757bd50d3" "source-reference": "e1d413ce27fd1696bdc82ad9525f1b874664530e",
"commit-date": "1341509614"
}, },
{ {
"package": "symfony/symfony", "package": "symfony/symfony",
@ -105,23 +116,26 @@
{ {
"package": "symfony/symfony", "package": "symfony/symfony",
"version": "dev-master", "version": "dev-master",
"source-reference": "v2.1.0-BETA1" "source-reference": "v2.1.0-BETA2",
"commit-date": "1341820358"
}, },
{ {
"package": "twig/extensions", "package": "twig/extensions",
"version": "dev-master", "version": "dev-master",
"source-reference": "feb6d3f10c411e2631997c0a905aa581c80305c1" "source-reference": "feb6d3f10c411e2631997c0a905aa581c80305c1",
"commit-date": "1337599699"
}, },
{ {
"package": "twig/twig", "package": "twig/twig",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "1.8.x-dev", "alias-pretty-version": "1.9.x-dev",
"alias-version": "1.8.9999999.9999999-dev" "alias-version": "1.9.9999999.9999999-dev"
}, },
{ {
"package": "twig/twig", "package": "twig/twig",
"version": "dev-master", "version": "dev-master",
"source-reference": "4679ad51c5390648b7ea4c8f0ecd2c0c344145ba" "source-reference": "26eb0a2653eade50dffdd31b11ca454232dea8cf",
"commit-date": "1341423205"
} }
], ],
"packages-dev": [ "packages-dev": [

12
src/KekRozsak/AdminBundle/Controller/DefaultController.php
View File

@ -2,8 +2,9 @@
namespace KekRozsak\AdminBundle\Controller; namespace KekRozsak\AdminBundle\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
/** /**
* @Route("/admin") * @Route("/admin")
@ -11,14 +12,15 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
class DefaultController extends Controller class DefaultController extends Controller
{ {
/** /**
* @Route("/jelentkezok", name="KekRozsakAdminBundle_manage_reg") * @Route("/manage_regs", name="KekRozsakAdminBundle_manage_regs")
* @Template()
*/ */
public function manageRegsAction() public function manageRegsAction()
{ {
$users = $this->getDoctrine()->getEntityManager()->createQuery('SELECT u FROM KekRozsakFrontBundle:User u WHERE u.acceptedBy IS NULL')->getResult(); $users = $this->getDoctrine()->getEntityManager()->createQuery('SELECT u FROM KekRozsakSecurityBundle:User u WHERE u.acceptedBy IS NULL')->getResult();
return $this->render('KekRozsakAdminBundle:Default:manage_regs.html.twig', array ( return array(
'users' => $users, 'users' => $users,
)); );
} }
} }

4
src/KekRozsak/AdminBundle/Resources/config/routing.yml
View File

@ -1,4 +0,0 @@
KekRozsakAdminBundle_manage_regs:
pattern: /jelentkezok
defaults:
_controller: KekRozsakAdminBundle:Default:manageRegs

0
src/KekRozsak/AdminBundle/Resources/views/Default/manage_regs.html.twig → src/KekRozsak/AdminBundle/Resources/views/Default/manageRegs.html.twig
View File

43
src/KekRozsak/FrontBundle/Controller/DefaultController.php
View File

@ -2,10 +2,12 @@
namespace KekRozsak\FrontBundle\Controller; namespace KekRozsak\FrontBundle\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use KekRozsak\FrontBundle\Form\Type\UserType; use KekRozsak\FrontBundle\Entity\UserData;
use KekRozsak\SecurityBundle\Form\Type\UserType;
class DefaultController extends Controller class DefaultController extends Controller
{ {
@ -14,7 +16,7 @@ class DefaultController extends Controller
*/ */
public function homepageAction() public function homepageAction()
{ {
$mainPageArticle = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:Article')->findOneBy(array('mainPage' => 1), true, array('createdAt', 'DESC'), 1); $mainPageArticle = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:Article')->findOneBy(array('mainPage' => true), true, array('createdAt', 'DESC'), 1);
if (!$mainPageArticle) if (!$mainPageArticle)
throw $this->createNotFoundException('A keresett cikk nem létezik!'); throw $this->createNotFoundException('A keresett cikk nem létezik!');
@ -23,6 +25,9 @@ class DefaultController extends Controller
/** /**
* @Route("/cikk/{articleSlug}", name="KekRozsakFrontBundle_article") * @Route("/cikk/{articleSlug}", name="KekRozsakFrontBundle_article")
* @Template()
*
* @param string $articleSlug
*/ */
public function articleAction($articleSlug) public function articleAction($articleSlug)
{ {
@ -31,49 +36,43 @@ class DefaultController extends Controller
if (!$article) if (!$article)
throw $this->createNotFoundException('A keresett cikk nem létezik!'); throw $this->createNotFoundException('A keresett cikk nem létezik!');
return $this->render('KekRozsakFrontBundle:Default:article.html.twig', array( return array(
'article' => $article 'article' => $article,
)); );
} }
/** /**
* @Route("/profil", name="KekRozsakFrontBundle_profile_edit") * @Route("/profil", name="KekRozsakFrontBundle_profile_edit")
* @Template("KekRozsakFrontBundle:Default:userprofile.html.twig")
*/ */
public function profileEditAction() public function profileEditAction()
{ {
$user = $this->get('security.context')->getToken()->getUser(); $user = $this->get('security.context')->getToken()->getUser();
$oldPassword = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:User')->findOneById($user->getId())->getPassword();
$form = $this->createForm(new UserType(), $user);
$oldPassword = $user->getPassword();
$form = $this->createForm(new UserType(), $user);
$saveSuccess = false; $saveSuccess = false;
$request = $this->getRequest(); $request = $this->getRequest();
if ($request->getMethod() == 'POST') if ($request->getMethod() == 'POST')
{ {
$form->bindRequest($request); $form->bindRequest($request);
if ($form->isValid()) if ($form->isValid())
{ {
if ($user->getPassword() != '') if ($this->getPassword() == '')
{
$user->setPassword($this->get('security.encoder_factory')->getEncoder($user)->encodePassword($user->getPassword(), $user->getSalt()));
}
else
{
$user->setPassword($oldPassword); $user->setPassword($oldPassword);
} else
if ($user->getUserData()->getUserId() === null) $user->setPassword($this->get('security.encoder_factory')->getEncoder($user)->encodePassword($user->getPassword(), $user->getSalt()));
{
$user->getUserData()->setUser($user);
}
$em = $this->getDoctrine()->getEntityManager(); $em = $this->getDoctrine()->getEntityManager();
$em->persist($user); $em->persist($user);
$em->flush(); $em->flush();
// $saveSuccess = true
} }
} }
return $this->render('KekRozsakFrontBundle:Default:userprofile.html.twig', array( return array(
'form' => $form->createView(), 'form' => $form->createView(),
'saveSuccess' => $saveSuccess, 'saveSuccess' => $saveSuccess,
)); );
} }
} }

27
src/KekRozsak/FrontBundle/Controller/ForumController.php
View File

@ -2,9 +2,10 @@
namespace KekRozsak\FrontBundle\Controller; namespace KekRozsak\FrontBundle\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use KekRozsak\FrontBundle\Entity\ForumPost; use KekRozsak\FrontBundle\Entity\ForumPost;
use KekRozsak\FrontBundle\Form\Type\ForumPostType; use KekRozsak\FrontBundle\Form\Type\ForumPostType;
@ -16,40 +17,42 @@ class ForumController extends Controller
{ {
/** /**
* @Route("", name="KekRozsakFrontBundle_forum_main") * @Route("", name="KekRozsakFrontBundle_forum_main")
* @Template("KekRozsakFrontBundle:Forum:topic_group_list.html.twig")
*/ */
public function mainAction() public function mainAction()
{ {
// TODO: Protect this controller with roles? It is also defined in security.yml
$groupRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:ForumTopicGroup'); $groupRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:ForumTopicGroup');
// TODO: ORDER the topic list by last post date
$topicGroups = $groupRepo->findAll(); $topicGroups = $groupRepo->findAll();
return $this->render('KekRozsakFrontBundle:Forum:topic_group_list.html.twig', array( return array(
'topicGroups' => $topicGroups, 'topicGroups' => $topicGroups,
)); );
} }
/** /**
* @Route("/{topicGroupSlug}", name="KekRozsakFrontBundle_forum_topic_list") * @Route("/{topicGroupSlug}", name="KekRozsakFrontBundle_forum_topic_list")
* @Template("KekRozsakFrontBundle:Forum:topic_list.html.twig")
*/ */
public function topicListAction($topicGroupSlug) public function topicListAction($topicGroupSlug)
{ {
$groupRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:ForumTopicGroup'); $groupRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:ForumTopicGroup');
if (!($topicGroup = $groupRepo->findOneBySlug($topicGroupSlug))) if (!($topicGroup = $groupRepo->findOneBySlug($topicGroupSlug)))
throw $this->createNotFoundException('A kért témakör nem létezik!'); throw $this->createNotFoundException('A kért témakör nem létezik!');
return $this->render('KekRozsakFrontBundle:Forum:topic_list.html.twig', array( return array(
'topicGroup' => $topicGroup, 'topicGroup' => $topicGroup,
)); );
} }
/** /**
* @Route("/{topicGroupSlug}/{topicSlug}", name="KekRozsakFrontBundle_forum_post_list") * @Route("/{topicGroupSlug}/{topicSlug}", name="KekRozsakFrontBundle_forum_post_list")
* @Template("KekRozsakFrontBundle:Forum:post_list.html.twig")
*/ */
public function postListAction($topicGroupSlug, $topicSlug) public function postListAction($topicGroupSlug, $topicSlug)
{ {
$request = $this->getRequest();
// Get the topic group based on slug // Get the topic group based on slug
$groupRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:ForumTopicGroup'); $groupRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:ForumTopicGroup');
if (!($topicGroup = $groupRepo->findOneBySlug($topicGroupSlug))) if (!($topicGroup = $groupRepo->findOneBySlug($topicGroupSlug)))
@ -68,6 +71,7 @@ class ForumController extends Controller
$post = new ForumPost(); $post = new ForumPost();
$form = $this->createForm(new ForumPostType($topicGroup->getId(), $topic->getId()), $post); $form = $this->createForm(new ForumPostType($topicGroup->getId(), $topic->getId()), $post);
$request = $this->getRequest();
if ($request->getMethod() == 'POST') if ($request->getMethod() == 'POST')
{ {
$form->bindRequest($request); $form->bindRequest($request);
@ -89,12 +93,11 @@ class ForumController extends Controller
} }
} }
return $this->render('KekRozsakFrontBundle:Forum:post_list.html.twig', array( return array(
'topicGroup' => $topicGroup, 'topicGroup' => $topicGroup,
'topic' => $topic, 'topic' => $topic,
'posts' => $posts, 'posts' => $posts,
'form' => $form->createView(), 'form' => $form->createView(),
)); );
} }
} }

289
src/KekRozsak/FrontBundle/Entity/Article.php
View File

@ -4,10 +4,9 @@ namespace KekRozsak\FrontBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use KekRozsak\FrontBundle\Entity\User; use KekRozsak\SecurityBundle\Entity\User;
/** /**
* KekRozsak\FrontBundle\Entity\Article
* @ORM\Entity * @ORM\Entity
* @ORM\Table(name="articles") * @ORM\Table(name="articles")
*/ */
@ -17,23 +16,80 @@ class Article
* @var integer $id * @var integer $id
* @ORM\Id * @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO") * @ORM\GeneratedValue(strategy="AUTO")
* @ORM\Column(type="integer", name="id") * @ORM\Column(type="integer")
*/ */
private $id; private $id;
/** /**
* Get id * Get id
* *
* @return integer * @return integer
*/ */
public function getId() public function getId()
{ {
return $this->id; return $this->id;
} }
/**
* @var KekRozsak\SecurityBundle\Entity\User $createdBy
* @ORM\ManyToOne(targetEntity="KekRozsak\SecurityBundle\Entity\User")
* @ORM\JoinColumn(name="created_by_id")
*/
private $createdBy;
/**
* Set createdBy
*
* @param KekRozsak\SecurityBundle\Entity\User $createdBy
* @return Article
*/
public function setCreatedBy(\KekRozsak\SecurityBundle\Entity\User $createdBy)
{
$this->createdBy = $createdBy;
return $this;
}
/**
* Get createdBy
*
* @return KekRozsak\SecurityBundle\Entity\User
*/
public function getCreatedBy()
{
return $this->createdBy;
}
/**
* @var DateTime $createdAt
* @ORM\Column(type="datetime", name="created_at", nullable=false)
*/
private $createdAt;
/**
* Set createdAt
*
* @param DateTime $createdAt
* @return Article
*/
public function setCreatedAt(\DateTime $createdAt)
{
$this->createdAt = $createdAt;
return $this;
}
/**
* Get createdAt
*
* @return DateTime
*/
public function getCreatedAt()
{
return $this->createdAt;
}
/** /**
* @var string $title * @var string $title
* @ORM\Column(type="string", length=100, nullable=false) * @ORM\Column(type="string", length=100, nullable=false, unique=true)
*/ */
private $title; private $title;
@ -52,7 +108,7 @@ class Article
/** /**
* Get title * Get title
* *
* @return string * @return string
*/ */
public function getTitle() public function getTitle()
{ {
@ -80,7 +136,7 @@ class Article
/** /**
* Get slug * Get slug
* *
* @return string * @return string
*/ */
public function getSlug() public function getSlug()
{ {
@ -88,7 +144,7 @@ class Article
} }
/** /**
* @var text $text * @var string $text
* @ORM\Column(type="text", nullable=false) * @ORM\Column(type="text", nullable=false)
*/ */
private $text; private $text;
@ -96,7 +152,7 @@ class Article
/** /**
* Set text * Set text
* *
* @param text $text * @param string $text
* @return Article * @return Article
*/ */
public function setText($text) public function setText($text)
@ -108,186 +164,16 @@ class Article
/** /**
* Get text * Get text
* *
* @return text * return string
*/ */
public function getText() public function getText()
{ {
return $this->text; return $this->text;
} }
/**
* @var string $source
* @ORM\Column(type="string", length=255, nullable=true)
*/
private $source;
/**
* Set source
*
* @param string $source
* @return Article
*/
public function setSource($source)
{
$this->source = $source;
return $this;
}
/**
* Get source
*
* @return string
*/
public function getSource()
{
return $this->source;
}
/**
* @var DateTime $createdAt
* @ORM\Column(type="datetime", nullable=false, name="created_at")
*/
private $createdAt;
/**
* Set createdAt
*
* @param DateTime $createdAt
* @return Article
*/
public function setCreatedAt(\DateTime $createdAt)
{
$this->createdAt = $createdAt;
return $this;
}
/**
* Get createdAt
*
* @return DateTime
*/
public function getCreatedAt()
{
return $this->createdAt;
}
/**
* @var User $createdBy
* @ORM\ManyToOne(targetEntity="User", inversedBy="articles")
* @ORM\JoinColumn(name="created_by_id", referencedColumnName="id")
*/
private $createdBy;
/**
* Set createdBy
*
* @param User $createdBy
* @return Article
*/
public function setCreatedBy(User $createdBy = null)
{
$this->createdBy = $createdBy;
return $this;
}
/**
* Get createdBy
*
* @return User
*/
public function getCreatedBy()
{
return $this->createdBy;
}
/**
* @var DateTime $updatedAt
* @ORM\Column(type="datetime", nullable=true, name="updated_at")
*/
private $updatedAt;
/**
* Set updatedAt
*
* @param DateTime $updatedAt
* @return Article
*/
public function setUpdatedAt(\DateTime $updatedAt)
{
$this->updatedAt = $updatedAt;
return $this;
}
/**
* Get updatedAt
*
* @return DateTime
*/
public function getUpdatedAt()
{
return $this->updatedAt;
}
/**
* @var User $updatedBy
* @ORM\ManyToOne(targetEntity="User")
* @ORM\JoinColumn(name="updated_by_id", referencedColumnName="id")
*/
private $updatedBy;
/**
* Set updatedBy
*
* @param User $updatedBy
* @return Article
*/
public function setUpdatedBy(User $updatedBy = null)
{
$this->updatedBy = $updatedBy;
return $this;
}
/**
* Get updatedBy
*
* @return User
*/
public function getUpdatedBy()
{
return $this->updatedBy;
}
/**
* @var text $updateReason
* @ORM\Column(type="text", nullable=true, name="update_reason")
*/
private $updateReason;
/**
* Set updateReason
*
* @param text $updateReason
* @return Article
*/
public function setUpdateReason($updateReason)
{
$this->updateReason = $updateReason;
return $this;
}
/**
* Get updateReason
*
* @return text
*/
public function getUpdateReason()
{
return $this->updateReason;
}
/** /**
* @var boolean $mainPage * @var boolean $mainPage
* @ORM\Column(type="boolean", name="main_page", nullable=true) * @ORM\Column(type="boolean", name="main_page")
*/ */
private $mainPage; private $mainPage;
@ -306,7 +192,7 @@ class Article
/** /**
* Get mainPage * Get mainPage
* *
* @return boolean * @return boolean
*/ */
public function getMainPage() public function getMainPage()
{ {
@ -314,7 +200,7 @@ class Article
} }
/** /**
* @var boolean $public * @var boolean public
* @ORM\Column(type="boolean", nullable=false) * @ORM\Column(type="boolean", nullable=false)
*/ */
private $public; private $public;
@ -325,7 +211,7 @@ class Article
* @param boolean $public * @param boolean $public
* @return Article * @return Article
*/ */
public function setPublic($public) public function setPublic($public = false)
{ {
$this->public = $public; $this->public = $public;
return $this; return $this;
@ -334,10 +220,39 @@ class Article
/** /**
* Get public * Get public
* *
* @return boolean * @return boolean
*/ */
public function getPublic() public function isPublic()
{ {
return $this->public; return $this->public;
} }
/**
* @var string $source
* @ORM\Column(type="string", nullable=true)
*/
private $source;
/**
* Set source
*
* @param string $source
* @return Article
*/
public function setSource($source = null)
{
$this->source = $source;
return $this;
}
/**
* Get source
*
* @return string
*/
public function getSource()
{
return $this->source;
}
} }

221
src/KekRozsak/FrontBundle/Entity/ForumPost.php
View File

@ -2,14 +2,11 @@
namespace KekRozsak\FrontBundle\Entity; namespace KekRozsak\FrontBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\Orm\Mapping as ORM;
use KekRozsak\FrontBundle\Entity\User;
use KekRozsak\FrontBundle\Entity\ForumTopic; use KekRozsak\FrontBundle\Entity\ForumTopic;
use KekRozsak\FrontBundle\Entity\ForumTopicGroup;
/** /**
* KekRozsak\FrontBundle\Entity\ForumPost
* @ORM\Entity * @ORM\Entity
* @ORM\Table(name="forum_posts") * @ORM\Table(name="forum_posts")
*/ */
@ -26,7 +23,7 @@ class ForumPost
/** /**
* Get id * Get id
* *
* @return integer * @return integer
*/ */
public function getId() public function getId()
{ {
@ -34,8 +31,36 @@ class ForumPost
} }
/** /**
* @var datetime $createdAt * @ORM\ManyToOne(targetEntity="\KekRozsak\SecurityBundle\Entity\User")
* @ORM\Column(type="datetime", name="created_at", nullable=false) * @ORM\JoinColumn(name="created_by_id")
*/
private $createdBy;
/**
* Set createdBy
*
* @param \KekRozsak\SecurityBundle\Entity\User $createdBy
* @return ForumPost
*/
public function setCreatedBy(\KekRozsak\SecurityBundle\Entity\User $createdBy)
{
$this->createdBy = $createdBy;
return $this;
}
/**
* Get createdBy
*
* @return \KekRozsak\SecurityBundle\Entity\User
*/
public function getCreatedBy()
{
return $this->createdBy;
}
/**
* @var DateTime $createdAt
* @ORM\Column(type="datetime", name="created_at")
*/ */
private $createdAt; private $createdAt;
@ -45,16 +70,15 @@ class ForumPost
* @param DateTime $createdAt * @param DateTime $createdAt
* @return ForumPost * @return ForumPost
*/ */
public function setCreatedAt($createdAt) public function setCreatedAt(\DateTime $createdAt)
{ {
$this->createdAt = $createdAt; $this->createdAt = $createdAt;
return $this;
} }
/** /**
* Get createdAt * Get createdAt
* *
* @return DateTime * @return DateTime
*/ */
public function getCreatedAt() public function getCreatedAt()
{ {
@ -62,151 +86,7 @@ class ForumPost
} }
/** /**
* @var User $createdBy * @var string $text
* @ORM\ManyToOne(targetEntity="User", inversedBy="forumPosts")
* @ORM\JoinColumn(name="created_by_id", referencedColumnName="id")
*/
private $createdBy;
/**
* Set createdBy
*
* @param User $createdBy
* @return ForumPost
*/
public function setCreatedBy(User $createdBy)
{
$this->createdBy = $createdBy;
return $this;
}
/**
* Get createdBy
*
* @return User
*/
public function getCreatedBy()
{
return $this->createdBy;
}
/**
* @var datetime $updatedAt
* @ORM\Column(type="datetime", name="updated_at", nullable=true)
*/
private $updatedAt;
/**
* Set updatedAt
*
* @param DateTime $updatedAt
* @return ForumPost
*/
public function setUpdatedAt(\DateTime $updatedAt = null)
{
$this->updatedAt = $updatedAt;
return $this;
}
/**
* Get updatedAt
*
* @return DateTime
*/
public function getUpdatedAt()
{
return $this->updatedAt;
}
/**
* @var User $updatedBy
* @ORM\ManyToOne(targetEntity="User")
* @ORM\JoinColumn(name="updated_by_id", referencedColumnName="id")
*/
private $updatedBy;
/**
* Set updatedBy
*
* @param User $updatedBy
* @return ForumPost
*/
public function setUpdatedBy(User $updatedBy = null)
{
$this->updatedBy = $updatedBy;
return $this;
}
/**
* Get updatedBy
*
* @return User
*/
public function getUpdatedBy()
{
return $this->updatedBy;
}
/**
* @var string $updateReason
* @ORM\Column(type="text", name="update_reason", nullable=true)
*/
private $updateReason;
/**
* Set updateReason
*
* @param string $updateReason
* @return ForumPost
*/
public function setUpdateReason($updateReason = null)
{
$this->updateReason = $updateReason;
return $this;
}
/**
* Get updateReason
*
* @return string
*/
public function getUpdateReason()
{
return $this->updateReason;
}
/**
* @var ForumTopic $topic
* @ORM\ManyToOne(targetEntity="ForumTopic", inversedBy="posts")
*/
private $topic;
/**
* Set topic
*
* @param ForumTopic $topic
* @return ForumPost
*/
public function setTopic(ForumTopic $topic)
{
$this->topic = $topic;
if (($this->topic->getLastPost() === null) || ($this->topic->getLastPost()->getCreatedAt() > $this->createdAt))
$topic->setLastPost($this);
return $this;
}
/**
* Get topic
*
* @return ForumTopic
*/
public function getTopic()
{
return $this->topic;
}
/**
* @var text $text
* @ORM\Column(type="text", nullable=false) * @ORM\Column(type="text", nullable=false)
*/ */
private $text; private $text;
@ -226,10 +106,39 @@ class ForumPost
/** /**
* Get text * Get text
* *
* @return string * @return string
*/ */
public function getText() public function getText()
{ {
return $this->text; return $this->text;
} }
/**
* @var ForumTopic $topic
* @ORM\ManyToOne(targetEntity="ForumTopic", inversedBy="posts")
*/
private $topic;
/**
* Set topic
*
* @param ForumTopic $topic
* @return ForumPost
*/
public function setTopic(ForumTopic $topic)
{
$this->topic = $topic;
return $this;
}
/**
* Get topic
*
* @return ForumTopic
*/
public function getTopic()
{
return $this->topic;
}
} }

288
src/KekRozsak/FrontBundle/Entity/ForumTopic.php
View File

@ -3,21 +3,19 @@
namespace KekRozsak\FrontBundle\Entity; namespace KekRozsak\FrontBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Doctrine\Common\Collections\ArrayCollection;
use KekRozsak\FrontBundle\Entity\User; use KekRozsak\SecurityBundle\Entity\User;
use KekRozsak\FrontBundle\Entity\ForumTopicGroup;
use KekRozsak\FrontBundle\Entity\ForumPost;
/** /**
* KekRozsak\FrontBundle\Entity\ForumTopic
* @ORM\Entity * @ORM\Entity
* @ORM\Table(name="forum_topics", uniqueConstraints={@ORM\UniqueConstraint(columns={"topic_group_id", "title"}), @ORM\UniqueConstraint(columns={"topic_group_id", "slug"})}) * @ORM\Table(name="forum_topics")
*/ */
class ForumTopic class ForumTopic
{ {
public function __construct() public function __construct()
{ {
$this->posts = new \Doctrine\Common\Collections\ArrayCollection(); $this->posts = new ArrayCollection();
} }
/** /**
@ -31,72 +29,46 @@ class ForumTopic
/** /**
* Get id * Get id
* *
* @return integer * @return integer
*/ */
public function getId() public function getId()
{ {
return $this->id; return $this->id;
} }
/** /**
* @var string $title * @var KekRozsak\SecurityBundle\Entity\User $createdBy
* @ORM\Column(type="string", length=100) * @ORM\ManyToOne(targetEntity="KekRozsak\SecurityBundle\Entity\User")
* @ORM\JoinColumn(name="created_by_id")
*/ */
private $title; private $createdBy;
/** /**
* Set title * Set createdBy
* *
* @param string $title * @param KekRozsak\SecurityBundle\Entity\User
* @return ForumTopic * @return ForumTopic
*/ */
public function setTitle($title) public function setCreatedBy(\KekRozsak\SecurityBundle\Entity\User $createdBy)
{ {
$this->title = $title; $this->createdBy = $createdBy;
return $this; return $this;
} }
/** /**
* Get title * Get createdBy
* *
* @return string * @return KekRozsak\SecurityBundle\Entity\User
*/ */
public function getTitle() public function getCreatedBy()
{ {
return $this->title; return $this->createdBy;
} }
/**
* @var string $slug
* @ORM\Column(type="string", length=100)
*/
private $slug;
/** /**
* Set slug * @var DateTime $createdAt
* * @ORM\Column(type="datetime", nullable=false, name="created_at")
* @param string $slug
* @return ForumTopic
*/
public function setSlug($slug)
{
$this->slug = $slug;
return $this;
}
/**
* Get slug
*
* @return string
*/
public function getSlug()
{
return $this->slug;
}
/**
* @var datetime $createdAt
* @ORM\Column(type="datetime", name="created_at")
*/ */
private $createdAt; private $createdAt;
@ -106,7 +78,7 @@ class ForumTopic
* @param DateTime $createdAt * @param DateTime $createdAt
* @return ForumTopic * @return ForumTopic
*/ */
public function setCreatedAt($createdAt) public function setCreatedAt(\DateTime $createdAt)
{ {
$this->createdAt = $createdAt; $this->createdAt = $createdAt;
return $this; return $this;
@ -115,7 +87,7 @@ class ForumTopic
/** /**
* Get createdAt * Get createdAt
* *
* @return DateTime * @return DateTime
*/ */
public function getCreatedAt() public function getCreatedAt()
{ {
@ -123,123 +95,9 @@ class ForumTopic
} }
/** /**
* @var User * @var ForumTopicGroup $topicGroup
* @ORM\ManyToOne(targetEntity="User") * @ORM\ManyToOne(targetEntity="ForumTopicGroup", inversedBy="topics")
* @ORM\JoinColumn(name="created_by_id") * @ORM\JoinColumn(name="topic_group_id")
*/
private $createdBy;
/**
* Set createdBy
*
* @param User $createdBy
* @return ForumTopic
*/
public function setCreatedBy(\User $createdBy)
{
$this->createdBy = $createdBy;
return $this;
}
/**
* Get createdBy
*
* @return User
*/
public function getCreatedBy()
{
return $this->createdBy;
}
/**
* @var datetime $updatedAt
* @ORM\Column(type="datetime", name="updated_at", nullable=true)
*/
private $updatedAt;
/**
* Set updatedAt
*
* @param datetime $updatedAt
* @return ForumTopic
*/
public function setUpdatedAt(\DateTime $updatedAt = null)
{
$this->updatedAt = $updatedAt;
return $this;
}
/**
* Get updatedAt
*
* @return datetime
*/
public function getUpdatedAt()
{
return $this->updatedAt;
}
/**
* @var User
* @ORM\ManyToOne(targetEntity="User")
* @ORM\JoinColumn(name="updated_by_id")
*/
private $updatedBy;
/**
* Set updatedBy
*
* @param User $updatedBy
* @return ForumTopic
*/
public function setUpdatedBy(User $updatedBy = null)
{
$this->updatedBy = $updatedBy;
return $this;
}
/**
* Get updatedBy
*
* @return User
*/
public function getUpdatedBy()
{
return $this->updatedBy;
}
/**
* @var text $updateReason
* @ORM\Column(type="text", name="update_reason")
*/
private $updateReason;
/**
* Set updateReason
*
* @param text $updateReason
* @return ForumTopic
*/
public function setUpdateReason($updateReason)
{
$this->updateReason = $updateReason;
return $this;
}
/**
* Get updateReason
*
* @return text
*/
public function getUpdateReason()
{
return $this->updateReason;
}
/**
* @var ForumTopicGroup
* @ORM\ManyToOne(targetEntity="ForumTopicGroup")
* @ORM\JoinColumn(name="topic_group_id", referencedColumnName="id")
*/ */
private $topicGroup; private $topicGroup;
@ -258,44 +116,73 @@ class ForumTopic
/** /**
* Get topicGroup * Get topicGroup
* *
* @return ForumTopicGroup * @return ForumTopicGroup
*/ */
public function getTopicGroup() public function getTopicGroup()
{ {
return $this->topicGroup; return $this->topicGroup;
} }
/**
* @var \Doctrine\Common\Collections\ArrayCollection
* @ORM\OneToMany(targetEntity="ForumPost", mappedBy="topic")
*/
private $posts;
/** /**
* Add posts * @var string $slug
* @ORM\Column(type="string", length=100, nullable=false)
*/
private $slug;
/**
* Set slug
* *
* @param ForumPost $posts * @param string $slug
* @return ForumTopic * @return ForumTopic
*/ */
public function addForumPost(ForumPost $posts) public function setSlug($slug)
{ {
$this->posts[] = $posts; $this->slug = $slug;
return $this; return $this;
} }
/** /**
* Get posts * Get slug
* *
* @return Doctrine\Common\Collections\Collection * @return string
*/ */
public function getPosts() public function getSlug()
{ {
return $this->posts; return $this->slug;
} }
/** /**
* @var ForumPost * @var string $title
* @ORM\Column(type="string", length=100, nullable=false)
*/
private $title;
/**
* Set title
*
* @param string $title
* @return ForumTopic
*/
public function setTitle($title)
{
$this->title = $title;
return $this;
}
/**
* Get title
*
* @return string
*/
public function getTitle()
{
return $this->title;
}
/**
* @var ForumPost $lastPost
* @ORM\OneToOne(targetEntity="ForumPost", cascade={"persist"}) * @ORM\OneToOne(targetEntity="ForumPost", cascade={"persist"})
* @ORM\JoinColumn(name="last_post_id", referencedColumnName="id") * @ORM\JoinColumn(name="last_post_id")
*/ */
private $lastPost; private $lastPost;
@ -305,20 +192,47 @@ class ForumTopic
* @param ForumPost $lastPost * @param ForumPost $lastPost
* @return ForumTopic * @return ForumTopic
*/ */
public function setLastPost(ForumPost $lastPost = null) public function setLastPost($lastPost = null)
{ {
$this->lastPost = $lastPost; $this->lastPost = $lastPost;
$this->topicGroup->setLastPost($lastPost);
return $this;
} }
/** /**
* Get lastPost * Get lastPost
* *
* @return ForumPost * @return ForumPost
*/ */
public function getLastPost() public function getLastPost()
{ {
return $this->lastPost; return $this->lastPost;
} }
/**
* @var ArrayCollection $topics;
* @ORM\OneToMany(targetEntity="ForumPost", mappedBy="topic")
*/
private $posts;
/**
* Add post
*
* @param ForumPost $post
* @return ForumTopic
*/
public function addPost(ForumPost $post)
{
$this->posts[] = $post;
return $this;
}
/**
* Get posts
*
* @return ArrayCollection
*/
public function getPosts()
{
return $this->posts;
}
} }

214
src/KekRozsak/FrontBundle/Entity/ForumTopicGroup.php
View File

@ -3,10 +3,9 @@
namespace KekRozsak\FrontBundle\Entity; namespace KekRozsak\FrontBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Doctrine\Common\Collections\ArrayCollection;
use KekRozsak\FrontBundle\Entity\User; use KekRozsak\SecurityBundle\Entity\User;
use KekRozsak\FrontBundle\Entity\ForumTopic;
use KekRozsak\FrontBundle\Entity\ForumPost;
/** /**
* KekRozsak\FrontBundle\Entity\ForumTopicGroup * KekRozsak\FrontBundle\Entity\ForumTopicGroup
@ -17,7 +16,7 @@ class ForumTopicGroup
{ {
public function __construct() public function __construct()
{ {
$this->topic = new \Doctrine\Common\Collections\ArrayCollection(); $this->topics = new ArrayCollection();
} }
/** /**
@ -31,7 +30,7 @@ class ForumTopicGroup
/** /**
* Get id * Get id
* *
* @return integer * @return integer
*/ */
public function getId() public function getId()
{ {
@ -39,64 +38,37 @@ class ForumTopicGroup
} }
/** /**
* @var string $title * @var KekRozsak\SecurityBundle\Entity\User $createdBy
* @ORM\Column(type="string", length=100, unique=true) * @ORM\ManyToOne(targetEntity="KekRozsak\SecurityBundle\Entity\User")
* @ORM\JoinColumn(name="created_by_id")
*/ */
private $title; private $createdBy;
/** /**
* Set title * Set createdBy
* *
* @param string $title * @param KekRozsak\SecurityBundle\Entity\User $createdBy
* @return ForumTopicGroup * @return ForumTopicGroup
*/ */
public function setTitle($title) public function setCreatedBy(\KekRozsak\SecurityBundle\Entity\User $createdBy)
{ {
$this->title = $title; $this->createdBy = $createdBy;
return $this; return $this;
} }
/** /**
* Get title * Get createdBy
* *
* @return string * @return KekRozsak\SecurityBundle\Entity\User
*/ */
public function getTitle() public function getCreatedBy()
{ {
return $this->title; return $this->createdBy;
} }
/** /**
* @var string $slug * @var DateTime $createdAt
* @ORM\Column(type="string", length=100, unique=true) * @ORM\Column(type="datetime", nullable=false)
*/
private $slug;
/**
* Set slug
*
* @param string $slug
* @return ForumTopicGroup
*/
public function setSlug($slug)
{
$this->slug = $slug;
return $this;
}
/**
* Get slug
*
* @return string
*/
public function getSlug()
{
return $this->slug;
}
/**
* @var datetime $createdAt
* @ORM\Column(type="datetime", name="created_at")
*/ */
private $createdAt; private $createdAt;
@ -115,7 +87,7 @@ class ForumTopicGroup
/** /**
* Get createdAt * Get createdAt
* *
* @return DateTime * @return DateTime
*/ */
public function getCreatedAt() public function getCreatedAt()
{ {
@ -123,161 +95,87 @@ class ForumTopicGroup
} }
/** /**
* @var User * @var string $slug
* @ORM\ManyToOne(targetEntity="User") * @ORM\Column(type="string", length=100, nullable=false, unique=true)
* @ORM\JoinColumn(name="created_by_id")
*/ */
private $createdBy; private $slug;
/** /**
* Set createdBy * Set slug
* *
* @param User $createdBy * @param string $slug
* @return ForumTopicGroup * @return ForumTopicGroup
*/ */
public function setCreatedBy(User $createdBy) public function setSlug($slug)
{ {
$this->createdBy = $createdBy; $this->slug = $slug;
return $this; return $this;
} }
/** /**
* Get createdBy * Get slug
* *
* @return User * @return string
*/ */
public function getCreatedBy() public function getSlug()
{ {
return $this->createdBy; return $this->slug;
} }
/** /**
* @var datetime $updatedAt * @var string $title
* @ORM\Column(type="datetime", name="updated_at", nullable=true) * @ORM\Column(type="string", length=100, nullable=false, unique=true)
*/ */
private $updatedAt; private $title;
/** /**
* Set updatedAt * Set title
* *
* @param DateTime $updatedAt * @param string $title
* @return ForumTopicGroup * @return ForumTopicGroup
*/ */
public function setUpdatedAt(\DateTime $updatedAt = null) public function setTitle($title)
{ {
$this->updatedAt = $updatedAt; $this->title = $title;
return $this; return $this;
} }
/** /**
* Get updatedAt * Get title
* *
* @return datetime * @return string
*/ */
public function getUpdatedAt() public function getTitle()
{ {
return $this->updatedAt; return $this->title;
} }
/** /**
* @var User * @var ArrayCollection $topics
* @ORM\ManyToOne(targetEntity="User")
* @ORM\JoinColumn(name="updated_by_id")
*/
private $updatedBy;
/**
* Set updatedBy
*
* @param User $updatedBy
* @return ForumTopicGroup
*/
public function setUpdatedBy(User $updatedBy = null)
{
$this->updatedBy = $updatedBy;
return $this;
}
/**
* Get updatedBy
*
* @return User
*/
public function getUpdatedBy()
{
return $this->updatedBy;
}
/**
* @var text $update_reason
* @ORM\Column(type="text", name="update_reason", nullable=true)
*/
private $updateReason;
/**
* Set updateReason
*
* @param text $updateReason
* @return ForumTopicGroup
*/
public function setUpdateReason($updateReason = null)
{
$this->updateReason = $updateReason;
return $this;
}
/**
* Get updateReason
*
* @return text
*/
public function getUpdateReason()
{
return $this->updateReason;
}
/**
* @var ForumPost
* @ORM\OneToOne(targetEntity="ForumPost", cascade={"persist"})
* @ORM\JoinColumn(name="last_post_id")
*/
private $lastPost;
/**
* Set lastPost
*
* @param ForumPost $lastPost
* @return ForumTopicGroup
*/
public function setLastPost(ForumPost $lastPost = null)
{
$this->lastPost = $lastPost;
return $this;
}
/**
* Get lastPost
*
* @return ForumPost
*/
public function getLastPost()
{
return $this->lastPost;
}
/**
* @var \Doctrine\Common\Collections\ArrayCollection
* @ORM\OneToMany(targetEntity="ForumTopic", mappedBy="topicGroup") * @ORM\OneToMany(targetEntity="ForumTopic", mappedBy="topicGroup")
*/ */
private $topics; private $topics;
/**
* Add topic
*
* @param ForumTopic $topic
* @return ForumTopicGroup
*/
public function addTopic(ForumTopic $topic)
{
$this->topics[] = $topic;
return $this;
}
/** /**
* Get topics * Get topics
* *
* @return Doctrine\Common\Collections\Collection * @return ArrayCollection
*/ */
public function getTopics() public function getTopics()
{ {
return $this->topics; return $this->topics;
} }
} }

210
src/KekRozsak/FrontBundle/Entity/News.php
View File

@ -5,7 +5,6 @@ namespace KekRozsak\FrontBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
/** /**
* KekRozsak\FrontBundle\Entity\News
* @ORM\Entity * @ORM\Entity
* @ORM\Table(name="news") * @ORM\Table(name="news")
*/ */
@ -15,136 +14,26 @@ class News
* @var integer $id * @var integer $id
* @ORM\Id * @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO") * @ORM\GeneratedValue(strategy="AUTO")
* @ORM\Column(type="integer", name="id") * @ORM\Column(type="integer")
*/ */
private $id; private $id;
/** /**
* Get id * Get id
* *
* @return integer * @return integer
*/ */
public function getId() public function getId()
{ {
return $this->id; return $this->id;
} }
/**
* @var datetime $createdAt
* @ORM\Column(type="datetime", name="created_at")
*/
private $createdAt;
/**
* Set createdAt
*
* @param datetime $createdAt
* @return News
*/
public function setCreatedAt($createdAt)
{
$this->createdAt = $createdAt;
return $this;
}
/**
* Get createdAt
*
* @return datetime
*/
public function getCreatedAt()
{
return $this->createdAt;
}
/**
* @var datetime $updatedAt
* @ORM\Column(type="datetime", name="updated_at", nullable=true)
*/
private $updatedAt;
/**
* @var text $updateReason
* @ORM\Column(type="text", name="update_reason", nullable=true)
*/
private $updateReason;
/** /**
* @var string $title * @var string $title
* @ORM\Column(type="string", length=100, nullable=false) * @ORM\Column(type="string", length=100)
*/ */
private $title; private $title;
/**
* @var string $slug
* @ORM\Column(type="string", length=100, nullable=false, unique=true)
*/
private $slug;
/**
* @var text $text
* @ORM\Column(type="text", nullable=true)
*/
private $text;
/**
* @var KekRozsak\FrontBundle\Entity\User $createdBy
* @ORM\ManyToOne(targetEntity="User")
* @ORM\JoinColumn(name="created_by_id", referencedColumnName="id")
*/
private $createdBy;
/**
* @var KekRozsak\FrontBundle\Entity\User $updatedBy
* @ORM\ManyToOne(targetEntity="User", fetch="EXTRA_LAZY")
* @ORM\JoinColumn(name="updated_by_id", referencedColumnName="id")
*/
private $updatedBy;
/**
* Set updatedAt
*
* @param datetime $updatedAt
* @return News
*/
public function setUpdatedAt($updatedAt)
{
$this->updatedAt = $updatedAt;
return $this;
}
/**
* Get updatedAt
*
* @return datetime
*/
public function getUpdatedAt()
{
return $this->updatedAt;
}
/**
* Set updateReason
*
* @param text $updateReason
* @return News
*/
public function setUpdateReason($updateReason)
{
$this->updateReason = $updateReason;
return $this;
}
/**
* Get updateReason
*
* @return text
*/
public function getUpdateReason()
{
return $this->updateReason;
}
/** /**
* Set title * Set title
* *
@ -160,7 +49,7 @@ class News
/** /**
* Get title * Get title
* *
* @return string * @return string
*/ */
public function getTitle() public function getTitle()
{ {
@ -168,31 +57,15 @@ class News
} }
/** /**
* Set slug * @var string $text
* * @ORM\Column(type="text", nullable=false)
* @param string $slug
* @return News
*/ */
public function setSlug($slug) private $text;
{
$this->slug = $slug;
return $this;
}
/**
* Get slug
*
* @return string
*/
public function getSlug()
{
return $this->slug;
}
/** /**
* Set text * Set text
* *
* @param text $text * @param string $text
* @return News * @return News
*/ */
public function setText($text) public function setText($text)
@ -204,7 +77,7 @@ class News
/** /**
* Get text * Get text
* *
* @return text * @return string
*/ */
public function getText() public function getText()
{ {
@ -212,12 +85,47 @@ class News
} }
/** /**
* Set createdBy * @var DateTime $createdAt
* @ORM\Column(type="datetime", name="created_at", nullable=false)
*/
private $createdAt;
/**
* Set createdAt
* *
* @param KekRozsak\FrontBundle\Entity\User $createdBy * @param DateTime $createdAt
* @return News * @return News
*/ */
public function setCreatedBy(\KekRozsak\FrontBundle\Entity\User $createdBy = null) public function setCreatedAt(\DateTime $createdAt)
{
$this->createdAt = $createdAt;
return $this;
}
/**
* Get createdAt
*
* @return DateTime
*/
public function getCreatedAt()
{
return $this->createdAt;
}
/**
* @var \KekRozsak\SecurityBundle\Entity\User $createdBy
* @ORM\ManyToOne(targetEntity="\KekRozsak\SecurityBundle\Entity\User")
* @ORM\JoinColumn(name="created_by_id")
*/
private $createdBy;
/**
* Set createdBy
*
* @param \KekRozsak\SecurityBundle\Entity\User $createdBy
* @return News
*/
public function setCreatedBy(\KekRozsak\SecurityBundle\Entity\User $createdBy)
{ {
$this->createdBy = $createdBy; $this->createdBy = $createdBy;
return $this; return $this;
@ -226,32 +134,10 @@ class News
/** /**
* Get createdBy * Get createdBy
* *
* @return KekRozsak\FrontBundle\Entity\User * @return \KekRozsak\SecurityBundle\Entity\User
*/ */
public function getCreatedBy() public function getCreatedBy()
{ {
return $this->createdBy; return $this->createdBy;
} }
/**
* Set updatedBy
*
* @param KekRozsak\FrontBundle\Entity\User $updatedBy
* @return News
*/
public function setUpdatedBy(\KekRozsak\FrontBundle\Entity\User $updatedBy = null)
{
$this->updatedBy = $updatedBy;
return $this;
}
/**
* Get updatedBy
*
* @return KekRozsak\FrontBundle\Entity\User
*/
public function getUpdatedBy()
{
return $this->updatedBy;
}
} }

488
src/KekRozsak/FrontBundle/Entity/User.php
View File

@ -1,488 +0,0 @@
<?php
namespace KekRozsak\FrontBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Core\User\AdvancedUserInterface;
use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Bridge\Doctrine\Validator\Constraints as DoctrineAssert;
use KekRozsak\FrontBundle\Entity\Article;
use KekRozsak\FrontBundle\Entity\ForumPost;
use KekRozsak\FrontBundle\Entity\Group;
use KekRozsak\FrontBundle\Entity\Document;
use KekRozsak\FrontBundle\Entity\UserData;
use KekRozsak\FrontBundle\Entity\PollAnswer;
/**
* KekRozsak\FrontBundle\Entity\User
* @ORM\Entity
* @ORM\Table(name="users")
* @DoctrineAssert\UniqueEntity(fields={"username"}, message="Ez a felhasználónév már foglalt. Kérlek, válassz egy másikat!", groups={"registration"})
* @DoctrineAssert\UniqueEntity(fields={"email"}, message="Ez az e-mail cím már foglalt. Kérlek, válassz egy másikat!", groups={"registration"})
* @DoctrineAssert\UniqueEntity(fields={"displayName"}, message="Ez a név már foglalt. Kérlek, válassz egy másikat!", groups={"registration"})
*/
class User implements UserInterface, AdvancedUserInterface
{
/**
* @var integer $id
* @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO")
* @ORM\Column(type="integer")
*/
private $id;
/**
* Get id
*
* @return integer
*/
public function getId()
{
return $this->id;
}
/**
* @var string $username
* @ORM\Column(type="string", length=50, nullable=false, unique=true)
* @Assert\NotBlank(groups={"registration"})
*/
private $username;
/**
* Set username
*
* @param string $username
* @return User
*/
public function setUsername($username)
{
$this->username = $username;
return $this;
}
/**
* Get username
*
* @return string
*/
public function getUsername()
{
return $this->username;
}
/**
* @var string $password
* @ORM\Column(type="string", length=50, nullable=false)
* @Assert\NotBlank(groups={"registration"})
*/
private $password;
/**
* Set password
*
* @param string $password
* @return User
*/
public function setPassword($password)
{
$this->password = $password;
return $this;
}
/**
* Get password
*
* @return string
*/
public function getPassword()
{
return $this->password;
}
/**
* @var string $email
* @ORM\Column(type="string", length=50, unique=true, nullable=false)
* @Assert\NotBlank(groups={"registration"})
* @Assert\Email(groups={"registration"})
*/
private $email;
/**
* Set email
*
* @param string $email
* @return User
*/
public function setEmail($email)
{
$this->email = $email;
return $this;
}
/**
* Get email
*
* @return string
*/
public function getEmail()
{
return $this->email;
}
/**
* @var DateTime $registeredAt
* @ORM\Column(type="datetime", name="registered_at", nullable=false)
* @Assert\NotBlank()
* TODO: original validation.yml contained Type: \DateTime
* Assert\Type("\\DateTime")
*/
private $registeredAt;
/**
* Set registeredAt
*
* @param DateTime $registeredAt
* @return User
*/
public function setRegisteredAt(\DateTime $registeredAt)
{
$this->registeredAt = $registeredAt;
return $this;
}
/**
* Get registeredAt
*
* @return DateTime
*/
public function getRegisteredAt()
{
return $this->registeredAt;
}
/**
* @var string $displayName
* @ORM\Column(type="string", length=50, nullable=false, unique=true, name="display_name")
*/
private $displayName;
/**
* Set displayName
*
* @param string $displayName
* @return User
*/
public function setDisplayName($displayName)
{
$this->displayName = $displayName;
return $this;
}
/**
* Get displayName
*
* @return string
*/
public function getDisplayName()
{
return $this->displayName;
}
/**
* @var User $acceptedBy
* @ORM\ManyToOne(targetEntity="User", fetch="EXTRA_LAZY")
* @ORM\JoinColumn(name="accepted_by_id", referencedColumnName="id")
*/
private $acceptedBy;
/**
* Set acceptedBy
*
* @param User $acceptedBy
* @return User
*/
public function setAcceptedBy(User $acceptedBy = null)
{
$this->acceptedBy = $acceptedBy;
return $this;
}
/**
* Get acceptedBy
*
* @return User
*/
public function getAcceptedBy()
{
return $this->acceptedBy;
}
/**
* @var datetime $lastLoginAt
* @ORM\Column(type="datetime", nullable=true, name="last_login_at")
*/
private $lastLoginAt;
/**
* Set lastLoginAt
*
* @param DateTime $lastLoginAt
* @return User
*/
public function setLastLoginAt(\DateTime $lastLoginAt = null)
{
$this->lastLoginAt = $lastLoginAt;
return $this;
}
/**
* Get lastLoginAt
*
* @return DateTime
*/
public function getLastLoginAt()
{
return $this->lastLoginAt;
}
/**
* @var \Doctrine\Common\Collections\ArrayCollection
* @ORM\OneToMany(targetEntity="Article", mappedBy="createdBy", fetch="EXTRA_LAZY")
*/
private $articles;
/**
* Add articles
*
* @param Article $articles
* @return User
*/
public function addArticle(Article $articles)
{
$this->articles[] = $articles;
return $this;
}
/**
* Get articles
*
* @return Doctrine\Common\Collections\Collection
*/
public function getArticles()
{
return $this->articles;
}
/**
* @var \Doctrine\Common\Collections\ArrayCollection
* @ORM\OneToMany(targetEntity="ForumPost", mappedBy="createdBy", fetch="EXTRA_LAZY")
*/
private $forumPosts;
/**
* Add forumPosts
*
* @param ForumPost $forumPosts
* @return User
*/
public function addForumPost(ForumPost $forumPosts)
{
$this->forumPosts[] = $forumPosts;
return $this;
}
/**
* Get forumPosts
*
* @return Doctrine\Common\Collections\Collection
*/
public function getForumPosts()
{
return $this->forumPosts;
}
/**
* @var \Doctrine\Common\Collections\ArrayCollection $ledGroups
* @ORM\OneToMany(targetEntity="Group", mappedBy="leader", fetch="EXTRA_LAZY")
*/
private $ledGroups;
/**
* Add ledGroups
*
* @param Group $group
* @return User
*/
public function addGroup(Group $group)
{
$this->ledGroups[] = $group;
return $this;
}
/**
* Get ledGroups
*
* @return Doctrine\Common\Collections\Collection
*/
public function getLedGroups()
{
return $this->ledGroups;
}
/**
* @var \Doctrine\Common\Collections\ArrayCollection $createdDocuments
* @ORM\OneToMany(targetEntity="Document", mappedBy="createdBy", fetch="EXTRA_LAZY")
*/
private $createdDocuments;
/**
* Add createdDocuments
*
* @param Document $document
* @return User
*/
public function addDocument(Document $document)
{
$this->createdDocuments[] = $document;
return $this;
}
/**
* Get createdDocuments
*
* @return Doctrine\Common\Collections\Collection
*/
public function getCreatedDocuments()
{
return $this->createdDocuments;
}
/**
* @var UserData $userData
* @ORM\OneToOne(targetEntity="UserData", mappedBy="user", fetch="EXTRA_LAZY", cascade={"persist"})
* @ORM\JoinColumn(name="id", referencedColumnName="user_id")
*/
private $userData;
/**
* Set userData
*
* @param UserData $userData
* @return User
*/
public function setUserData(UserData $userData = null)
{
$this->userData = $userData;
return $this;
}
/**
* Get userData
*
* @return UserData
*/
public function getUserData()
{
return $this->userData;
}
/**
* @var PollAnswer
* @ORM\ManyToMany(targetEntity="PollAnswer", mappedBy="voters", fetch="EXTRA_LAZY")
*/
private $pollVotes;
/**
* Set pollVotes
*
* @param PollAnswer $pollVotes
* @return User
*/
public function setPollVotes(PollAnswer $pollVotes = null)
{
$this->pollVotes = $pollVotes;
return $this;
}
/**
* Get pollVotes
*
* @return PollAnswer
*/
public function getPollVotes()
{
return $this->pollVotes;
}
/**
* Add pollVotes
*
* @param PollAnswer $pollVotes
* @return User
*/
public function addPollAnswer(PollAnswer $pollVotes)
{
$this->pollVotes[] = $pollVotes;
return $this;
}
/**
* UserInterface::eraseCredentials()
*/
public function eraseCredentials()
{
}
/**
* UserInterface::getSalt()
*
* As we use crypt() to encrypt and check password, salt is always the
* same as the encrypted password.
*/
public function getSalt()
{
return $this->password;
}
/**
* UserInterface::getRoles
*/
public function getRoles()
{
return array('ROLE_USER');
}
/**
* AdvancedUserInterface::isAccountNonExpired()
*/
public function isAccountNonExpired()
{
return true;
}
/**
* AdvancedUserInterface::isAccountNonLocked()
*/
public function isAccountNonLocked()
{
return true;
}
/**
* AdvancedUserInterface::isCredentialsNonExpired()
*/
public function isCredentialsNonExpired()
{
return true;
}
/**
* AdvancedUserInterface::isEnabled()
*/
public function isEnabled()
{
return ($this->acceptedBy !== null);
}
}

85
src/KekRozsak/FrontBundle/Entity/UserData.php
View File

@ -4,7 +4,7 @@ namespace KekRozsak\FrontBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use KekRozsak\FrontBundle\Entity\User; use \KekRozsak\SecurityBundle\Entity\User;
/** /**
* KekRozsak\FrontBundle\Entity\UserData * KekRozsak\FrontBundle\Entity\UserData
@ -13,31 +13,40 @@ use KekRozsak\FrontBundle\Entity\User;
*/ */
class UserData class UserData
{ {
public function __construct()
{
$this->emailPublic = false;
$this->realNamePublic = false;
$this->msnAddressPublic = false;
$this->googleTalkPublic = false;
$this->skypePublic = false;
$this->phoneNumberPublic = false;
}
/** /**
* @var User $user * @var KekRozsak\SecurityBundle\Entity\User $user
* @ORM\Id * @ORM\Id
* @ORM\OneToOne(targetEntity="User", inversedBy="userData") * @ORM\OneToOne(targetEntity="KekRozsak\SecurityBundle\Entity\User", inversedBy="userData")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id") * @ORM\JoinColumn(name="user_id")
*/ */
protected $user; protected $user;
/** /**
* Set user * Set user
* *
* @param User $user * @param KekRozsak\SecurityBundle\Entity\User $user
* @return UserData * @return UserData
*/ */
public function setUser(User $user = null) public function setUser(\KekRozsak\SecurityBundle\Entity\User $user)
{ {
$this->user = $user; $this->user = $user;
$this->userId = $user->getId();
return $this; return $this;
} }
/** /**
* Get user * Get user
* *
* @return User * @return KekRozsak\SecurityBundle\Entity\User
*/ */
public function getUser() public function getUser()
{ {
@ -65,7 +74,7 @@ class UserData
/** /**
* Get emailPublic * Get emailPublic
* *
* @return boolean * @return boolean
*/ */
public function getEmailPublic() public function getEmailPublic()
{ {
@ -74,7 +83,7 @@ class UserData
/** /**
* @var string $realName * @var string $realName
* @ORM\Column(name="real_name", type="string", length=100, nullable=true) * @ORM\Column(type="string", length=100, nullable=true, name="real_name")
*/ */
protected $realName; protected $realName;
@ -84,7 +93,7 @@ class UserData
* @param string $realName * @param string $realName
* @return UserData * @return UserData
*/ */
public function setRealName($realName) public function setRealName($realName = null)
{ {
$this->realName = $realName; $this->realName = $realName;
return $this; return $this;
@ -93,7 +102,7 @@ class UserData
/** /**
* Get realName * Get realName
* *
* @return string * @return string
*/ */
public function getRealName() public function getRealName()
{ {
@ -102,7 +111,7 @@ class UserData
/** /**
* @var boolean $realNamePublic * @var boolean $realNamePublic
* @ORM\Column(name="real_name_public", type="boolean", nullable=false) * @ORM\Column(type="boolean", name="real_name_public")
*/ */
protected $realNamePublic; protected $realNamePublic;
@ -112,7 +121,7 @@ class UserData
* @param boolean $realNamePublic * @param boolean $realNamePublic
* @return UserData * @return UserData
*/ */
public function setRealNamePublic($realNamePublic) public function setRealNamePublic($realNamePublic = false)
{ {
$this->realNamePublic = $realNamePublic; $this->realNamePublic = $realNamePublic;
return $this; return $this;
@ -121,7 +130,7 @@ class UserData
/** /**
* Get realNamePublic * Get realNamePublic
* *
* @return boolean * @return boolean
*/ */
public function getRealNamePublic() public function getRealNamePublic()
{ {
@ -129,18 +138,18 @@ class UserData
} }
/** /**
* @var text $selfDescription * @var string $selfDescription
* @ORM\Column(name="self_description", type="text", nullable=true) * @ORM\Column(type="text", nullable=true, name="self_description")
*/ */
protected $selfDescription; protected $selfDescription;
/** /**
* Set selfDescription * Set selfDescription
* *
* @param text $selfDescription * @param string $selfDescription
* @return UserData * @return UserData
*/ */
public function setSelfDescription($selfDescription) public function setSelfDescription($selfDescription = null)
{ {
$this->selfDescription = $selfDescription; $this->selfDescription = $selfDescription;
return $this; return $this;
@ -149,7 +158,7 @@ class UserData
/** /**
* Get selfDescription * Get selfDescription
* *
* @return text * @return string
*/ */
public function getSelfDescription() public function getSelfDescription()
{ {
@ -158,7 +167,7 @@ class UserData
/** /**
* @var string $msnAddress * @var string $msnAddress
* @ORM\Column(type="string", length=100, name="msn_address", nullable=true) * @ORM\Column(type="string", length=100, nullable=true, name="msn_address")
*/ */
protected $msnAddress; protected $msnAddress;
@ -168,7 +177,7 @@ class UserData
* @param string $msnAddress * @param string $msnAddress
* @return UserData * @return UserData
*/ */
public function setMsnAddress($msnAddress) public function setMsnAddress($msnAddress = null)
{ {
$this->msnAddress = $msnAddress; $this->msnAddress = $msnAddress;
return $this; return $this;
@ -177,7 +186,7 @@ class UserData
/** /**
* Get msnAddress * Get msnAddress
* *
* @return string * @return string
*/ */
public function getMsnAddress() public function getMsnAddress()
{ {
@ -186,7 +195,7 @@ class UserData
/** /**
* @var boolean $msnAddressPublic * @var boolean $msnAddressPublic
* @ORM\Column(type="boolean", name="msn_address_public", nullable=false) * @ORM\Column(type="boolean", name="msn_address_public")
*/ */
protected $msnAddressPublic; protected $msnAddressPublic;
@ -205,7 +214,7 @@ class UserData
/** /**
* Get msnAddressPublic * Get msnAddressPublic
* *
* @return boolean * @return boolean
*/ */
public function getMsnAddressPublic() public function getMsnAddressPublic()
{ {
@ -214,7 +223,7 @@ class UserData
/** /**
* @var string $googleTalk * @var string $googleTalk
* @ORM\Column(type="string", length=100, name="google_talk", nullable=true) * @ORM\Column(type="string", length=100, nullable=true, name="google_talk")
*/ */
protected $googleTalk; protected $googleTalk;
@ -224,7 +233,7 @@ class UserData
* @param string $googleTalk * @param string $googleTalk
* @return UserData * @return UserData
*/ */
public function setGoogleTalk($googleTalk) public function setGoogleTalk($googleTalk = null)
{ {
$this->googleTalk = $googleTalk; $this->googleTalk = $googleTalk;
return $this; return $this;
@ -242,7 +251,7 @@ class UserData
/** /**
* @var boolean $googleTalkPublic * @var boolean $googleTalkPublic
* @ORM\Column(type="boolean", name="google_talk_public", nullable=false) * @ORM\Column(type="boolean", name="google_talk_public")
*/ */
protected $googleTalkPublic; protected $googleTalkPublic;
@ -261,7 +270,7 @@ class UserData
/** /**
* Get googleTalkPublic * Get googleTalkPublic
* *
* @return boolean * @return boolean
*/ */
public function getGoogleTalkPublic() public function getGoogleTalkPublic()
{ {
@ -270,7 +279,7 @@ class UserData
/** /**
* @var string $skype * @var string $skype
* @ORM\Column(type="string", length=100, nullable=true) * @ORM\Column(type="string", length=100, nullable=true, name="skype")
*/ */
protected $skype; protected $skype;
@ -280,7 +289,7 @@ class UserData
* @param string $skype * @param string $skype
* @return UserData * @return UserData
*/ */
public function setSkype($skype) public function setSkype($skype = null)
{ {
$this->skype = $skype; $this->skype = $skype;
return $this; return $this;
@ -289,7 +298,7 @@ class UserData
/** /**
* Get skype * Get skype
* *
* @return string * @return string
*/ */
public function getSkype() public function getSkype()
{ {
@ -298,7 +307,7 @@ class UserData
/** /**
* @var boolean $skypePublic * @var boolean $skypePublic
* @ORM\Column(type="boolean", name="skype_public", nullable=false) * @ORM\Column(type="boolean", name="skype_public")
*/ */
protected $skypePublic; protected $skypePublic;
@ -317,7 +326,7 @@ class UserData
/** /**
* Get skypePublic * Get skypePublic
* *
* @return boolean * @return boolean
*/ */
public function getSkypePublic() public function getSkypePublic()
{ {
@ -326,7 +335,7 @@ class UserData
/** /**
* @var string $phoneNumber * @var string $phoneNumber
* @ORM\Column(type="string", length=30, name="phone_number", nullable=true) * @ORM\Column(type="string", length=30, nullable=true, name="phone_number")
*/ */
protected $phoneNumber; protected $phoneNumber;
@ -345,7 +354,7 @@ class UserData
/** /**
* Get phoneNumber * Get phoneNumber
* *
* @return string * @return string
*/ */
public function getPhoneNumber() public function getPhoneNumber()
{ {
@ -354,7 +363,7 @@ class UserData
/** /**
* @var boolean $phoneNumberPublic * @var boolean $phoneNumberPublic
* @ORM\Column(type="boolean", name="phone_number_public", nullable=false) * @ORM\Column(type="boolean", name="phone_number_public")
*/ */
protected $phoneNumberPublic; protected $phoneNumberPublic;
@ -373,7 +382,7 @@ class UserData
/** /**
* Get phoneNumberPublic * Get phoneNumberPublic
* *
* @return boolean * @return boolean
*/ */
public function getPhoneNumberPublic() public function getPhoneNumberPublic()
{ {

2
src/KekRozsak/FrontBundle/Resources/config/services.xml
View File

@ -9,7 +9,7 @@
<service id="form.type_extension.help_message" class="KekRozsak\FrontBundle\Form\Extension\HelpMessageTypeExtension"> <service id="form.type_extension.help_message" class="KekRozsak\FrontBundle\Form\Extension\HelpMessageTypeExtension">
<tag name="form.type_extension" alias="field" /> <tag name="form.type_extension" alias="field" />
</service> </service>
<service id="bb.twig.extension" class="KekRozsak\FrontBundle\Extension\TwigBBExtension"> <service id="bb.twig.extension" class="KekRozsak\FrontBundle\Twig\TwigBBExtension">
<argument type="service" id="service_container" /> <argument type="service" id="service_container" />
<tag name="twig.extension" /> <tag name="twig.extension" />
</service> </service>

7
src/KekRozsak/FrontBundle/Extension/TwigBBExtension.php → src/KekRozsak/FrontBundle/Twig/TwigBBExtension.php
View File

@ -1,15 +1,16 @@
<?php <?php
namespace KekRozsak\FrontBundle\Extension; namespace KekRozsak\FrontBundle\Twig;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
class TwigBBExtension extends \Twig_Extension class TwigBBExtension extends \Twig_Extension
{ {
private $container;
private $assets; private $assets;
public function __construct(ContainerInterface $container) public function __construct(ContainerInterface $container)
{ {
$this->assets = $container->get('templating.helper.assets'); $this->container = $container;
} }
public function getFilters() public function getFilters()
@ -44,7 +45,7 @@ class TwigBBExtension extends \Twig_Extension
else else
{ {
// TODO: Thumbnailing! // TODO: Thumbnailing!
$sentence = substr_replace($sentence, '<img src="' . $this->assets->getUrl('upload/images/' . (($ns == '') ? '' : $ns . '/') . $name) . '" alt="" />', $start, $len); $sentence = substr_replace($sentence, '<img src="' . $this->container->get('templating.helper.assets')->getUrl('upload/images/' . (($ns == '') ? '' : $ns . '/') . $name) . '" alt="" />', $start, $len);
} }
} }
while (preg_match('/\\[link( (url)="[^"]+"){1,}\\](?P<content>.*?)\\[\\/link\\]/i', $sentence, $m, PREG_OFFSET_CAPTURE)) while (preg_match('/\\[link( (url)="[^"]+"){1,}\\](?P<content>.*?)\\[\\/link\\]/i', $sentence, $m, PREG_OFFSET_CAPTURE))

51
src/KekRozsak/SecurityBundle/Controller/DefaultController.php
View File

@ -3,18 +3,20 @@
namespace KekRozsak\SecurityBundle\Controller; namespace KekRozsak\SecurityBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\Security\Core\SecurityContext;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Security\Core\User\UserInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use Symfony\Component\Security\Core\SecurityContext;
use Symfony\Component\Security\Core\User\UserInterface;
use KekRozsak\FrontBundle\Entity\User; use KekRozsak\SecurityBundle\Entity\User;
use KekRozsak\FrontBundle\Form\Type\UserType; use KekRozsak\SecurityBundle\Form\Type\UserType;
use KekRozsak\FrontBundle\Entity\UserData;
class DefaultController extends Controller class DefaultController extends Controller
{ {
/** /**
* @Route("/login", name="KekRozsakSecurityBundle_login") * @Route("/login", name="KekRozsakSecurityBundle_login")
* @Template()
*/ */
public function loginAction() public function loginAction()
{ {
@ -31,10 +33,10 @@ class DefaultController extends Controller
$session->remove(SecurityContext::AUTHENTICATION_ERROR); $session->remove(SecurityContext::AUTHENTICATION_ERROR);
} }
return $this->render('KekRozsakSecurityBundle:Default:login.html.twig', array( return array(
'last_username' => $session->get(SecurityContext::LAST_USERNAME), 'last_username' => $session->get(SecurityContext::LAST_USERNAME),
'error' => $error, 'error' => $error,
)); );
} }
/** /**
@ -48,38 +50,45 @@ class DefaultController extends Controller
/** /**
* @Route("/logout", name="KekRozsakSecurityBundle_logout") * @Route("/logout", name="KekRozsakSecurityBundle_logout")
*/ */
public function logoutAction() public function logoutAction()
{ {
// The security layer will intercept this request. This method will never be called. // The security layer will intercept this request. This method will never be called.
} }
/** /**
* @Route("/jelentkezes", name="KekRozsakSecurityBundle_registration") * @Route("/jelentkezes", name="KekRozsakSecurityBundle_registration")
* @Template()
*/ */
public function registrationAction(Request $request) public function registrationAction()
{ {
$user = $this->get('security.context')->getToken()->getUser(); $user = $this->get('security.context')->getToken()->getUser();
if ($user instanceof UserInterface) if ($user instanceof UserInterface)
{ {
return $this->redirect($this->generateUrl('KekRozsakFrontBundle_homepage')); return $this->redirect($this->generateUrl('KekRozsakFrontBundle_homepage'));
} }
$user = new User(); $user = new User();
$form = $this->createForm(new UserType(true), $user); $form = $this->createForm(new UserType(true), $user);
$request = $this->getRequest();
if ($request->getMethod() == 'POST') if ($request->getMethod() == 'POST')
{ {
$form->bindRequest($request); $form->bindRequest($request);
if ($form->isValid(array('registration'))) if ($form->isValid(array('registration')))
{ {
$user->setPassword($this->get('security.encoder_factory')->getEncoder($user)->encodePassword($user->getPassword(), $user->getSalt()));
$roleRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:Role');
$regRole = $roleRepo->findOneByName('REGISTERED');
$user->addRole($regRole);
$user->setRegisteredAt(new \DateTime('now')); $user->setRegisteredAt(new \DateTime('now'));
$user->setPassword($this->get('security.encoder_factory')->getEncoder($user)->encodePassword($user->getPassword(), $user->getSalt()));
$em = $this->getDoctrine()->getEntityManager(); $em = $this->getDoctrine()->getEntityManager();
$em->persist($user); $em->persist($user);
$em->flush(); $em->flush();
$userData = new UserData();
$user->setUserData($userData);
$em->persist($user);
$em->persist($userData);
$em->flush();
$message = \Swift_Message::newInstance() $message = \Swift_Message::newInstance()
->setSubject('Új jelentkező') ->setSubject('Új jelentkező')
->setFrom('info@blueroses.hu') ->setFrom('info@blueroses.hu')
@ -91,16 +100,18 @@ class DefaultController extends Controller
} }
} }
return $this->render('KekRozsakSecurityBundle:Default:registration.html.twig', array( return array(
'form' => $form->createView(), 'form' => $form->createView(),
)); );
} }
/** /**
* @Route("/most-varj", name="KekRozsakSecurityBundle_reg_success") * @Route("/most_varj", name="KekRozsakSecurityBundle_reg_success")
* @Template()
*/ */
public function registrationSuccessAction() public function regSuccessAction()
{ {
return $this->render('KekRozsakSecurityBundle:Default:registration_success.html.twig', array()); return array(
);
} }
} }

4
src/KekRozsak/SecurityBundle/DependencyInjection/KekRozsakSecurityExtension.php
View File

@ -22,7 +22,7 @@ class KekRozsakSecurityExtension extends Extension
$configuration = new Configuration(); $configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs); $config = $this->processConfiguration($configuration, $configs);
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yml'); $loader->load('services.xml');
} }
} }

318
src/KekRozsak/SecurityBundle/Entity/User.php Normal file
View File

@ -0,0 +1,318 @@
<?php
namespace KekRozsak\SecurityBundle\Entity;
use \Doctrine\ORM\Mapping as ORM;
use \Symfony\Component\Security\Core\User\UserInterface;
use \Symfony\Component\Security\Core\User\AdvancedUserInterface;
use \Symfony\Component\Validator\Constraints as Assert;
use \Symfony\Bridge\Doctrine\Validator\Constraints as DoctrineAssert;
use \KekRozsak\FrontBundle\Entity\UserData;
/**
* KekRozsak\SecurityBundle\Entity\User
* @ORM\Entity
* @ORM\Table(name="users")
* @DoctrineAssert\UniqueEntity(fields="username", message="Ez a felhasználónév már foglalt. Kérlek, válassz egy másikat!", groups={"registration"})
* @DoctrineAssert\UniqueEntity(fields="email", message="Ez az e-mail cím már foglalt. Kérlek, válassz egy másikat!", groups={"registration"})
* @DoctrineAssert\UniqueEntity(fields="displayName", message="Ez a név már foglalt. Kérlek, válassz egy másikat!", groups={"registration"})
*/
class User implements UserInterface, AdvancedUserInterface
{
/**
* @var integer $id
* @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO")
* @ORM\Column(type="integer")
*/
private $id;
/**
* Get id
*
* @return integer
*/
public function getId()
{
return $this->id;
}
/**
* @var string $username
* @ORM\Column(type="string", length=50, nullable=false, unique=true)
* @Assert\NotBlank(groups="registration")
*/
private $username;
/**
* Set username
*
* @param string $username
* @return User
*/
public function setUsername($username)
{
$this->username = $username;
return $this;
}
/**
* Get username
*
* @return string
*/
public function getUsername()
{
return $this->username;
}
/**
* @var string $password
* @ORM\Column(type="string", length=50, nullable=false)
* @Assert\NotBlank(groups="registration")
*/
private $password;
/**
* Set password
*
* @param string $password
* @return User
*/
public function setPassword($password)
{
$this->password = $password;
return $this;
}
/**
* Get password
*
* @return string
*/
public function getPassword()
{
return $this->password;
}
/**
* @var string $displayName
* @ORM\Column(type="string", length=50, unique=true, name="display_name")
*/
private $displayName;
/**
* Set displayName
*
* @param string $displayName
* @return User
*/
public function setDisplayName($displayName)
{
$this->displayName = $displayName;
return $this;
}
/**
* Get displayName
*
* @return string
*/
public function getDisplayName()
{
return $this->displayName;
}
/**
* @var string $email
* @ORM\Column(type="string", length=100, nullable=false, unique=true)
*/
private $email;
/**
* Set email
*
* @param string $email
* @return User
*/
public function setEmail($email)
{
$this->email = $email;
return $this;
}
/**
* Get email
*
* @return string
*/
public function getEmail()
{
return $this->email;
}
/**
* @var DateTime $registeredAt
* @ORM\Column(type="datetime", nullable=false, name="registered_at")
*/
private $registeredAt;
/**
* Set registeredAt
*
* @param DateTime $registeredAt
* @return User
*/
public function setRegisteredAt(\DateTime $registeredAt)
{
$this->registeredAt = $registeredAt;
return $this;
}
/**
* Get registeredAt
*
* @return DateTime
*/
public function getRegisteredAt()
{
return $this->registeredAt;
}
/**
* @var User acceptedBy
* @ORM\ManyToOne(targetEntity="User")
* @ORM\JoinColumn(name="accepted_by_id")
*/
private $acceptedBy;
/**
* Set acceptedBy
*
* @param User $acceptedBy
* @return User
*/
public function setAcceptedBy(User $acceptedBy = null)
{
$this->acceptedBy = $acceptedBy;
return $this;
}
/**
* Get acceptedBy
*
* @return User
*/
public function getAcceptedBy()
{
return $this->acceptedBy;
}
/**
* @var DateTime $lastLoginAt
* @ORM\Column(type="datetime", nullable=true, name="last_login_at")
*/
private $lastLoginAt;
/**
* Set lastLoginAt;
*
* @param DateTime $lastLoginAt
* @return User
*/
public function setLastLoginAt(\DateTime $lastLoginAt = null)
{
$this->lastLoginAt = $lastLoginAt;
return $this;
}
/**
* Get lastLoginAt
*
* @return DateTime
*/
public function getLastLoginAt()
{
return $this->lastLoginAt;
}
/**
* @var \KekRozsak\FrontBundle\Entity\UserData $userData
* @ORM\OneToOne(targetEntity="KekRozsak\FrontBundle\Entity\UserData", mappedBy="user", fetch="LAZY", cascade={"persist"})
* @ORM\JoinColumn(name="id", referencedColumnName="user_id")
*/
private $userData;
/**
* Set userData
*
* @param \KekRozsak\FrontBundle\Entity\UserData $userData
* @return User
*/
public function setUserData(\KekRozsak\FrontBundle\Entity\UserData $userData = null)
{
$this->userData = $userData;
$userData->setUser($this);
return $this;
}
/**
* Get userData
*
* @return \KekRozsak\FrontBundle\Entity\UserData
*/
public function getUserData()
{
return $this->userData;
}
/* Here comes the remaining part of UserInterface implementation */
public function getRoles()
{
/* As we use ACLs instead of roles, every user get the
* ROLE_USER role, and nothing else
*/
return array('ROLE_USER');
}
public function getSalt()
{
/* As we use crypt() to encode passwords, salt is always the
* same as password
*/
return $this->password;
}
public function eraseCredentials()
{
}
/* Here comes the AdvancedUserInterface implementation */
public function isAccountNonExpired()
{
/* Currently, accounts never expire */
return true;
}
public function isAccountNonLocked()
{
/* Currently, accounts cannot be locked */
return true;
}
public function isCredentialsNonExpired()
{
/* Currently, credentials never expire */
return true;
}
public function isEnabled()
{
/* Account is enabled if it is accepted by someone */
return ($this->acceptedBy !== null);
}
}

4
src/KekRozsak/FrontBundle/Form/Type/UserType.php → src/KekRozsak/SecurityBundle/Form/Type/UserType.php
View File

@ -1,5 +1,5 @@
<?php <?php
namespace KekRozsak\FrontBundle\Form\Type; namespace KekRozsak\SecurityBundle\Form\Type;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
@ -64,7 +64,7 @@ class UserType extends AbstractType
public function getDefaultOptions() public function getDefaultOptions()
{ {
$opts = array( $opts = array(
'data_class' => 'KekRozsak\FrontBundle\Entity\User', 'data_class' => 'KekRozsak\SecurityBundle\Entity\User',
); );
if ($this->_registration) if ($this->_registration)
$opts['validation_groups'] = array('registration'); $opts['validation_groups'] = array('registration');

11
src/KekRozsak/SecurityBundle/Resources/config/services.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" ?>
<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="kek_rozsak_security.encoder.crypt" class="KekRozsak\SecurityBundle\Service\CryptEncoder">
</service>
<service id="security.authentication.success_handler" class="KekRozsak\SecurityBundle\Security\AuthSuccess">
<argument type="service" id="doctrine" />
</service>
</services>
</container>

10
src/KekRozsak/SecurityBundle/Resources/config/services.yml
View File

@ -1,10 +0,0 @@
parameters:
services:
kek_rozsak_security.encoder.crypt:
class: KekRozsak\SecurityBundle\Service\CryptEncoder
security.authentication.success_handler:
class: KekRozsak\SecurityBundle\Security\AuthSuccess
public: false
arguments:
doctrine: @doctrine

0
src/KekRozsak/SecurityBundle/Resources/views/Default/registration_success.html.twig → src/KekRozsak/SecurityBundle/Resources/views/Default/regSuccess.html.twig
View File

1
src/KekRozsak/SecurityBundle/Resources/views/Default/registration.html.twig
View File

@ -5,6 +5,7 @@
{% block title %} - Regisztráció {% endblock %} {% block title %} - Regisztráció {% endblock %}
{% block content %} {% block content %}
<h3>Jelentkezés</h3> <h3>Jelentkezés</h3>
<p>Amennyiben már tagja vagy a körnek, <a href="{{ path('KekRozsakSecurityBundle_login') }}">itt bejelentkezhetsz</a>.
<p>Az alábbi űrlap kitöltésével jelentkezhetsz a Kék Rózsa okkultista kör tagjai közé. Kérünk, hogy jelentkezés előtt figyelmesen olvasd el a <a href="{{ path('KekRozsakFrontBundle_article', { articleSlug: 'rolunk' }) }}">Rólunk</a> menüpont szövegét, különös tekintettel a Házirendre.</p> <p>Az alábbi űrlap kitöltésével jelentkezhetsz a Kék Rózsa okkultista kör tagjai közé. Kérünk, hogy jelentkezés előtt figyelmesen olvasd el a <a href="{{ path('KekRozsakFrontBundle_article', { articleSlug: 'rolunk' }) }}">Rólunk</a> menüpont szövegét, különös tekintettel a Házirendre.</p>
<p>A jelentkezés NEM jár automatikus tagsággal. A Házirend szerint a Vének jogot formálhatnak arra, hogy a jelentkezésedet elutasítsák, vagy próbáknak vessenek alá, mielőtt a tagok közé fogadnak.</p> <p>A jelentkezés NEM jár automatikus tagsággal. A Házirend szerint a Vének jogot formálhatnak arra, hogy a jelentkezésedet elutasítsák, vagy próbáknak vessenek alá, mielőtt a tagok közé fogadnak.</p>
<p><strong>FONTOS!</strong> Aki a régi fórumon írt bármilyen bejegyzést, az már regisztrálva van ezen az oldalon is! Ez esetben kérlek lépjetek kapcsolatba velem <a href="http://www.facebook.com/Polesz" target="_blank">Facebookon</a> vagy e-mailben a <a href="jelentkezes@blueroses.hu">jelentkezes@blueroses.hu</a> címen!</p> <p><strong>FONTOS!</strong> Aki a régi fórumon írt bármilyen bejegyzést, az már regisztrálva van ezen az oldalon is! Ez esetben kérlek lépjetek kapcsolatba velem <a href="http://www.facebook.com/Polesz" target="_blank">Facebookon</a> vagy e-mailben a <a href="jelentkezes@blueroses.hu">jelentkezes@blueroses.hu</a> címen!</p>

4
vendor/autoload.php vendored
View File

@ -5,8 +5,6 @@ if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
require __DIR__ . '/composer' . '/ClassLoader.php'; require __DIR__ . '/composer' . '/ClassLoader.php';
} }
require __DIR__ . '/swiftmailer/swiftmailer/lib/swift_required.php';
return call_user_func(function() { return call_user_func(function() {
$loader = new \Composer\Autoload\ClassLoader(); $loader = new \Composer\Autoload\ClassLoader();
$composerDir = __DIR__ . '/composer'; $composerDir = __DIR__ . '/composer';
@ -23,5 +21,7 @@ return call_user_func(function() {
$loader->register(); $loader->register();
require __DIR__ . '/swiftmailer/swiftmailer/lib/swift_required.php';
return $loader; return $loader;
}); });

10
vendor/composer/ClassLoader.php vendored
View File

@ -102,7 +102,7 @@ class ClassLoader
/** /**
* Turns on searching the include path for class files. * Turns on searching the include path for class files.
* *
* @param Boolean $useIncludePath * @param bool $useIncludePath
*/ */
public function setUseIncludePath($useIncludePath) public function setUseIncludePath($useIncludePath)
{ {
@ -113,7 +113,7 @@ class ClassLoader
* Can be used to check if the autoloader uses the include path to check * Can be used to check if the autoloader uses the include path to check
* for classes. * for classes.
* *
* @return Boolean * @return bool
*/ */
public function getUseIncludePath() public function getUseIncludePath()
{ {
@ -123,7 +123,7 @@ class ClassLoader
/** /**
* Registers this instance as an autoloader. * Registers this instance as an autoloader.
* *
* @param Boolean $prepend Whether to prepend the autoloader or not * @param bool $prepend Whether to prepend the autoloader or not
*/ */
public function register($prepend = false) public function register($prepend = false)
{ {
@ -141,8 +141,8 @@ class ClassLoader
/** /**
* Loads the given class or interface. * Loads the given class or interface.
* *
* @param string $class The name of the class * @param string $class The name of the class
* @return Boolean|null True, if loaded * @return bool|null True, if loaded
*/ */
public function loadClass($class) public function loadClass($class)
{ {

680
vendor/composer/installed.json vendored
View File

@ -3,7 +3,7 @@
"name": "jms/metadata", "name": "jms/metadata",
"version": "1.1.1", "version": "1.1.1",
"version_normalized": "1.1.1.0", "version_normalized": "1.1.1.0",
"time": "2011-12-31 21:32:49", "time": "2011-12-30 10:32:49",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/schmittjoh/metadata", "url": "https://github.com/schmittjoh/metadata",
@ -47,7 +47,7 @@
"name": "jms/cg", "name": "jms/cg",
"version": "1.0.0", "version": "1.0.0",
"version_normalized": "1.0.0.0", "version_normalized": "1.0.0.0",
"time": "2011-12-31 20:40:52", "time": "2011-12-30 09:40:52",
"source": { "source": {
"type": "git", "type": "git",
"url": "git://github.com/schmittjoh/cg-library.git", "url": "git://github.com/schmittjoh/cg-library.git",
@ -89,7 +89,7 @@
"version": "1.0.0", "version": "1.0.0",
"version_normalized": "1.0.0.0", "version_normalized": "1.0.0.0",
"target-dir": "JMS/AopBundle", "target-dir": "JMS/AopBundle",
"time": "2011-12-31 20:50:26", "time": "2011-12-30 09:50:26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/schmittjoh/JMSAopBundle", "url": "https://github.com/schmittjoh/JMSAopBundle",
@ -133,7 +133,7 @@
"version": "1.1.0", "version": "1.1.0",
"version_normalized": "1.1.0.0", "version_normalized": "1.1.0.0",
"target-dir": "JMS/SecurityExtraBundle", "target-dir": "JMS/SecurityExtraBundle",
"time": "2012-01-01 00:38:12", "time": "2011-12-30 13:38:12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/schmittjoh/JMSSecurityExtraBundle", "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle",
@ -178,7 +178,7 @@
"version": "1.0.1", "version": "1.0.1",
"version_normalized": "1.0.1.0", "version_normalized": "1.0.1.0",
"target-dir": "JMS/DiExtraBundle", "target-dir": "JMS/DiExtraBundle",
"time": "2012-02-26 16:01:54", "time": "2012-02-25 05:01:54",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/schmittjoh/JMSDiExtraBundle", "url": "https://github.com/schmittjoh/JMSDiExtraBundle",
@ -221,7 +221,7 @@
"name": "doctrine/common", "name": "doctrine/common",
"version": "2.2.2", "version": "2.2.2",
"version_normalized": "2.2.2.0", "version_normalized": "2.2.2.0",
"time": "2012-04-11 01:46:44", "time": "2012-04-08 03:46:44",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/common", "url": "https://github.com/doctrine/common",
@ -287,7 +287,7 @@
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "1.1.0", "version": "1.1.0",
"version_normalized": "1.1.0.0", "version_normalized": "1.1.0.0",
"time": "2012-04-21 12:27:40", "time": "2012-04-18 14:27:40",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/monolog.git", "url": "https://github.com/Seldaek/monolog.git",
@ -337,7 +337,7 @@
"name": "twig/extensions", "name": "twig/extensions",
"version": "dev-master", "version": "dev-master",
"version_normalized": "9999999-dev", "version_normalized": "9999999-dev",
"time": "2012-05-19 19:28:19", "time": "2012-05-16 21:28:19",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fabpot/Twig-extensions", "url": "https://github.com/fabpot/Twig-extensions",
@ -378,70 +378,11 @@
} }
} }
}, },
{
"name": "symfony/monolog-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Symfony/Bundle/MonologBundle",
"time": "2012-06-13 05:14:37",
"source": {
"type": "git",
"url": "https://github.com/symfony/MonologBundle",
"reference": "0b5046d3d1ef93cd59ceabfa37de2665f5118c7f"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/MonologBundle/zipball/0b5046d3d1ef93cd59ceabfa37de2665f5118c7f",
"reference": "0b5046d3d1ef93cd59ceabfa37de2665f5118c7f",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"monolog/monolog": "1.*",
"symfony/monolog-bridge": "2.1.*",
"symfony/dependency-injection": "2.1.*",
"symfony/config": "2.1.*"
},
"require-dev": {
"symfony/yaml": "2.1.*"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
},
"installation-source": "source",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": null,
"role": null
},
{
"name": "Symfony Community",
"email": null,
"homepage": "http://symfony.com/contributors",
"role": null
}
],
"description": "Symfony MonologBundle",
"homepage": "http://symfony.com",
"autoload": {
"psr-0": {
"Symfony\\Bundle\\MonologBundle": ""
}
}
},
{ {
"name": "kriswallsmith/assetic", "name": "kriswallsmith/assetic",
"version": "dev-master", "version": "dev-master",
"version_normalized": "9999999-dev", "version_normalized": "9999999-dev",
"time": "2012-06-10 23:41:54", "time": "2012-06-08 01:41:54",
"source": { "source": {
"type": "git", "type": "git",
"url": "http://github.com/kriswallsmith/assetic.git", "url": "http://github.com/kriswallsmith/assetic.git",
@ -497,132 +438,221 @@
} }
}, },
{ {
"name": "doctrine/orm", "name": "sensio/generator-bundle",
"version": "2.2.x-dev", "version": "dev-master",
"version_normalized": "2.2.9999999.9999999-dev", "version_normalized": "9999999-dev",
"time": "2012-05-26 01:13:46", "target-dir": "Sensio/Bundle/GeneratorBundle",
"time": "2012-06-15 18:40:45",
"source": { "source": {
"type": "git", "type": "git",
"url": "git://github.com/doctrine/doctrine2.git", "url": "https://github.com/sensio/SensioGeneratorBundle",
"reference": "5f66c65c9a8d984899903b54215d0249a45b92d6" "reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/doctrine/doctrine2/zipball/5f66c65c9a8d984899903b54215d0249a45b92d6", "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/43ed45c48db18e4a0e48aec0c098f42e56e22d36",
"reference": "5f66c65c9a8d984899903b54215d0249a45b92d6", "reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.2", "symfony/framework-bundle": "2.1.*"
"ext-pdo": "*", },
"doctrine/common": "2.2.*", "require-dev": {
"doctrine/dbal": "2.2.*" "symfony/doctrine-bridge": "2.1.*",
"doctrine/orm": ">=2.1,<2.4-dev",
"twig/twig": ">=1.8,<2.0-dev"
},
"suggest": {
"doctrine/doctrine-bundle": "to generate entities and their crud controller"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
}, },
"type": "library",
"installation-source": "source", "installation-source": "source",
"license": [ "license": [
"LGPL" "MIT"
], ],
"authors": [ "authors": [
{ {
"name": "Jonathan Wage", "name": "Fabien Potencier",
"email": "jonwage@gmail.com", "email": "fabien@symfony.com",
"homepage": "http://www.jwage.com/",
"role": null
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": null,
"role": null
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org",
"homepage": null,
"role": null
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"homepage": null, "homepage": null,
"role": null "role": null
} }
], ],
"description": "Object-Relational-Mapper for PHP", "description": "This bundle generates code for you",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"database",
"orm"
],
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"Doctrine\\ORM": "lib/" "Sensio\\Bundle\\GeneratorBundle": ""
} }
} }
}, },
{ {
"name": "doctrine/dbal", "name": "symfony/assetic-bundle",
"version": "2.2.x-dev", "version": "dev-master",
"version_normalized": "2.2.9999999.9999999-dev", "version_normalized": "9999999-dev",
"time": "2012-05-25 20:08:36", "target-dir": "Symfony/Bundle/AsseticBundle",
"time": "2012-06-16 23:29:31",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal", "url": "https://github.com/symfony/AsseticBundle",
"reference": "8cc129aa64a8de6447056bce20f0a274fe2a340b" "reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/doctrine/dbal/zipball/8cc129aa64a8de6447056bce20f0a274fe2a340b", "url": "https://github.com/symfony/AsseticBundle/zipball/8fe7b898b08103c1d6fce64c3e279a7afd61adfc",
"reference": "8cc129aa64a8de6447056bce20f0a274fe2a340b", "reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"symfony/framework-bundle": "2.1.*",
"kriswallsmith/assetic": "1.1.*"
},
"suggest": {
"symfony/twig-bundle": "2.1.*"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
},
"installation-source": "source",
"license": [
"MIT"
],
"authors": [
{
"name": "Kris Wallsmith",
"email": "kris.wallsmith@gmail.com",
"homepage": "http://kriswallsmith.net/",
"role": null
}
],
"description": "Integrates Assetic into Symfony2",
"homepage": "https://github.com/symfony/AsseticBundle",
"keywords": [
"assets",
"compression",
"minification"
],
"autoload": {
"psr-0": {
"Symfony\\Bundle\\AsseticBundle": ""
}
}
},
{
"name": "symfony/monolog-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Symfony/Bundle/MonologBundle",
"time": "2012-06-28 15:48:07",
"source": {
"type": "git",
"url": "https://github.com/symfony/MonologBundle",
"reference": "7fe7f711bb04b86ad7f45a9e11a7f8cbaf9bc1a5"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/MonologBundle/zipball/7fe7f711bb04b86ad7f45a9e11a7f8cbaf9bc1a5",
"reference": "7fe7f711bb04b86ad7f45a9e11a7f8cbaf9bc1a5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.2",
"doctrine/common": ">=2.2.0,<=2.2.99" "monolog/monolog": "1.*",
"symfony/monolog-bridge": "2.1.*",
"symfony/dependency-injection": "2.1.*",
"symfony/config": "2.1.*"
},
"require-dev": {
"symfony/yaml": "2.1.*",
"symfony/config": "2.1.*"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
}, },
"type": "library",
"installation-source": "source", "installation-source": "source",
"license": [ "license": [
"LGPL" "MIT"
], ],
"authors": [ "authors": [
{ {
"name": "Jonathan Wage", "name": "Fabien Potencier",
"email": "jonwage@gmail.com", "email": "fabien@symfony.com",
"homepage": "http://www.jwage.com/",
"role": null
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": null, "homepage": null,
"role": null "role": null
}, },
{ {
"name": "Roman Borschel", "name": "Symfony Community",
"email": "roman@code-factory.org", "email": null,
"homepage": null, "homepage": "http://symfony.com/contributors",
"role": null "role": null
}, }
],
"description": "Symfony MonologBundle",
"homepage": "http://symfony.com",
"autoload": {
"psr-0": {
"Symfony\\Bundle\\MonologBundle": ""
}
}
},
{
"name": "sensio/framework-extra-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Sensio/Bundle/FrameworkExtraBundle",
"time": "2012-06-29 05:03:39",
"source": {
"type": "git",
"url": "https://github.com/sensio/SensioFrameworkExtraBundle",
"reference": "4f54e5d5fb3b54fb107892684018f3704934c48d"
},
"dist": {
"type": "zip",
"url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/4f54e5d5fb3b54fb107892684018f3704934c48d",
"reference": "4f54e5d5fb3b54fb107892684018f3704934c48d",
"shasum": ""
},
"require": {
"doctrine/common": ">=2.1,<2.4-dev",
"symfony/framework-bundle": "2.1.*"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
},
"installation-source": "source",
"license": [
"MIT"
],
"authors": [
{ {
"name": "Benjamin Eberlei", "name": "Fabien Potencier",
"email": "kontakt@beberlei.de", "email": "fabien@symfony.com",
"homepage": null, "homepage": null,
"role": null "role": null
} }
], ],
"description": "Database Abstraction Layer", "description": "This bundle provides a way to configure your controllers with annotations",
"homepage": "http://www.doctrine-project.org",
"keywords": [ "keywords": [
"database", "annotations",
"persistence", "controllers"
"dbal",
"queryobject"
], ],
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"Doctrine\\DBAL": "lib/" "Sensio\\Bundle\\FrameworkExtraBundle": ""
} }
} }
}, },
@ -630,16 +660,16 @@
"name": "twig/twig", "name": "twig/twig",
"version": "dev-master", "version": "dev-master",
"version_normalized": "9999999-dev", "version_normalized": "9999999-dev",
"time": "2012-06-16 08:52:23", "time": "2012-07-03 15:33:25",
"source": { "source": {
"type": "git", "type": "git",
"url": "git://github.com/fabpot/Twig.git", "url": "git://github.com/fabpot/Twig.git",
"reference": "4679ad51c5390648b7ea4c8f0ecd2c0c344145ba" "reference": "26eb0a2653eade50dffdd31b11ca454232dea8cf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/fabpot/Twig/zipball/4679ad51c5390648b7ea4c8f0ecd2c0c344145ba", "url": "https://github.com/fabpot/Twig/zipball/26eb0a2653eade50dffdd31b11ca454232dea8cf",
"reference": "4679ad51c5390648b7ea4c8f0ecd2c0c344145ba", "reference": "26eb0a2653eade50dffdd31b11ca454232dea8cf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -648,7 +678,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.8-dev" "dev-master": "1.9-dev"
} }
}, },
"installation-source": "source", "installation-source": "source",
@ -685,16 +715,16 @@
"version": "dev-master", "version": "dev-master",
"version_normalized": "9999999-dev", "version_normalized": "9999999-dev",
"target-dir": "Doctrine/Bundle/DoctrineBundle", "target-dir": "Doctrine/Bundle/DoctrineBundle",
"time": "2012-06-18 06:36:07", "time": "2012-07-03 10:42:17",
"source": { "source": {
"type": "git", "type": "git",
"url": "git://github.com/doctrine/DoctrineBundle.git", "url": "git://github.com/doctrine/DoctrineBundle.git",
"reference": "94951737d6c692500d6b13bb92871935568a4ba5" "reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/doctrine/DoctrineBundle/zipball/94951737d6c692500d6b13bb92871935568a4ba5", "url": "https://github.com/doctrine/DoctrineBundle/zipball/c9ea46d1f0c48bb88bb87b44214fe44e03c0c692",
"reference": "94951737d6c692500d6b13bb92871935568a4ba5", "reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -755,191 +785,37 @@
} }
} }
}, },
{
"name": "sensio/generator-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Sensio/Bundle/GeneratorBundle",
"time": "2012-06-18 16:40:45",
"source": {
"type": "git",
"url": "https://github.com/sensio/SensioGeneratorBundle",
"reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36"
},
"dist": {
"type": "zip",
"url": "https://github.com/sensio/SensioGeneratorBundle/zipball/43ed45c48db18e4a0e48aec0c098f42e56e22d36",
"reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36",
"shasum": ""
},
"require": {
"symfony/framework-bundle": "2.1.*"
},
"require-dev": {
"symfony/doctrine-bridge": "2.1.*",
"doctrine/orm": ">=2.1,<2.4-dev",
"twig/twig": ">=1.8,<2.0-dev"
},
"suggest": {
"doctrine/doctrine-bundle": "to generate entities and their crud controller"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
},
"installation-source": "source",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": null,
"role": null
}
],
"description": "This bundle generates code for you",
"autoload": {
"psr-0": {
"Sensio\\Bundle\\GeneratorBundle": ""
}
}
},
{
"name": "sensio/framework-extra-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Sensio/Bundle/FrameworkExtraBundle",
"time": "2012-06-18 10:41:18",
"source": {
"type": "git",
"url": "https://github.com/sensio/SensioFrameworkExtraBundle",
"reference": "62e41b85947034b0f1dfe31bb8e76920e1488571"
},
"dist": {
"type": "zip",
"url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/62e41b85947034b0f1dfe31bb8e76920e1488571",
"reference": "62e41b85947034b0f1dfe31bb8e76920e1488571",
"shasum": ""
},
"require": {
"doctrine/common": ">=2.1,<2.4-dev",
"symfony/framework-bundle": "2.1.*"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
},
"installation-source": "source",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": null,
"role": null
}
],
"description": "This bundle provides a way to configure your controllers with annotations",
"keywords": [
"annotations",
"controllers"
],
"autoload": {
"psr-0": {
"Sensio\\Bundle\\FrameworkExtraBundle": ""
}
}
},
{
"name": "symfony/assetic-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Symfony/Bundle/AsseticBundle",
"time": "2012-06-19 21:29:31",
"source": {
"type": "git",
"url": "https://github.com/symfony/AsseticBundle",
"reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/AsseticBundle/zipball/8fe7b898b08103c1d6fce64c3e279a7afd61adfc",
"reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"symfony/framework-bundle": "2.1.*",
"kriswallsmith/assetic": "1.1.*"
},
"suggest": {
"symfony/twig-bundle": "2.1.*"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
},
"installation-source": "source",
"license": [
"MIT"
],
"authors": [
{
"name": "Kris Wallsmith",
"email": "kris.wallsmith@gmail.com",
"homepage": "http://kriswallsmith.net/",
"role": null
}
],
"description": "Integrates Assetic into Symfony2",
"homepage": "https://github.com/symfony/AsseticBundle",
"keywords": [
"assets",
"compression",
"minification"
],
"autoload": {
"psr-0": {
"Symfony\\Bundle\\AsseticBundle": ""
}
}
},
{ {
"name": "symfony/swiftmailer-bundle", "name": "symfony/swiftmailer-bundle",
"version": "dev-master", "version": "dev-master",
"version_normalized": "9999999-dev", "version_normalized": "9999999-dev",
"target-dir": "Symfony/Bundle/SwiftmailerBundle", "target-dir": "Symfony/Bundle/SwiftmailerBundle",
"time": "2012-06-18 20:25:44", "time": "2012-07-04 15:33:34",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/SwiftmailerBundle", "url": "https://github.com/symfony/SwiftmailerBundle",
"reference": "d05c9c514a631ee688c53c4cc5505da757bd50d3" "reference": "e1d413ce27fd1696bdc82ad9525f1b874664530e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/symfony/SwiftmailerBundle/zipball/d05c9c514a631ee688c53c4cc5505da757bd50d3", "url": "https://github.com/symfony/SwiftmailerBundle/zipball/e1d413ce27fd1696bdc82ad9525f1b874664530e",
"reference": "d05c9c514a631ee688c53c4cc5505da757bd50d3", "reference": "e1d413ce27fd1696bdc82ad9525f1b874664530e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.2",
"symfony/swiftmailer-bridge": "self.version", "symfony/swiftmailer-bridge": "2.1.*",
"swiftmailer/swiftmailer": ">=4.1.8,<4.2-dev" "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev"
},
"require-dev": {
"symfony/dependency-injection": "2.1.*",
"symfony/http-kernel": "2.1.*",
"symfony/config": "2.1.*"
}, },
"type": "symfony-bundle", "type": "symfony-bundle",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1.x-dev" "dev-master": "2.1-dev"
} }
}, },
"installation-source": "source", "installation-source": "source",
@ -969,19 +845,84 @@
} }
}, },
{ {
"name": "swiftmailer/swiftmailer", "name": "doctrine/orm",
"version": "dev-master", "version": "2.2.x-dev",
"version_normalized": "9999999-dev", "version_normalized": "2.2.9999999.9999999-dev",
"time": "2012-06-20 14:46:20", "time": "2012-07-07 07:48:00",
"source": { "source": {
"type": "git", "type": "git",
"url": "git://github.com/swiftmailer/swiftmailer.git", "url": "git://github.com/doctrine/doctrine2.git",
"reference": "d57ffdeed664d6061cef0047e1f5d3fc3ee3fb99" "reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/swiftmailer/swiftmailer/zipball/d57ffdeed664d6061cef0047e1f5d3fc3ee3fb99", "url": "https://github.com/doctrine/doctrine2/zipball/5d2a3bcb3b467f41ee58575764f3ba84937f76e4",
"reference": "d57ffdeed664d6061cef0047e1f5d3fc3ee3fb99", "reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"ext-pdo": "*",
"doctrine/common": "2.2.*",
"doctrine/dbal": "2.2.*"
},
"type": "library",
"installation-source": "source",
"license": [
"LGPL"
],
"authors": [
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/",
"role": null
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": null,
"role": null
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org",
"homepage": null,
"role": null
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"homepage": null,
"role": null
}
],
"description": "Object-Relational-Mapper for PHP",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"database",
"orm"
],
"autoload": {
"psr-0": {
"Doctrine\\ORM": "lib/"
}
}
},
{
"name": "swiftmailer/swiftmailer",
"version": "dev-master",
"version_normalized": "9999999-dev",
"time": "2012-07-08 09:21:00",
"source": {
"type": "git",
"url": "git://github.com/swiftmailer/swiftmailer.git",
"reference": "f51b5f33c83b48faea75f1285f99a2e8f1c66f75"
},
"dist": {
"type": "zip",
"url": "https://github.com/swiftmailer/swiftmailer/zipball/f51b5f33c83b48faea75f1285f99a2e8f1c66f75",
"reference": "f51b5f33c83b48faea75f1285f99a2e8f1c66f75",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -990,7 +931,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"installation-source": "source", "installation-source": "source",
@ -1024,19 +965,84 @@
} }
}, },
{ {
"name": "symfony/symfony", "name": "doctrine/dbal",
"version": "dev-master", "version": "2.2.x-dev",
"version_normalized": "9999999-dev", "version_normalized": "2.2.9999999.9999999-dev",
"time": "2012-06-21 09:42:20", "time": "2012-07-08 18:30:35",
"source": { "source": {
"type": "git", "type": "git",
"url": "git://github.com/symfony/symfony.git", "url": "https://github.com/doctrine/dbal",
"reference": "v2.1.0-BETA1" "reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/symfony/symfony/zipball/v2.1.0-BETA1", "url": "https://github.com/doctrine/dbal/zipball/b961a3fce6bf220f1dca47d7d747b9074bea4730",
"reference": "v2.1.0-BETA1", "reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"doctrine/common": ">=2.2.0,<=2.2.99"
},
"type": "library",
"installation-source": "source",
"license": [
"LGPL"
],
"authors": [
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/",
"role": null
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": null,
"role": null
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org",
"homepage": null,
"role": null
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"homepage": null,
"role": null
}
],
"description": "Database Abstraction Layer",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"database",
"persistence",
"dbal",
"queryobject"
],
"autoload": {
"psr-0": {
"Doctrine\\DBAL": "lib/"
}
}
},
{
"name": "symfony/symfony",
"version": "dev-master",
"version_normalized": "9999999-dev",
"time": "2012-07-09 05:52:38",
"source": {
"type": "git",
"url": "git://github.com/symfony/symfony.git",
"reference": "v2.1.0-BETA2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/symfony/zipball/v2.1.0-BETA2",
"reference": "v2.1.0-BETA2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1129,16 +1135,16 @@
"version": "dev-master", "version": "dev-master",
"version_normalized": "9999999-dev", "version_normalized": "9999999-dev",
"target-dir": "Sensio/Bundle/DistributionBundle", "target-dir": "Sensio/Bundle/DistributionBundle",
"time": "2012-06-21 15:12:48", "time": "2012-07-08 08:02:21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sensio/SensioDistributionBundle", "url": "https://github.com/sensio/SensioDistributionBundle",
"reference": "a360ad61fe34206a7295c1ef00b5455b2b2e1071" "reference": "9a7dbd867fd5061e4bfd660a175aa66122f53d25"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/sensio/SensioDistributionBundle/zipball/a360ad61fe34206a7295c1ef00b5455b2b2e1071", "url": "https://github.com/sensio/SensioDistributionBundle/zipball/9a7dbd867fd5061e4bfd660a175aa66122f53d25",
"reference": "a360ad61fe34206a7295c1ef00b5455b2b2e1071", "reference": "9a7dbd867fd5061e4bfd660a175aa66122f53d25",
"shasum": "" "shasum": ""
}, },
"require": { "require": {

2
vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php vendored
View File

@ -280,7 +280,7 @@ class SQLServerPlatform extends AbstractPlatform
$columnSql = array(); $columnSql = array();
if ($diff->newName !== false) { if ($diff->newName !== false) {
$queryParts[] = 'RENAME TO ' . $diff->newName; $queryParts[] = "sp_RENAME '" . $diff->name . "', '" . $diff->newName . "'";
} }
foreach ($diff->addedColumns AS $fieldName => $column) { foreach ($diff->addedColumns AS $fieldName => $column) {

42
vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php vendored
View File

@ -61,10 +61,10 @@ class SQLParserUtils
} else { } else {
$name = ""; $name = "";
// TODO: Something faster/better to match this than regex? // TODO: Something faster/better to match this than regex?
for ($j = $i; ($j < $stmtLen && preg_match('(([:a-zA-Z0-9_]{1}))', $statement[$j])); $j++) { for ($j = $i + 1; ($j < $stmtLen && preg_match('(([a-zA-Z0-9_]{1}))', $statement[$j])); $j++) {
$name .= $statement[$j]; $name .= $statement[$j];
} }
$paramMap[$name][] = $i; // named parameters can be duplicated! $paramMap[$i] = $name; // named parameters can be duplicated!
$i = $j; $i = $j;
} }
++$count; ++$count;
@ -139,34 +139,28 @@ class SQLParserUtils
$queryOffset= 0; $queryOffset= 0;
$typesOrd = array(); $typesOrd = array();
$paramsOrd = array(); $paramsOrd = array();
foreach ($paramPos as $needle => $needlePos) { foreach ($paramPos as $pos => $paramName) {
$paramLen = strlen($needle); $paramLen = strlen($paramName) + 1;
$token = substr($needle,0,1); $value = $params[$paramName];
$needle = substr($needle,1);
$value = $params[$needle];
if (!isset($arrayPositions[$needle])) { if (!isset($arrayPositions[$paramName])) {
foreach ($needlePos as $pos) { $pos += $queryOffset;
$pos += $queryOffset; $queryOffset -= ($paramLen - 1);
$queryOffset -= ($paramLen - 1); $paramsOrd[] = $value;
$paramsOrd[] = $value; $typesOrd[] = $types[$paramName];
$typesOrd[] = $types[$needle]; $query = substr($query, 0, $pos) . '?' . substr($query, ($pos + $paramLen));
$query = substr($query, 0, $pos) . '?' . substr($query, ($pos + $paramLen));
}
} else { } else {
$len = count($value); $len = count($value);
$expandStr = implode(", ", array_fill(0, $len, "?")); $expandStr = implode(", ", array_fill(0, $len, "?"));
foreach ($needlePos as $pos) {
foreach ($value as $val) { foreach ($value as $val) {
$paramsOrd[] = $val; $paramsOrd[] = $val;
$typesOrd[] = $types[$needle] - Connection::ARRAY_PARAM_OFFSET; $typesOrd[] = $types[$paramName] - Connection::ARRAY_PARAM_OFFSET;
}
$pos += $queryOffset;
$queryOffset += (strlen($expandStr) - $paramLen);
$query = substr($query, 0, $pos) . $expandStr . substr($query, ($pos + $paramLen));
} }
$pos += $queryOffset;
$queryOffset += (strlen($expandStr) - $paramLen);
$query = substr($query, 0, $pos) . $expandStr . substr($query, ($pos + $paramLen));
} }
} }

20
vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Index.php vendored
View File

@ -77,6 +77,14 @@ class Index extends AbstractAsset implements Constraint
return $this->_columns; return $this->_columns;
} }
/**
* @return array
*/
public function getUnquotedColumns()
{
return array_map(array($this, 'trimQuotes'), $this->getColumns());
}
/** /**
* Is the index neither unique nor primary key? * Is the index neither unique nor primary key?
* *
@ -108,11 +116,11 @@ class Index extends AbstractAsset implements Constraint
* @param int $pos * @param int $pos
* @return bool * @return bool
*/ */
public function hasColumnAtPosition($columnName, $pos=0) public function hasColumnAtPosition($columnName, $pos = 0)
{ {
$columnName = strtolower($columnName); $columnName = $this->trimQuotes(strtolower($columnName));
$indexColumns = \array_map('strtolower', $this->getColumns()); $indexColumns = array_map('strtolower', $this->getUnquotedColumns());
return \array_search($columnName, $indexColumns) === $pos; return array_search($columnName, $indexColumns) === $pos;
} }
/** /**
@ -125,7 +133,7 @@ class Index extends AbstractAsset implements Constraint
{ {
$sameColumns = true; $sameColumns = true;
for ($i = 0; $i < count($this->_columns); $i++) { for ($i = 0; $i < count($this->_columns); $i++) {
if (!isset($columnNames[$i]) || strtolower($this->_columns[$i]) != strtolower($columnNames[$i])) { if (!isset($columnNames[$i]) || $this->trimQuotes(strtolower($this->_columns[$i])) != $this->trimQuotes(strtolower($columnNames[$i]))) {
$sameColumns = false; $sameColumns = false;
} }
} }
@ -185,4 +193,4 @@ class Index extends AbstractAsset implements Constraint
} }
return false; return false;
} }
} }

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php vendored
View File

@ -27,6 +27,9 @@ use Doctrine\DBAL\DriverManager;
*/ */
class CreateDatabaseDoctrineCommand extends DoctrineCommand class CreateDatabaseDoctrineCommand extends DoctrineCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
$this $this
@ -47,6 +50,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$connection = $this->getDoctrineConnection($input->getOption('connection')); $connection = $this->getDoctrineConnection($input->getOption('connection'));

13
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/DoctrineCommand.php vendored
View File

@ -24,6 +24,11 @@ use Doctrine\ORM\Tools\EntityGenerator;
*/ */
abstract class DoctrineCommand extends ContainerAwareCommand abstract class DoctrineCommand extends ContainerAwareCommand
{ {
/**
* get a doctrine entity generator
*
* @return EntityGenerator
*/
protected function getEntityGenerator() protected function getEntityGenerator()
{ {
$entityGenerator = new EntityGenerator(); $entityGenerator = new EntityGenerator();
@ -37,6 +42,12 @@ abstract class DoctrineCommand extends ContainerAwareCommand
return $entityGenerator; return $entityGenerator;
} }
/**
* Get a doctrine entity manager by symfony name.
*
* @param string $name
* @return \Doctrine\ORM\EntityManager
*/
protected function getEntityManager($name) protected function getEntityManager($name)
{ {
return $this->getContainer()->get('doctrine')->getManager($name); return $this->getContainer()->get('doctrine')->getManager($name);
@ -46,7 +57,7 @@ abstract class DoctrineCommand extends ContainerAwareCommand
* Get a doctrine dbal connection by symfony name. * Get a doctrine dbal connection by symfony name.
* *
* @param string $name * @param string $name
* @return Doctrine\DBAL\Connection * @return \Doctrine\DBAL\Connection
*/ */
protected function getDoctrineConnection($name) protected function getDoctrineConnection($name)
{ {

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php vendored
View File

@ -26,6 +26,9 @@ use Symfony\Component\Console\Output\OutputInterface;
*/ */
class DropDatabaseDoctrineCommand extends DoctrineCommand class DropDatabaseDoctrineCommand extends DoctrineCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
$this $this
@ -52,6 +55,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$connection = $this->getDoctrineConnection($input->getOption('connection')); $connection = $this->getDoctrineConnection($input->getOption('connection'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php vendored
View File

@ -29,6 +29,9 @@ use Doctrine\Bundle\DoctrineBundle\Mapping\DisconnectedMetadataFactory;
*/ */
class GenerateEntitiesDoctrineCommand extends DoctrineCommand class GenerateEntitiesDoctrineCommand extends DoctrineCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
$this $this
@ -79,6 +82,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$manager = new DisconnectedMetadataFactory($this->getContainer()->get('doctrine')); $manager = new DisconnectedMetadataFactory($this->getContainer()->get('doctrine'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php vendored
View File

@ -31,6 +31,9 @@ use Doctrine\ORM\Tools\Console\MetadataFilter;
*/ */
class ImportMappingDoctrineCommand extends DoctrineCommand class ImportMappingDoctrineCommand extends DoctrineCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
$this $this
@ -65,6 +68,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$bundle = $this->getApplication()->getKernel()->getBundle($input->getArgument('bundle')); $bundle = $this->getApplication()->getKernel()->getBundle($input->getArgument('bundle'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/ClearMetadataCacheDoctrineCommand.php vendored
View File

@ -27,6 +27,9 @@ use Doctrine\ORM\Tools\Console\Command\ClearCache\MetadataCommand;
*/ */
class ClearMetadataCacheDoctrineCommand extends MetadataCommand class ClearMetadataCacheDoctrineCommand extends MetadataCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -49,6 +52,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/ClearQueryCacheDoctrineCommand.php vendored
View File

@ -27,6 +27,9 @@ use Doctrine\ORM\Tools\Console\Command\ClearCache\QueryCommand;
*/ */
class ClearQueryCacheDoctrineCommand extends QueryCommand class ClearQueryCacheDoctrineCommand extends QueryCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -49,6 +52,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

21
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/ClearResultCacheDoctrineCommand.php vendored
View File

@ -27,6 +27,9 @@ use Doctrine\ORM\Tools\Console\Command\ClearCache\ResultCommand;
*/ */
class ClearResultCacheDoctrineCommand extends ResultCommand class ClearResultCacheDoctrineCommand extends ResultCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -45,25 +48,13 @@ You can also optionally specify the <comment>--em</comment> option to specify
which entity manager to clear the cache for: which entity manager to clear the cache for:
<info>php app/console doctrine:cache:clear-result --em=default</info> <info>php app/console doctrine:cache:clear-result --em=default</info>
If you don't want to clear all result cache you can specify some additional
options to control what cache is deleted:
<info>php app/console doctrine:cache:clear-result --id=cache_key</info>
Or you can specify a <comment>--regex</comment> to delete cache entries that
match it:
<info>php app/console doctrine:cache:clear-result --regex="user_(.*)"</info>
You can also specify a <comment>--prefix</comment> or
<comment>--suffix</comment> to delete cache entries for:
<info>php app/console doctrine:cache:clear-result --prefix="user_" --suffix="_frontend"</info>
EOT EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

14
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/ConvertMappingDoctrineCommand.php vendored
View File

@ -31,6 +31,9 @@ use Doctrine\ORM\Tools\Export\Driver\YamlExporter;
*/ */
class ConvertMappingDoctrineCommand extends ConvertMappingCommand class ConvertMappingDoctrineCommand extends ConvertMappingCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -46,6 +49,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));
@ -53,9 +59,15 @@ EOT
return parent::execute($input, $output); return parent::execute($input, $output);
} }
/**
* @param string $toType
* @param string $destPath
*
* @return \Doctrine\ORM\Tools\Export\Driver\AbstractExporter
*/
protected function getExporter($toType, $destPath) protected function getExporter($toType, $destPath)
{ {
/** @var $exporter \Doctrine\ORM\Tools\Export\Driver\AbstractExporter */
$exporter = parent::getExporter($toType, $destPath); $exporter = parent::getExporter($toType, $destPath);
if ($exporter instanceof XmlExporter) { if ($exporter instanceof XmlExporter) {
$exporter->setExtension('.orm.xml'); $exporter->setExtension('.orm.xml');

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/CreateSchemaDoctrineCommand.php vendored
View File

@ -29,6 +29,9 @@ use Doctrine\ORM\Tools\Console\Command\SchemaTool\CreateCommand;
*/ */
class CreateSchemaDoctrineCommand extends CreateCommand class CreateSchemaDoctrineCommand extends CreateCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -54,6 +57,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

9
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/DoctrineCommandHelper.php vendored
View File

@ -13,7 +13,7 @@
*/ */
namespace Doctrine\Bundle\DoctrineBundle\Command\Proxy; namespace Doctrine\Bundle\DoctrineBundle\Command\Proxy;
use Symfony\Component\Console\Application; use Symfony\Bundle\FrameworkBundle\Console\Application;
use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper; use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper; use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
@ -33,12 +33,19 @@ abstract class DoctrineCommandHelper
*/ */
static public function setApplicationEntityManager(Application $application, $emName) static public function setApplicationEntityManager(Application $application, $emName)
{ {
/** @var $em \Doctrine\ORM\EntityManager */
$em = $application->getKernel()->getContainer()->get('doctrine')->getManager($emName); $em = $application->getKernel()->getContainer()->get('doctrine')->getManager($emName);
$helperSet = $application->getHelperSet(); $helperSet = $application->getHelperSet();
$helperSet->set(new ConnectionHelper($em->getConnection()), 'db'); $helperSet->set(new ConnectionHelper($em->getConnection()), 'db');
$helperSet->set(new EntityManagerHelper($em), 'em'); $helperSet->set(new EntityManagerHelper($em), 'em');
} }
/**
* Convenience method to push the helper sets of a given connection into the application.
*
* @param Application $application
* @param string $connName
*/
static public function setApplicationConnection(Application $application, $connName) static public function setApplicationConnection(Application $application, $connName)
{ {
$connection = $application->getKernel()->getContainer()->get('doctrine')->getConnection($connName); $connection = $application->getKernel()->getContainer()->get('doctrine')->getConnection($connName);

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/DropSchemaDoctrineCommand.php vendored
View File

@ -28,6 +28,9 @@ use Doctrine\ORM\Tools\Console\Command\SchemaTool\DropCommand;
*/ */
class DropSchemaDoctrineCommand extends DropCommand class DropSchemaDoctrineCommand extends DropCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -54,6 +57,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/EnsureProductionSettingsDoctrineCommand.php vendored
View File

@ -28,6 +28,9 @@ use Doctrine\ORM\Tools\Console\Command\EnsureProductionSettingsCommand;
*/ */
class EnsureProductionSettingsDoctrineCommand extends EnsureProductionSettingsCommand class EnsureProductionSettingsDoctrineCommand extends EnsureProductionSettingsCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -49,6 +52,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/InfoDoctrineCommand.php vendored
View File

@ -27,6 +27,9 @@ use Symfony\Component\Console\Output\OutputInterface;
*/ */
class InfoDoctrineCommand extends InfoCommand class InfoDoctrineCommand extends InfoCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
$this $this
@ -48,6 +51,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/RunDqlDoctrineCommand.php vendored
View File

@ -28,6 +28,9 @@ use Doctrine\ORM\Tools\Console\Command\RunDqlCommand;
*/ */
class RunDqlDoctrineCommand extends RunDqlCommand class RunDqlDoctrineCommand extends RunDqlCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -54,6 +57,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/RunSqlDoctrineCommand.php vendored
View File

@ -28,6 +28,9 @@ use Doctrine\DBAL\Tools\Console\Command\RunSqlCommand;
*/ */
class RunSqlDoctrineCommand extends RunSqlCommand class RunSqlDoctrineCommand extends RunSqlCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -44,6 +47,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationConnection($this->getApplication(), $input->getOption('connection')); DoctrineCommandHelper::setApplicationConnection($this->getApplication(), $input->getOption('connection'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/UpdateSchemaDoctrineCommand.php vendored
View File

@ -29,6 +29,9 @@ use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand;
*/ */
class UpdateSchemaDoctrineCommand extends UpdateCommand class UpdateSchemaDoctrineCommand extends UpdateCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -58,6 +61,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

6
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Command/Proxy/ValidateSchemaCommand.php vendored
View File

@ -28,6 +28,9 @@ use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand as DoctrineValidate
*/ */
class ValidateSchemaCommand extends DoctrineValidateSchemaCommand class ValidateSchemaCommand extends DoctrineValidateSchemaCommand
{ {
/**
* {@inheritDoc}
*/
protected function configure() protected function configure()
{ {
parent::configure(); parent::configure();
@ -50,6 +53,9 @@ EOT
); );
} }
/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em')); DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

3
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/ConnectionFactory.php vendored
View File

@ -69,6 +69,9 @@ class ConnectionFactory
return $connection; return $connection;
} }
/**
* initialize the types
*/
private function initializeTypes() private function initializeTypes()
{ {
foreach ($this->typesConfig as $type => $typeConfig) { foreach ($this->typesConfig as $type => $typeConfig) {

1
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Controller/ProfilerController.php vendored
View File

@ -35,6 +35,7 @@ class ProfilerController extends ContainerAware
*/ */
public function explainAction($token, $connectionName, $query) public function explainAction($token, $connectionName, $query)
{ {
/** @var $profiler \Symfony\Component\HttpKernel\Profiler\Profiler */
$profiler = $this->container->get('profiler'); $profiler = $this->container->get('profiler');
$profiler->disable(); $profiler->disable();

38
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/DependencyInjection/Configuration.php vendored
View File

@ -41,9 +41,7 @@ class Configuration implements ConfigurationInterface
} }
/** /**
* Generates the configuration tree builder. * {@inheritDoc}
*
* @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder
*/ */
public function getConfigTreeBuilder() public function getConfigTreeBuilder()
{ {
@ -56,6 +54,11 @@ class Configuration implements ConfigurationInterface
return $treeBuilder; return $treeBuilder;
} }
/**
* Add DBAL section to configuration tree
*
* @param ArrayNodeDefinition $node
*/
private function addDbalSection(ArrayNodeDefinition $node) private function addDbalSection(ArrayNodeDefinition $node)
{ {
$node $node
@ -105,6 +108,11 @@ class Configuration implements ConfigurationInterface
; ;
} }
/**
* Return the dbal connections node
*
* @return ArrayNodeDefinition
*/
private function getDbalConnectionsNode() private function getDbalConnectionsNode()
{ {
$treeBuilder = new TreeBuilder(); $treeBuilder = new TreeBuilder();
@ -157,7 +165,7 @@ class Configuration implements ConfigurationInterface
* *
* These keys are available for slave configurations too. * These keys are available for slave configurations too.
* *
* @param \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition $node * @param ArrayNodeDefinition $node
*/ */
private function configureDbalDriverNode(ArrayNodeDefinition $node) private function configureDbalDriverNode(ArrayNodeDefinition $node)
{ {
@ -202,6 +210,11 @@ class Configuration implements ConfigurationInterface
; ;
} }
/**
* Add the ORM section to configuration tree
*
* @param ArrayNodeDefinition $node
*/
private function addOrmSection(ArrayNodeDefinition $node) private function addOrmSection(ArrayNodeDefinition $node)
{ {
$node $node
@ -246,6 +259,11 @@ class Configuration implements ConfigurationInterface
; ;
} }
/**
* Return ORM target entity resolver node
*
* @return \Symfony\Component\Config\Definition\Builder\NodeDefinition
*/
private function getOrmTargetEntityResolverNode() private function getOrmTargetEntityResolverNode()
{ {
$treeBuilder = new TreeBuilder(); $treeBuilder = new TreeBuilder();
@ -261,6 +279,11 @@ class Configuration implements ConfigurationInterface
return $node; return $node;
} }
/**
* Return ORM entity manager node
*
* @return ArrayNodeDefinition
*/
private function getOrmEntityManagersNode() private function getOrmEntityManagersNode()
{ {
$treeBuilder = new TreeBuilder(); $treeBuilder = new TreeBuilder();
@ -362,6 +385,13 @@ class Configuration implements ConfigurationInterface
return $node; return $node;
} }
/**
* Return a ORM cache driver node for an given entity manager
*
* @param string $name
*
* @return ArrayNodeDefinition
*/
private function getOrmCacheDriverNode($name) private function getOrmCacheDriverNode($name)
{ {
$treeBuilder = new TreeBuilder(); $treeBuilder = new TreeBuilder();

23
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php vendored
View File

@ -32,6 +32,9 @@ use Symfony\Component\Config\FileLocator;
*/ */
class DoctrineExtension extends AbstractDoctrineExtension class DoctrineExtension extends AbstractDoctrineExtension
{ {
/**
* {@inheritDoc}
*/
public function load(array $configs, ContainerBuilder $container) public function load(array $configs, ContainerBuilder $container)
{ {
$configuration = $this->getConfiguration($configs, $container); $configuration = $this->getConfiguration($configs, $container);
@ -377,6 +380,9 @@ class DoctrineExtension extends AbstractDoctrineExtension
$ormConfigDef->addMethodCall('setEntityNamespaces', array($this->aliasMap)); $ormConfigDef->addMethodCall('setEntityNamespaces', array($this->aliasMap));
} }
/**
* {@inheritDoc}
*/
protected function getObjectManagerElementName($name) protected function getObjectManagerElementName($name)
{ {
return 'doctrine.orm.'.$name; return 'doctrine.orm.'.$name;
@ -387,11 +393,17 @@ class DoctrineExtension extends AbstractDoctrineExtension
return 'Entity'; return 'Entity';
} }
/**
* {@inheritDoc}
*/
protected function getMappingResourceConfigDirectory() protected function getMappingResourceConfigDirectory()
{ {
return 'Resources/config/doctrine'; return 'Resources/config/doctrine';
} }
/**
* {@inheritDoc}
*/
protected function getMappingResourceExtension() protected function getMappingResourceExtension()
{ {
return 'orm'; return 'orm';
@ -411,9 +423,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
} }
/** /**
* Returns the base path for the XSD files. * {@inheritDoc}
*
* @return string The XSD base path
*/ */
public function getXsdValidationBasePath() public function getXsdValidationBasePath()
{ {
@ -421,15 +431,16 @@ class DoctrineExtension extends AbstractDoctrineExtension
} }
/** /**
* Returns the namespace to be used for this extension (XML namespace). * {@inheritDoc}
*
* @return string The XML namespace
*/ */
public function getNamespace() public function getNamespace()
{ {
return 'http://symfony.com/schema/dic/doctrine'; return 'http://symfony.com/schema/dic/doctrine';
} }
/**
* {@inheritDoc}
*/
public function getConfiguration(array $config, ContainerBuilder $container) public function getConfiguration(array $config, ContainerBuilder $container)
{ {
return new Configuration($container->getParameter('kernel.debug')); return new Configuration($container->getParameter('kernel.debug'));

14
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/DoctrineBundle.php vendored
View File

@ -36,6 +36,9 @@ class DoctrineBundle extends Bundle
{ {
private $autoloader; private $autoloader;
/**
* {@inheritDoc}
*/
public function build(ContainerBuilder $container) public function build(ContainerBuilder $container)
{ {
parent::build($container); parent::build($container);
@ -48,6 +51,9 @@ class DoctrineBundle extends Bundle
$container->addCompilerPass(new DoctrineValidationPass('orm')); $container->addCompilerPass(new DoctrineValidationPass('orm'));
} }
/**
* {@inheritDoc}
*/
public function boot() public function boot()
{ {
// Register an autoloader for proxies to avoid issues when unserializing them // Register an autoloader for proxies to avoid issues when unserializing them
@ -66,9 +72,11 @@ class DoctrineBundle extends Bundle
if (!is_file($file) && $container->getParameter('kernel.debug')) { if (!is_file($file) && $container->getParameter('kernel.debug')) {
$originalClassName = ClassUtils::getRealClass($class); $originalClassName = ClassUtils::getRealClass($class);
/** @var $registry Registry */
$registry = $container->get('doctrine'); $registry = $container->get('doctrine');
// Tries to auto-generate the proxy file // Tries to auto-generate the proxy file
/** @var $em \Doctrine\ORM\EntityManager */
foreach ($registry->getManagers() as $em) { foreach ($registry->getManagers() as $em) {
if ($em->getConfiguration()->getAutoGenerateProxyClasses()) { if ($em->getConfiguration()->getAutoGenerateProxyClasses()) {
@ -94,6 +102,9 @@ class DoctrineBundle extends Bundle
} }
} }
/**
* {@inheritDoc}
*/
public function shutdown() public function shutdown()
{ {
if (null !== $this->autoloader) { if (null !== $this->autoloader) {
@ -102,6 +113,9 @@ class DoctrineBundle extends Bundle
} }
} }
/**
* {@inheritDoc}
*/
public function registerCommands(Application $application) public function registerCommands(Application $application)
{ {
// Use the default logic when the ORM is available. // Use the default logic when the ORM is available.

7
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/ManagerConfigurator.php vendored
View File

@ -45,6 +45,13 @@ class ManagerConfigurator
$this->enableFilters($entityManager); $this->enableFilters($entityManager);
} }
/**
* Enable filters for an given entity manager
*
* @param EntityManager $entityManager
*
* @return null
*/
private function enableFilters(EntityManager $entityManager) private function enableFilters(EntityManager $entityManager)
{ {
if (empty($this->enabledFilters)) { if (empty($this->enabledFilters)) {

20
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Mapping/ClassMetadataCollection.php vendored
View File

@ -23,31 +23,51 @@ class ClassMetadataCollection
private $namespace; private $namespace;
private $metadata; private $metadata;
/**
* Constructor
*
* @param array $metadata
*/
public function __construct(array $metadata) public function __construct(array $metadata)
{ {
$this->metadata = $metadata; $this->metadata = $metadata;
} }
/**
* @return array
*/
public function getMetadata() public function getMetadata()
{ {
return $this->metadata; return $this->metadata;
} }
/**
* @param string $path
*/
public function setPath($path) public function setPath($path)
{ {
$this->path = $path; $this->path = $path;
} }
/**
* @return string
*/
public function getPath() public function getPath()
{ {
return $this->path; return $this->path;
} }
/**
* @param string $namespace
*/
public function setNamespace($namespace) public function setNamespace($namespace)
{ {
$this->namespace = $namespace; $this->namespace = $namespace;
} }
/**
* @return string
*/
public function getNamespace() public function getNamespace()
{ {
return $this->namespace; return $this->namespace;

3
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Mapping/DisconnectedMetadataFactory.php vendored
View File

@ -19,6 +19,9 @@ namespace Doctrine\Bundle\DoctrineBundle\Mapping;
*/ */
class DisconnectedMetadataFactory extends MetadataFactory class DisconnectedMetadataFactory extends MetadataFactory
{ {
/**
* @return string
*/
protected function getClassMetadataFactoryClass() protected function getClassMetadataFactoryClass()
{ {
return 'Doctrine\\ORM\\Tools\\DisconnectedClassMetadataFactory'; return 'Doctrine\\ORM\\Tools\\DisconnectedClassMetadataFactory';

37
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Mapping/MetadataFactory.php vendored
View File

@ -44,6 +44,7 @@ class MetadataFactory
* @param BundleInterface $bundle A BundleInterface instance * @param BundleInterface $bundle A BundleInterface instance
* *
* @return ClassMetadataCollection A ClassMetadataCollection instance * @return ClassMetadataCollection A ClassMetadataCollection instance
* @throws \RuntimeException When bundle does not contain mapped entities
*/ */
public function getBundleMetadata(BundleInterface $bundle) public function getBundleMetadata(BundleInterface $bundle)
{ {
@ -68,6 +69,7 @@ class MetadataFactory
* @param string $path The path where the class is stored (if known) * @param string $path The path where the class is stored (if known)
* *
* @return ClassMetadataCollection A ClassMetadataCollection instance * @return ClassMetadataCollection A ClassMetadataCollection instance
* @throws MappingException When class is not valid entity or mapped superclass
*/ */
public function getClassMetadata($class, $path = null) public function getClassMetadata($class, $path = null)
{ {
@ -88,6 +90,7 @@ class MetadataFactory
* @param string $path The path where the class is stored (if known) * @param string $path The path where the class is stored (if known)
* *
* @return ClassMetadataCollection A ClassMetadataCollection instance * @return ClassMetadataCollection A ClassMetadataCollection instance
* @throws \RuntimeException When namespace not contain mapped entities
*/ */
public function getNamespaceMetadata($namespace, $path = null) public function getNamespaceMetadata($namespace, $path = null)
{ {
@ -105,8 +108,9 @@ class MetadataFactory
* Find and configure path and namespace for the metadata collection. * Find and configure path and namespace for the metadata collection.
* *
* @param ClassMetadataCollection $metadata * @param ClassMetadataCollection $metadata
* @param string|null $path * @param string|null $path
* @return void *
* @throws \RuntimeException When unable to determine the path
*/ */
public function findNamespaceAndPathForMetadata(ClassMetadataCollection $metadata, $path = null) public function findNamespaceAndPathForMetadata(ClassMetadataCollection $metadata, $path = null)
{ {
@ -122,11 +126,21 @@ class MetadataFactory
$metadata->setNamespace(isset($r) ? $r->getNamespaceName() : $all[0]->name); $metadata->setNamespace(isset($r) ? $r->getNamespaceName() : $all[0]->name);
} }
/**
* Get a base path for a class
*
* @param string $name class name
* @param string $namespace class namespace
* @param string $path class path
*
* @return string
* @throws \RuntimeException When base path not found
*/
private function getBasePathForClass($name, $namespace, $path) private function getBasePathForClass($name, $namespace, $path)
{ {
$namespace = str_replace('\\', '/', $namespace); $namespace = str_replace('\\', '/', $namespace);
$search = str_replace('\\', '/', $path); $search = str_replace('\\', '/', $path);
$destination = str_replace('/'.$namespace, '', $search, $c); $destination = str_replace('/' . $namespace, '', $search, $c);
if ($c != 1) { if ($c != 1) {
throw new \RuntimeException(sprintf('Can\'t find base path for "%s" (path: "%s", destination: "%s").', $name, $path, $destination)); throw new \RuntimeException(sprintf('Can\'t find base path for "%s" (path: "%s", destination: "%s").', $name, $path, $destination));
@ -135,6 +149,11 @@ class MetadataFactory
return $destination; return $destination;
} }
/**
* @param string $namespace
*
* @return ClassMetadataCollection
*/
private function getMetadataForNamespace($namespace) private function getMetadataForNamespace($namespace)
{ {
$metadata = array(); $metadata = array();
@ -147,6 +166,11 @@ class MetadataFactory
return new ClassMetadataCollection($metadata); return new ClassMetadataCollection($metadata);
} }
/**
* @param string $entity
*
* @return ClassMetadataCollection
*/
private function getMetadataForClass($entity) private function getMetadataForClass($entity)
{ {
foreach ($this->getAllMetadata() as $metadata) { foreach ($this->getAllMetadata() as $metadata) {
@ -158,11 +182,15 @@ class MetadataFactory
return new ClassMetadataCollection(array()); return new ClassMetadataCollection(array());
} }
/**
* @return array
*/
private function getAllMetadata() private function getAllMetadata()
{ {
$metadata = array(); $metadata = array();
foreach ($this->registry->getManagers() as $em) { foreach ($this->registry->getManagers() as $em) {
$class = $this->getClassMetadataFactoryClass(); $class = $this->getClassMetadataFactoryClass();
/** @var $cmf \Doctrine\ORM\Mapping\ClassMetadataFactory */
$cmf = new $class(); $cmf = new $class();
$cmf->setEntityManager($em); $cmf->setEntityManager($em);
foreach ($cmf->getAllMetadata() as $m) { foreach ($cmf->getAllMetadata() as $m) {
@ -173,6 +201,9 @@ class MetadataFactory
return $metadata; return $metadata;
} }
/**
* @return string
*/
protected function getClassMetadataFactoryClass() protected function getClassMetadataFactoryClass()
{ {
return 'Doctrine\\ORM\\Mapping\\ClassMetadataFactory'; return 'Doctrine\\ORM\\Mapping\\ClassMetadataFactory';

9
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Registry.php vendored
View File

@ -27,6 +27,15 @@ use Doctrine\ORM\EntityManager;
*/ */
class Registry extends ManagerRegistry implements RegistryInterface class Registry extends ManagerRegistry implements RegistryInterface
{ {
/**
* Construct.
*
* @param ContainerInterface $container
* @param array $connections
* @param array $entityManagers
* @param string $defaultConnection
* @param string $defaultEntityManager
*/
public function __construct(ContainerInterface $container, array $connections, array $entityManagers, $defaultConnection, $defaultEntityManager) public function __construct(ContainerInterface $container, array $connections, array $entityManagers, $defaultConnection, $defaultEntityManager)
{ {
$this->setContainer($container); $this->setContainer($container);

2
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Resources/doc/configuration.rst vendored
View File

@ -150,7 +150,7 @@ certain classes, but those are for very advanced use-cases only.
Caching Drivers Caching Drivers
~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~
For the caching drivers you can specify the values "array", "apc", "memcache" For the caching drivers you can specify the values "array", "apc", "memcache", "memcached"
or "xcache". or "xcache".
The following example shows an overview of the caching configurations: The following example shows an overview of the caching configurations:

1
vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/composer.json vendored
View File

@ -37,6 +37,7 @@
"psr-0": { "Doctrine\\Bundle\\DoctrineBundle": "" } "psr-0": { "Doctrine\\Bundle\\DoctrineBundle": "" }
}, },
"target-dir": "Doctrine/Bundle/DoctrineBundle", "target-dir": "Doctrine/Bundle/DoctrineBundle",
"minimum-stability": "dev",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "1.0.x-dev"

11
vendor/doctrine/orm/lib/Doctrine/ORM/EntityRepository.php vendored
View File

@ -124,8 +124,15 @@ class EntityRepository implements ObjectRepository
return null; return null;
} }
if ($lockMode !== LockMode::NONE) { switch ($lockMode) {
$this->_em->lock($entity, $lockMode, $lockVersion); case LockMode::OPTIMISTIC:
$this->_em->lock($entity, $lockMode, $lockVersion);
break;
case LockMode::PESSIMISTIC_READ:
case LockMode::PESSIMISTIC_WRITE:
$persister = $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName);
$persister->refresh($sortedId, $entity, $lockMode);
break;
} }
return $entity; // Hit! return $entity; // Hit!

18
vendor/doctrine/orm/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php vendored
View File

@ -364,7 +364,19 @@ class BasicEntityPersister
$targetMapping = $this->_em->getClassMetadata($this->_class->associationMappings[$idField]['targetEntity']); $targetMapping = $this->_em->getClassMetadata($this->_class->associationMappings[$idField]['targetEntity']);
$where[] = $this->_class->associationMappings[$idField]['joinColumns'][0]['name']; $where[] = $this->_class->associationMappings[$idField]['joinColumns'][0]['name'];
$params[] = $id[$idField]; $params[] = $id[$idField];
$types[] = $targetMapping->fieldMappings[$targetMapping->identifier[0]]['type'];
switch (true) {
case (isset($targetMapping->fieldMappings[$targetMapping->identifier[0]])):
$types[] = $targetMapping->fieldMappings[$targetMapping->identifier[0]]['type'];
break;
case (isset($targetMapping->associationMappings[$targetMapping->identifier[0]])):
$types[] = $targetMapping->associationMappings[$targetMapping->identifier[0]]['type'];
break;
default:
throw ORMException::unrecognizedField($targetMapping->identifier[0]);
}
} else { } else {
$where[] = $this->_class->getQuotedColumnName($idField, $this->_platform); $where[] = $this->_class->getQuotedColumnName($idField, $this->_platform);
$params[] = $id[$idField]; $params[] = $id[$idField];
@ -690,9 +702,9 @@ class BasicEntityPersister
* column or field names to values. * column or field names to values.
* @param object $entity The entity to refresh. * @param object $entity The entity to refresh.
*/ */
public function refresh(array $id, $entity) public function refresh(array $id, $entity, $lockMode = 0)
{ {
$sql = $this->_getSelectEntitiesSQL($id); $sql = $this->_getSelectEntitiesSQL($id, null, $lockMode);
list($params, $types) = $this->expandParameters($id); list($params, $types) = $this->expandParameters($id);
$stmt = $this->_conn->executeQuery($sql, $params, $types); $stmt = $this->_conn->executeQuery($sql, $params, $types);

14
vendor/doctrine/orm/lib/Doctrine/ORM/Proxy/ProxyFactory.php vendored
View File

@ -184,7 +184,19 @@ class ProxyFactory
$file = str_replace($placeholders, $replacements, $file); $file = str_replace($placeholders, $replacements, $file);
file_put_contents($fileName, $file, LOCK_EX); $parentDirectory = dirname($fileName);
if ( ! is_dir($parentDirectory)) {
if (false === @mkdir($parentDirectory, 0775, true)) {
throw ProxyException::proxyDirectoryNotWritable();
}
} else if ( ! is_writable($parentDirectory)) {
throw ProxyException::proxyDirectoryNotWritable();
}
$tmpFileName = $fileName . '.' . uniqid("", true);
file_put_contents($tmpFileName, $file);
rename($tmpFileName, $fileName);
} }
/** /**

29
vendor/doctrine/orm/lib/Doctrine/ORM/Tools/EntityGenerator.php vendored
View File

@ -136,6 +136,23 @@ public function <methodName>(<methodTypeHint>$<variableName>)
<spaces>return $this; <spaces>return $this;
}'; }';
/**
* @var string
*/
private static $_removeMethodTemplate =
'/**
* <description>
*
* @param <variableType$<variableName>
*/
public function <methodName>(<methodTypeHint>$<variableName>)
{
<spaces>$this-><fieldName>->removeElement($<variableName>);
}';
/**
* @var string
*/
private static $_lifecycleCallbackMethodTemplate = private static $_lifecycleCallbackMethodTemplate =
'/** '/**
* @<name> * @<name>
@ -672,6 +689,9 @@ public function <methodName>()
if ($code = $this->_generateEntityStubMethod($metadata, 'add', $associationMapping['fieldName'], $associationMapping['targetEntity'])) { if ($code = $this->_generateEntityStubMethod($metadata, 'add', $associationMapping['fieldName'], $associationMapping['targetEntity'])) {
$methods[] = $code; $methods[] = $code;
} }
if ($code = $this->_generateEntityStubMethod($metadata, 'remove', $associationMapping['fieldName'], $associationMapping['targetEntity'])) {
$methods[] = $code;
}
if ($code = $this->_generateEntityStubMethod($metadata, 'get', $associationMapping['fieldName'], 'Doctrine\Common\Collections\Collection')) { if ($code = $this->_generateEntityStubMethod($metadata, 'get', $associationMapping['fieldName'], 'Doctrine\Common\Collections\Collection')) {
$methods[] = $code; $methods[] = $code;
} }
@ -756,12 +776,9 @@ public function <methodName>()
private function _generateEntityStubMethod(ClassMetadataInfo $metadata, $type, $fieldName, $typeHint = null, $defaultValue = null) private function _generateEntityStubMethod(ClassMetadataInfo $metadata, $type, $fieldName, $typeHint = null, $defaultValue = null)
{ {
if ($type == "add") { $methodName = $type . Inflector::classify($fieldName);
$addMethod = explode("\\", $typeHint); if (in_array($type, array("add", "remove")) && substr($methodName, -1) == "s") {
$addMethod = end($addMethod); $methodName = substr($methodName, 0, -1);
$methodName = $type . $addMethod;
} else {
$methodName = $type . Inflector::classify($fieldName);
} }
if ($this->_hasMethod($methodName, $metadata)) { if ($this->_hasMethod($methodName, $metadata)) {

21
vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php vendored
View File

@ -1118,6 +1118,10 @@ class UnitOfWork implements PropertyChangedListener
if (isset($this->entityIdentifiers[$oid])) { if (isset($this->entityIdentifiers[$oid])) {
$this->addToIdentityMap($entity); $this->addToIdentityMap($entity);
} }
if ($entity instanceof NotifyPropertyChanged) {
$entity->addPropertyChangedListener($this);
}
} }
/** /**
@ -1296,10 +1300,6 @@ class UnitOfWork implements PropertyChangedListener
$this->identityMap[$className][$idHash] = $entity; $this->identityMap[$className][$idHash] = $entity;
if ($entity instanceof NotifyPropertyChanged) {
$entity->addPropertyChangedListener($this);
}
return true; return true;
} }
@ -1649,7 +1649,7 @@ class UnitOfWork implements PropertyChangedListener
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
if (isset($visited[$oid])) { if (isset($visited[$oid])) {
return; // Prevent infinite recursion return $visited[$oid]; // Prevent infinite recursion
} }
$visited[$oid] = $entity; // mark visited $visited[$oid] = $entity; // mark visited
@ -2356,11 +2356,12 @@ class UnitOfWork implements PropertyChangedListener
} }
} else { } else {
$entity = $this->newInstance($class); $entity = $this->newInstance($class);
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
$this->entityIdentifiers[$oid] = $id; $this->entityIdentifiers[$oid] = $id;
$this->entityStates[$oid] = self::STATE_MANAGED; $this->entityStates[$oid] = self::STATE_MANAGED;
$this->originalEntityData[$oid] = $data; $this->originalEntityData[$oid] = $data;
$this->identityMap[$class->rootEntityName][$idHash] = $entity; $this->identityMap[$class->rootEntityName][$idHash] = $entity;
if ($entity instanceof NotifyPropertyChanged) { if ($entity instanceof NotifyPropertyChanged) {
@ -2790,6 +2791,10 @@ class UnitOfWork implements PropertyChangedListener
$this->originalEntityData[$oid] = $data; $this->originalEntityData[$oid] = $data;
$this->addToIdentityMap($entity); $this->addToIdentityMap($entity);
if ($entity instanceof NotifyPropertyChanged) {
$entity->addPropertyChangedListener($this);
}
} }
/** /**

46
vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Composer/ScriptHandler.php vendored
View File

@ -70,6 +70,27 @@ class ScriptHandler
static::executeCommand($event, $appDir, 'assets:install '.$symlink.escapeshellarg($webDir)); static::executeCommand($event, $appDir, 'assets:install '.$symlink.escapeshellarg($webDir));
} }
public static function installRequirementsFile($event)
{
$options = self::getOptions($event);
$appDir = $options['symfony-app-dir'];
if (!is_dir($appDir)) {
echo 'The symfony-app-dir ('.$appDir.') specified in composer.json was not found in '.getcwd().', can not install the requirements file.'.PHP_EOL;
return;
}
copy(__DIR__.'/../Resources/skeleton/app/SymfonyRequirements.php', $appDir.'/SymfonyRequirements.php');
copy(__DIR__.'/../Resources/skeleton/app/check.php', $appDir.'/check.php');
$webDir = $options['symfony-web-dir'];
if (is_file($webDir.'/config.php')) {
copy(__DIR__.'/../Resources/skeleton/web/config.php', $webDir.'/config.php');
}
}
public static function doBuildBootstrap($appDir) public static function doBuildBootstrap($appDir)
{ {
$file = $appDir.'/bootstrap.php.cache'; $file = $appDir.'/bootstrap.php.cache';
@ -81,16 +102,13 @@ class ScriptHandler
'Symfony\\Component\\DependencyInjection\\ContainerAwareInterface', 'Symfony\\Component\\DependencyInjection\\ContainerAwareInterface',
// Cannot be included because annotations will parse the big compiled class file // Cannot be included because annotations will parse the big compiled class file
//'Symfony\\Component\\DependencyInjection\\ContainerAware', //'Symfony\\Component\\DependencyInjection\\ContainerAware',
'Symfony\\Component\\DependencyInjection\\ContainerInterface',
'Symfony\\Component\\DependencyInjection\\Container', 'Symfony\\Component\\DependencyInjection\\Container',
'Symfony\\Component\\HttpKernel\\HttpKernelInterface',
'Symfony\\Component\\HttpKernel\\KernelInterface',
'Symfony\\Component\\HttpKernel\\Kernel', 'Symfony\\Component\\HttpKernel\\Kernel',
'Symfony\\Component\\ClassLoader\\ClassCollectionLoader', 'Symfony\\Component\\ClassLoader\\ClassCollectionLoader',
'Symfony\\Component\\ClassLoader\\ApcClassLoader', 'Symfony\\Component\\ClassLoader\\ApcClassLoader',
'Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface',
'Symfony\\Component\\HttpKernel\\Bundle\\Bundle', 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle',
'Symfony\\Component\\Config\\ConfigCache', 'Symfony\\Component\\Config\\ConfigCache',
'Symfony\\Bundle\\FrameworkBundle\\HttpKernel',
// cannot be included as commands are discovered based on the path to this class via Reflection // cannot be included as commands are discovered based on the path to this class via Reflection
//'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle', //'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle',
), dirname($file), basename($file, '.php.cache'), false, false, '.php.cache'); ), dirname($file), basename($file, '.php.cache'), false, false, '.php.cache');
@ -107,25 +125,23 @@ namespace { return \$loader; }
protected static function executeCommand($event, $appDir, $cmd) protected static function executeCommand($event, $appDir, $cmd)
{ {
$phpFinder = new PhpExecutableFinder; $php = escapeshellarg(self::getPhp());
$php = escapeshellarg($phpFinder->find());
$console = escapeshellarg($appDir.'/console'); $console = escapeshellarg($appDir.'/console');
if ($event->getIO()->isDecorated()) { if ($event->getIO()->isDecorated()) {
$console.= ' --ansi'; $console.= ' --ansi';
} }
$process = new Process($php.' '.$console.' '.$cmd); $process = new Process($php.' '.$console.' '.$cmd, null, null, null, 300);
$process->run(function ($type, $buffer) { echo $buffer; }); $process->run(function ($type, $buffer) { echo $buffer; });
} }
protected static function executeBuildBootstrap($appDir) protected static function executeBuildBootstrap($appDir)
{ {
$phpFinder = new PhpExecutableFinder; $php = escapeshellarg(self::getPhp());
$php = escapeshellarg($phpFinder->find());
$cmd = escapeshellarg(__DIR__.'/../Resources/bin/build_bootstrap.php'); $cmd = escapeshellarg(__DIR__.'/../Resources/bin/build_bootstrap.php');
$appDir = escapeshellarg($appDir); $appDir = escapeshellarg($appDir);
$process = new Process($php.' '.$cmd.' '.$appDir); $process = new Process($php.' '.$cmd.' '.$appDir, null, null, null, 300);
$process->run(function ($type, $buffer) { echo $buffer; }); $process->run(function ($type, $buffer) { echo $buffer; });
} }
@ -141,4 +157,14 @@ namespace { return \$loader; }
return $options; return $options;
} }
protected static function getPhp()
{
$phpFinder = new PhpExecutableFinder;
if (!$phpPath = $phpFinder->find()) {
throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again');
}
return $phpPath;
}
} }

91
vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Diff/Diff.php vendored Normal file
View File

@ -0,0 +1,91 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Sensio\Bundle\DistributionBundle\Diff;
/**
* Computes a Diff between files (line by line).
*
* Implements the Longest common subsequence problem algorithm.
*
* @see http://en.wikipedia.org/wiki/Longest_common_subsequence_problem
*
* @author Fabien Potencier <fabien@symfony.com>
*/
class Diff
{
private $diff;
public function __construct($str1, $str2)
{
$lines1 = explode("\n", $str1);
$lines2 = explode("\n", $str2);
$this->diff = $this->computeDiff($this->computeLcs($lines1, $lines2), $lines1, $lines2, count($lines1) - 1, count($lines2) - 1);
}
public function getDiff()
{
$diff = array();
for ($i = 0, $max = count($this->diff); $i < $max; $i++) {
if ('' != $this->diff[$i][0]) {
$diff[] = array('@', sprintf(' Line %s', $this->diff[$i][2]));
do {
$diff[] = $this->diff[$i++];
} while ('' != $this->diff[$i][0]);
}
}
return $diff;
}
public function computeDiff(array $c, array $lines1, array $lines2, $i, $j)
{
$diff = array();
if ($i > -1 && $j > -1 && $lines1[$i] == $lines2[$j]) {
$diff = array_merge($diff, $this->computeDiff($c, $lines1, $lines2, $i - 1, $j - 1));
$diff[] = array('', $lines1[$i], $i, $j);
} else {
if ($j > -1 && ($i == -1 || $c[$i][$j - 1] >= $c[$i - 1][$j])) {
$diff = array_merge($diff, $this->computeDiff($c, $lines1, $lines2, $i, $j - 1));
$diff[] = array('+', $lines2[$j], $i, $j);
} elseif ($i > -1 && ($j == -1 || $c[$i][$j - 1] < $c[$i - 1][$j])) {
$diff = array_merge($diff, $this->computeDiff($c, $lines1, $lines2, $i - 1, $j));
$diff[] = array('-', $lines1[$i], $i, $j);
}
}
return $diff;
}
private function computeLcs(array $lines1, array $lines2)
{
for ($i = -1, $len1 = count($lines1); $i < $len1; $i++) {
for ($j = -1, $len2 = count($lines2); $j < $len2; $j++) {
$c[$i][$j] = 0;
}
}
for ($i = 0; $i < $len1; $i++) {
for ($j = 0; $j < $len2; $j++) {
if ($lines1[$i] == $lines2[$j]) {
$c[$i][$j] = $c[$i - 1][$j - 1] + 1;
} else {
$c[$i][$j] = max($c[$i][$j - 1], $c[$i - 1][$j]);
}
}
}
return $c;
}
}

2
vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php vendored
View File

@ -16,7 +16,7 @@ $argv = $_SERVER['argv'];
if (isset($argv[1])) { if (isset($argv[1])) {
$appDir = $argv[1]; $appDir = $argv[1];
} else { } else {
if (!$appDir = realpath(__DIR__.'/../../../../../../../app')) { if (!$appDir = realpath(__DIR__.'/../../../../../../../../app')) {
exit('Looks like you don\'t have a standard layout.'); exit('Looks like you don\'t have a standard layout.');
} }
} }

13
vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/public/webconfigurator/css/install.css vendored
View File

@ -56,7 +56,6 @@ h2 {
padding: 2px 4px; padding: 2px 4px;
display: inline-block; display: inline-block;
text-transform: uppercase; text-transform: uppercase;
} }
p { p {
@ -135,3 +134,15 @@ ul li {
font-size: 10px; font-size: 10px;
margin-right: 20px; margin-right: 20px;
} }
.ok {
color: #fff;
font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
background-color: #6d6;
padding: 10px;
margin-bottom: 20px;
}
.ko {
background-color: #d66;
}

597
vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php vendored Normal file
View File

@ -0,0 +1,597 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/**
* Represents a single PHP requirement, e.g. an installed extension.
* It can be a mandatory requirement or an optional recommendation.
* There is a special subclass, named PhpIniRequirement, to check a php.ini configuration.
*
* This file must be compatible with PHP 5.2+.
*
* ************** CAUTION **************
*
* DO NOT EDIT THIS FILE AS IT WILL BE OVERRIDEN BY COMPOSER
*
* If you want to change this file, edit the one in the
* SensioDistributionBundle instead.
*
* ************** CAUTION **************
*
* @author Tobias Schultze <http://tobion.de>
*/
class Requirement
{
private $fulfilled;
private $testMessage;
private $helpText;
private $helpHtml;
private $optional;
/**
* Constructor that initializes the requirement.
*
* @param Boolean $fulfilled Whether the requirement is fulfilled
* @param string $testMessage The message for testing the requirement
* @param string $helpHtml The help text formatted in HTML for resolving the problem
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
* @param Boolean $optional Whether this is only an optional recommendation not a mandatory requirement
*/
public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false)
{
$this->fulfilled = (Boolean) $fulfilled;
$this->testMessage = (string) $testMessage;
$this->helpHtml = (string) $helpHtml;
$this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText;
$this->optional = (Boolean) $optional;
}
/**
* Returns whether the requirement is fulfilled.
*
* @return Boolean true if fulfilled, otherwise false
*/
public function isFulfilled()
{
return $this->fulfilled;
}
/**
* Returns the message for testing the requirement.
*
* @return string The test message
*/
public function getTestMessage()
{
return $this->testMessage;
}
/**
* Returns the help text for resolving the problem
*
* @return string The help text
*/
public function getHelpText()
{
return $this->helpText;
}
/**
* Returns the help text formatted in HTML.
*
* @return string The HTML help
*/
public function getHelpHtml()
{
return $this->helpHtml;
}
/**
* Returns whether this is only an optional recommendation and not a mandatory requirement.
*
* @return Boolean true if optional, false if mandatory
*/
public function isOptional()
{
return $this->optional;
}
}
/**
* Represents a PHP requirement in form of a php.ini configuration.
*
* @author Tobias Schultze <http://tobion.de>
*/
class PhpIniRequirement extends Requirement
{
/**
* Constructor that initializes the requirement.
*
* @param string $cfgName The configuration name used for ini_get()
* @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
* @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
* @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
* @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
* @param Boolean $optional Whether this is only an optional recommendation not a mandatory requirement
*/
public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false)
{
$cfgValue = ini_get($cfgName);
if (is_callable($evaluation)) {
if (null === $testMessage || null === $helpHtml) {
throw new InvalidArgumentException('You must provide the parameters testMessage and helpHtml for a callback evaluation.');
}
$fulfilled = call_user_func($evaluation, $cfgValue);
} else {
if (null === $testMessage) {
$testMessage = sprintf('%s %s be %s in php.ini',
$cfgName,
$optional ? 'should' : 'must',
$evaluation ? 'enabled' : 'disabled'
);
}
if (null === $helpHtml) {
$helpHtml = sprintf('Set <strong>%s</strong> to <strong>%s</strong> in php.ini<a href="#phpini">*</a>.',
$cfgName,
$evaluation ? 'on' : 'off'
);
}
$fulfilled = $evaluation == $cfgValue;
}
parent::__construct($fulfilled || ($approveCfgAbsence && false === $cfgValue), $testMessage, $helpHtml, $helpText, $optional);
}
}
/**
* A RequirementCollection represents a set of Requirement instances.
*
* Users of PHP 5.2 should be able to run the requirements checks.
* This is why the class must be compatible with PHP 5.2
* (e.g. not using namespaces and closures).
*
* @author Tobias Schultze <http://tobion.de>
*/
class RequirementCollection implements IteratorAggregate
{
private $requirements = array();
/**
* Gets the current RequirementCollection as an Iterator.
*
* @return Traversable A Traversable interface
*/
public function getIterator()
{
return new ArrayIterator($this->requirements);
}
/**
* Adds a Requirement.
*
* @param Requirement $requirement A Requirement instance
*/
public function add(Requirement $requirement)
{
$this->requirements[] = $requirement;
}
/**
* Adds a mandatory requirement.
*
* @param Boolean $fulfilled Whether the requirement is fulfilled
* @param string $testMessage The message for testing the requirement
* @param string $helpHtml The help text formatted in HTML for resolving the problem
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
*/
public function addRequirement($fulfilled, $testMessage, $helpHtml, $helpText = null)
{
$this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, false));
}
/**
* Adds an optional recommendation.
*
* @param Boolean $fulfilled Whether the recommendation is fulfilled
* @param string $testMessage The message for testing the recommendation
* @param string $helpHtml The help text formatted in HTML for resolving the problem
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
*/
public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText = null)
{
$this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, true));
}
/**
* Adds a mandatory requirement in form of a php.ini configuration.
*
* @param string $cfgName The configuration name used for ini_get()
* @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
* @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
* @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
* @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
*/
public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
{
$this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, false));
}
/**
* Adds an optional recommendation in form of a php.ini configuration.
*
* @param string $cfgName The configuration name used for ini_get()
* @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
* @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
* @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
* @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
*/
public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
{
$this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, true));
}
/**
* Adds a requirement collection to the current set of requirements.
*
* @param RequirementCollection $collection A RequirementCollection instance
*/
public function addCollection(RequirementCollection $collection)
{
$this->requirements = array_merge($this->requirements, $collection->all());
}
/**
* Returns both requirements and recommendations.
*
* @return array Array of Requirement instances
*/
public function all()
{
return $this->requirements;
}
/**
* Returns all mandatory requirements.
*
* @return array Array of Requirement instances
*/
public function getRequirements()
{
$array = array();
foreach ($this->requirements as $req) {
if (!$req->isOptional()) {
$array[] = $req;
}
}
return $array;
}
/**
* Returns the mandatory requirements that were not met.
*
* @return array Array of Requirement instances
*/
public function getFailedRequirements()
{
$array = array();
foreach ($this->requirements as $req) {
if (!$req->isFulfilled() && !$req->isOptional()) {
$array[] = $req;
}
}
return $array;
}
/**
* Returns all optional recommmendations.
*
* @return array Array of Requirement instances
*/
public function getRecommendations()
{
$array = array();
foreach ($this->requirements as $req) {
if ($req->isOptional()) {
$array[] = $req;
}
}
return $array;
}
/**
* Returns the recommendations that were not met.
*
* @return array Array of Requirement instances
*/
public function getFailedRecommendations()
{
$array = array();
foreach ($this->requirements as $req) {
if (!$req->isFulfilled() && $req->isOptional()) {
$array[] = $req;
}
}
return $array;
}
/**
* Returns whether a php.ini configuration is not correct.
*
* @return Boolean php.ini configuration problem?
*/
public function hasPhpIniConfigIssue()
{
foreach ($this->requirements as $req) {
if (!$req->isFulfilled() && $req instanceof PhpIniRequirement) {
return true;
}
}
return false;
}
/**
* Returns the PHP configuration file (php.ini) path.
*
* @return string|false php.ini file path
*/
public function getPhpIniConfigPath()
{
return get_cfg_var('cfg_file_path');
}
}
/**
* This class specifies all requirements and optional recommendations that
* are necessary to run the Symfony Standard Edition.
*
* @author Tobias Schultze <http://tobion.de>
*/
class SymfonyRequirements extends RequirementCollection
{
const REQUIRED_PHP_VERSION = '5.3.3';
/**
* Constructor that initializes the requirements.
*/
public function __construct()
{
/* mandatory requirements follow */
$installedPhpVersion = phpversion();
$this->addRequirement(
version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>='),
sprintf('PHP version must be at least %s (%s installed)', self::REQUIRED_PHP_VERSION, $installedPhpVersion),
sprintf('You are running PHP version "<strong>%s</strong>", but Symfony needs at least PHP "<strong>%s</strong>" to run.
Before using Symfony, upgrade your PHP installation, preferably to the latest version.',
$installedPhpVersion, self::REQUIRED_PHP_VERSION),
sprintf('Install PHP %s or newer (installed version is %s)', self::REQUIRED_PHP_VERSION, $installedPhpVersion)
);
$this->addRequirement(
is_dir(__DIR__.'/../vendor/composer'),
'Vendor libraries must be installed',
'Vendor libraries are missing. Install composer following instructions from <a href="http://getcomposer.org/">http://getcomposer.org/</a>. ' .
'Then run "<strong>php composer.phar install</strong>" to install them.'
);
$this->addRequirement(
file_get_contents(__FILE__) == file_get_contents(__DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php'),
'Outdated requirements file',
'Your requirements file is outdated. Run composer install and re-check your configuration.'
);
$baseDir = basename(__DIR__);
$this->addRequirement(
is_writable(__DIR__.'/cache'),
"$baseDir/cache/ directory must be writable",
"Change the permissions of the \"<strong>$baseDir/cache/</strong>\" directory so that the web server can write into it."
);
$this->addRequirement(
is_writable(__DIR__.'/logs'),
"$baseDir/logs/ directory must be writable",
"Change the permissions of the \"<strong>$baseDir/logs/</strong>\" directory so that the web server can write into it."
);
$this->addPhpIniRequirement(
'date.timezone', true, false,
'date.timezone setting must be set',
'Set the "<strong>date.timezone</strong>" setting in php.ini<a href="#phpini">*</a> (like Europe/Paris).'
);
if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
$this->addRequirement(
(in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())),
sprintf('Default timezone is deprecated (%s)', date_default_timezone_get()),
'Fix your <strong>php.ini</strong> file (list of deprecated timezones http://us.php.net/manual/en/timezones.others.php).'
);
}
$this->addRequirement(
function_exists('json_encode'),
'json_encode() must be available',
'Install and enable the <strong>JSON</strong> extension.'
);
$this->addRequirement(
function_exists('session_start'),
'session_start() must be available',
'Install and enable the <strong>session</strong> extension.'
);
$this->addRequirement(
function_exists('ctype_alpha'),
'ctype_alpha() must be available',
'Install and enable the <strong>ctype</strong> extension.'
);
$this->addRequirement(
function_exists('token_get_all'),
'token_get_all() must be available',
'Install and enable the <strong>Tokenizer</strong> extension.'
);
$this->addRequirement(
function_exists('simplexml_import_dom'),
'simplexml_import_dom() must be available',
'Install and enable the <strong>SimpleXML</strong> extension.'
);
$this->addRequirement(
!(function_exists('apc_store') && ini_get('apc.enabled')) || version_compare(phpversion('apc'), '3.0.17', '>='),
'APC version must be at least 3.0.17',
'Upgrade your <strong>APC</strong> extension (3.0.17+)'
);
$this->addPhpIniRequirement('detect_unicode', false);
$this->addPhpIniRequirement(
'suhosin.executor.include.whitelist',
create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'),
true,
'suhosin.executor.include.whitelist must be configured correctly in php.ini',
'Add "<strong>phar</strong>" to <strong>suhosin.executor.include.whitelist</strong> in php.ini<a href="#phpini">*</a>.'
);
$pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null;
$this->addRequirement(
null !== $pcreVersion && $pcreVersion > 8.0,
sprintf('PCRE extension must be available and at least 8.0 (%s installed)', $pcreVersion ? $pcreVersion : 'not'),
'Upgrade your <strong>PCRE</strong> extension (8.0+)'
);
/* optional recommendations follow */
$this->addRecommendation(
version_compare($installedPhpVersion, '5.3.8', '>='),
sprintf('Annotations might not work properly due to the PHP bug #55156 before PHP 5.3.8 (%s installed)', $installedPhpVersion),
'Install PHP 5.3.8 or newer if your project uses annotations'
);
$this->addRecommendation(
class_exists('DomDocument'),
'PHP-XML module should be installed',
'Install and enable the <strong>PHP-XML</strong> module.'
);
$this->addRecommendation(
function_exists('mb_strlen'),
'mb_strlen() should be available',
'Install and enable the <strong>mbstring</strong> extension.'
);
$this->addRecommendation(
function_exists('iconv'),
'iconv() should be available',
'Install and enable the <strong>iconv</strong> extension.'
);
$this->addRecommendation(
function_exists('utf8_decode'),
'utf8_decode() should be available',
'Install and enable the <strong>XML</strong> extension.'
);
if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
$this->addRecommendation(
function_exists('posix_isatty'),
'posix_isatty() should be available',
'Install and enable the <strong>php_posix</strong> extension (used to colorize the CLI output).'
);
}
$this->addRecommendation(
class_exists('Locale'),
'intl extension should be available',
'Install and enable the <strong>intl</strong> extension (used for validators).'
);
if (class_exists('Locale')) {
if (defined('INTL_ICU_VERSION')) {
$version = INTL_ICU_VERSION;
} else {
$reflector = new ReflectionExtension('intl');
ob_start();
$reflector->info();
$output = strip_tags(ob_get_clean());
preg_match('/^ICU version +(?:=> )?(.*)$/m', $output, $matches);
$version = $matches[1];
}
$this->addRecommendation(
version_compare($version, '4.0', '>='),
'intl ICU version should be at least 4+',
'Upgrade your <strong>intl</strong> extension with a newer ICU version (4+).'
);
}
$accelerator =
(function_exists('apc_store') && ini_get('apc.enabled'))
||
function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
||
function_exists('xcache_set')
;
$this->addRecommendation(
$accelerator,
'a PHP accelerator should be installed',
'Install and enable a <strong>PHP accelerator</strong> like APC (highly recommended).'
);
$this->addPhpIniRecommendation('short_open_tag', false);
$this->addPhpIniRecommendation('magic_quotes_gpc', false, true);
$this->addPhpIniRecommendation('register_globals', false, true);
$this->addPhpIniRecommendation('session.auto_start', false);
$this->addRecommendation(
class_exists('PDO'),
'PDO should be installed',
'Install <strong>PDO</strong> (mandatory for Doctrine).'
);
if (class_exists('PDO')) {
$drivers = PDO::getAvailableDrivers();
$this->addRecommendation(
count($drivers),
sprintf('PDO should have some drivers installed (currently available: %s)', count($drivers) ? implode(', ', $drivers) : 'none'),
'Install <strong>PDO drivers</strong> (mandatory for Doctrine).'
);
}
}
}

55
vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/check.php vendored Normal file
View File

@ -0,0 +1,55 @@
<?php
require_once dirname(__FILE__).'/SymfonyRequirements.php';
$symfonyRequirements = new SymfonyRequirements();
$iniPath = $symfonyRequirements->getPhpIniConfigPath();
echo "********************************\n";
echo "* *\n";
echo "* Symfony requirements check *\n";
echo "* *\n";
echo "********************************\n\n";
echo $iniPath ? sprintf("* Configuration file used by PHP: %s\n\n", $iniPath) : "* WARNING: No configuration file (php.ini) used by PHP!\n\n";
echo "** ATTENTION **\n";
echo "* The PHP CLI can use a different php.ini file\n";
echo "* than the one used with your web server.\n";
if ('\\' == DIRECTORY_SEPARATOR) {
echo "* (especially on the Windows platform)\n";
}
echo "* To be on the safe side, please also launch the requirements check\n";
echo "* from your web server using the web/config.php script.\n";
echo_title('Mandatory requirements');
foreach ($symfonyRequirements->getRequirements() as $req) {
echo_requirement($req);
}
echo_title('Optional recommendations');
foreach ($symfonyRequirements->getRecommendations() as $req) {
echo_requirement($req);
}
/**
* Prints a Requirement instance
*/
function echo_requirement(Requirement $requirement)
{
$result = $requirement->isFulfilled() ? 'OK' : ($requirement->isOptional() ? 'WARNING' : 'ERROR');
echo ' ' . str_pad($result, 9);
echo $requirement->getTestMessage() . "\n";
if (!$requirement->isFulfilled()) {
echo sprintf(" %s\n\n", $requirement->getHelpText());
}
}
function echo_title($title)
{
echo "\n** $title **\n\n";
}

98
vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/web/config.php vendored Normal file
View File

@ -0,0 +1,98 @@
<?php
if (!isset($_SERVER['HTTP_HOST'])) {
exit('This script cannot be run from the CLI. Run it from a browser.');
}
if (!in_array(@$_SERVER['REMOTE_ADDR'], array(
'127.0.0.1',
'::1',
))) {
header('HTTP/1.0 403 Forbidden');
exit('This script is only accessible from localhost.');
}
require_once dirname(__FILE__).'/../app/SymfonyRequirements.php';
$symfonyRequirements = new SymfonyRequirements();
$majorProblems = $symfonyRequirements->getFailedRequirements();
$minorProblems = $symfonyRequirements->getFailedRecommendations();
?>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="stylesheet" href="bundles/sensiodistribution/webconfigurator/css/install.css" media="all" />
<title>Symfony Configuration</title>
</head>
<body>
<div id="symfony-wrapper">
<div id="symfony-content">
<div class="symfony-blocks-install">
<div class="symfony-block-logo">
<img src="bundles/sensiodistribution/webconfigurator/images/logo-big.gif" alt="Symfony logo" />
</div>
<div class="symfony-block-content">
<h1>Welcome!</h1>
<p>Welcome to your new Symfony project.</p>
<p>
This script will guide you through the basic configuration of your project.
You can also do the same by editing the ‘<strong>app/config/parameters.yml</strong>’ file directly.
</p>
<?php if (count($majorProblems)): ?>
<h2 class="ko">Major problems</h2>
<p>Major problems have been detected and <strong>must</strong> be fixed before continuing:</p>
<ol>
<?php foreach ($majorProblems as $problem): ?>
<li><?php echo $problem->getHelpHtml() ?></li>
<?php endforeach; ?>
</ol>
<?php endif; ?>
<?php if (count($minorProblems)): ?>
<h2>Recommendations</h2>
<p>
<?php if (count($majorProblems)): ?>Additionally, to<?php else: ?>To<?php endif; ?> enhance your Symfony experience,
it’s recommended that you fix the following:
</p>
<ol>
<?php foreach ($minorProblems as $problem): ?>
<li><?php echo $problem->getHelpHtml() ?></li>
<?php endforeach; ?>
</ol>
<?php endif; ?>
<?php if ($symfonyRequirements->hasPhpIniConfigIssue()): ?>
<p id="phpini">*
<?php if ($symfonyRequirements->getPhpIniConfigPath()): ?>
Changes to the <strong>php.ini</strong> file must be done in "<strong><?php echo $symfonyRequirements->getPhpIniConfigPath() ?></strong>".
<?php else: ?>
To change settings, create a "<strong>php.ini</strong>".
<?php endif; ?>
</p>
<?php endif; ?>
<?php if (!count($majorProblems) && !count($minorProblems)): ?>
<p class="ok">Your configuration looks good to run Symfony.</p>
<?php endif; ?>
<ul class="symfony-install-continue">
<?php if (!count($majorProblems)): ?>
<li><a href="app_dev.php/_configurator/">Configure your Symfony Application online</a></li>
<li><a href="app_dev.php/">Bypass configuration and go to the Welcome page</a></li>
<?php endif; ?>
<?php if (count($majorProblems) || count($minorProblems)): ?>
<li><a href="config.php">Re-check configuration</a></li>
<?php endif; ?>
</ul>
</div>
</div>
</div>
<div class="version">Symfony Standard Edition</div>
</div>
</body>
</html>

13
vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/views/Configurator/form.html.twig vendored
View File

@ -1,15 +1,15 @@
{% extends "form_div_layout.html.twig" %} {% extends "form_div_layout.html.twig" %}
{% block field_rows %} {% block form_rows %}
<div class="symfony-form-errors"> <div class="symfony-form-errors">
{{ form_errors(form) }} {{ form_errors(form) }}
</div> </div>
{% for child in form.children %} {% for child in form %}
{{ form_row(child) }} {{ form_row(child) }}
{% endfor %} {% endfor %}
{% endblock field_rows %} {% endblock %}
{% block field_row %} {% block form_row %}
<div class="symfony-form-row"> <div class="symfony-form-row">
{{ form_label(form) }} {{ form_label(form) }}
<div class="symfony-form-field"> <div class="symfony-form-field">
@ -21,7 +21,10 @@
</div> </div>
{% endblock %} {% endblock %}
{% block field_label %} {% block form_label %}
{% if label is empty %}
{% set label = name|humanize %}
{% endif %}
<label for="{{ id }}"> <label for="{{ id }}">
{{ label|trans }} {{ label|trans }}
{% if required %} {% if required %}

59
vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Upgrader/Upgrader.php vendored Normal file
View File

@ -0,0 +1,59 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Sensio\Bundle\DistributionBundle\Upgrade;
use Sensio\Bundle\DistributionBundle\Diff\Diff;
use Symfony\Component\Console\Output\OutputInterface;
/**
* Upgrade class.
*
* @author Fabien Potencier <fabien@symfony.com>
*/
class Upgrade
{
public function outputConsoleDiff(OutputInterface $output, $file1, $file2)
{
if (is_file($file1)) {
$file1 = realpath($file1);
$str1 = file_get_contents($file1);
} else {
$str1 = '';
}
if (!is_file($file2)) {
throw new \RuntimeException(sprintf('The skeleton file "%s" does not exist.', $file2));
}
$file2 = realpath($file2);
$str2 = file_get_contents($file2);
$diff = new Diff($str1, $str2);
$output->writeln(sprintf('--- %s', $file1));
$output->writeln(sprintf('+++ %s', $file2));
foreach ($diff->getDiff() as $line) {
if ('+' == $line[0]) {
$format = '<fg=green>+%s</>';
} elseif ('-' == $line[0]) {
$format = '<fg=red>-%s</>';
} elseif ('@' == $line[0]) {
$format = '<fg=cyan>@%s</>';
} else {
$format = ' %s';
}
$output->writeln(sprintf($format, $line[1]));
}
$output->writeln('');
}
}

10
vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/Configuration.php vendored
View File

@ -3,20 +3,22 @@
namespace Sensio\Bundle\FrameworkExtraBundle\DependencyInjection; namespace Sensio\Bundle\FrameworkExtraBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
use Symfony\Component\Config\Definition\NodeInterface;
/** /**
* FrameworkExtraBundle configuration structure. * FrameworkExtraBundle configuration structure.
* *
* @author Henrik Bjornskov <hb@peytz.dk> * @author Henrik Bjornskov <hb@peytz.dk>
*/ */
class Configuration class Configuration implements ConfigurationInterface
{ {
/** /**
* Generates the configuration tree. * Generates the configuration tree.
* *
* @return Symfony\Component\Config\Definition\NodeInterface * @return NodeInterface
*/ */
public function getConfigTree() public function getConfigTreeBuilder()
{ {
$treeBuilder = new TreeBuilder(); $treeBuilder = new TreeBuilder();
$rootNode = $treeBuilder->root('sensio_framework_extra', 'array'); $rootNode = $treeBuilder->root('sensio_framework_extra', 'array');
@ -50,6 +52,6 @@ class Configuration
->end() ->end()
; ;
return $treeBuilder->buildTree(); return $treeBuilder;
} }
} }

12
vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/SensioFrameworkExtraExtension.php vendored
View File

@ -7,7 +7,6 @@ use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\Config\FileLocator; use Symfony\Component\Config\FileLocator;
use Symfony\Component\Config\Definition\Processor;
/* /*
* This file is part of the Symfony framework. * This file is part of the Symfony framework.
@ -21,19 +20,16 @@ use Symfony\Component\Config\Definition\Processor;
/** /**
* SensioFrameworkExtraExtension. * SensioFrameworkExtraExtension.
* *
* @author Fabien Potencier <fabien@symfony.com> * @author Fabien Potencier <fabien@symfony.com>
*/ */
class SensioFrameworkExtraExtension extends Extension class SensioFrameworkExtraExtension extends Extension
{ {
public function load(array $configs, ContainerBuilder $container) public function load(array $configs, ContainerBuilder $container)
{ {
$configuration = $this->getConfiguration($configs, $container);
$config = $this->processConfiguration($configuration, $configs);
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$processor = new Processor();
$configuration = new Configuration();
$config = $processor->process($configuration->getConfigTree(), $configs);
$loader->load('services.xml'); $loader->load('services.xml');
$annotationsToLoad = array(); $annotationsToLoad = array();

5
vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DoctrineParamConverter.php vendored
View File

@ -57,11 +57,12 @@ class DoctrineParamConverter implements ParamConverterInterface
protected function find($class, Request $request, $options) protected function find($class, Request $request, $options)
{ {
if (!$request->attributes->has('id')) { $key = isset($options['id']) ? $options['id'] : 'id';
if (!$request->attributes->has($key)) {
return false; return false;
} }
return $this->registry->getRepository($class, $options['entity_manager'])->find($request->attributes->get('id')); return $this->registry->getRepository($class, $options['entity_manager'])->find($request->attributes->get($key));
} }
protected function findOneBy($class, Request $request, $options) protected function findOneBy($class, Request $request, $options)

11
vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/converters.rst vendored
View File

@ -63,6 +63,17 @@ be configured with the ``entity_manager`` option::
{ {
} }
If the placeholder has not the same name as the primary key, pass the ``id``
option::
/**
* @Route("/blog/{post_id}")
* @ParamConverter("post", class="SensioBlogBundle:Post", options={"id" = "post_id"})
*/
public function showAction(Post $post)
{
}
Creating a Converter Creating a Converter
-------------------- --------------------

2
vendor/swiftmailer/swiftmailer/VERSION vendored
View File

@ -1 +1 @@
Swift-4.1.9 Swift-4.2.1

2
vendor/swiftmailer/swiftmailer/composer.json vendored
View File

@ -23,7 +23,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
} }
} }

2
vendor/swiftmailer/swiftmailer/doc/headers.rst vendored
View File

@ -455,7 +455,7 @@ ID headers contain identifiers for the entity (or the message). The most
notable ID header is the Message-ID header on the message itself. notable ID header is the Message-ID header on the message itself.
An ID that exists inside an ID header looks more-or-less less like an email An ID that exists inside an ID header looks more-or-less less like an email
address. For example, ``<![CDATA[<1234955437.499becad62ec2@example.org>]]>``. address. For example, ``<1234955437.499becad62ec2@example.org>``.
The part to the left of the @ sign is usually unique, based on the current time The part to the left of the @ sign is usually unique, based on the current time
and some random factor. The part on the right is usually a domain name. and some random factor. The part on the right is usually a domain name.

44
vendor/swiftmailer/swiftmailer/doc/including-the-files.rst vendored
View File

@ -1,18 +1,34 @@
Including Swift Mailer (Autoloading) Including Swift Mailer (Autoloading)
==================================== ====================================
Swift Mailer uses an autoloader so the only file you need to include is the If you are using Composer, Swift Mailer will be automatically autoloaded.
``lib/swift_required.php`` file.
To use Swift Mailer's autoloader: If not, you can use the built-in autoloader by requiring the
``swift_required.php`` file::
* Put Swift Mailer somewhere accessible to your PHP scripts (this does not require_once '/path/to/swift-mailer/lib/swift_required.php';
need to be in the web root).
* Include, or require the ``lib/swift_required.php`` file. /* rest of code goes here */
* Follow the remainder of the documentation for using the available If you want to override the default Swift Mailer configuration, call the
components. ``init()`` method on the ``Swift`` class and pass it a valid PHP callable (a
PHP function name, a PHP 5.3 anonymous function, ...)::
require_once '/path/to/swift-mailer/lib/swift_required.php';
function swiftmailer_configurator() {
// configure Swift Mailer
Swift_DependencyContainer::getInstance()->...
Swift_Preferences::getInstance()->...
}
Swift::init('swiftmailer_configurator');
/* rest of code goes here */
The advantage of using the ``init()`` method is that your code will be
executed only if you use Swift Mailer in your script.
.. note:: .. note::
@ -25,6 +41,16 @@ To use Swift Mailer's autoloader:
.. code-block:: php .. code-block:: php
require_once '/path/to/swift-mailer/lib/swift_required.php'; require_once '/path/to/swift-mailer/lib/swift_init.php';
/* rest of code goes here */ /* rest of code goes here */
For PHP versions starting with 5.3 it is recommended using the native quoted
printable encoder. It uses PHP’s native ``quoted_printable_encode()``-function
to achieve much better performance::
Swift::init(function () {
Swift_DependencyContainer::getInstance()
->register('mime.qpcontentencoder')
->asAliasOf('mime.nativeqpcontentencoder');
});

1
vendor/swiftmailer/swiftmailer/doc/index.rst vendored
View File

@ -13,3 +13,4 @@ Swiftmailer
headers headers
sending sending
plugins plugins
japanese

22
vendor/swiftmailer/swiftmailer/doc/japanese.rst vendored Normal file
View File

@ -0,0 +1,22 @@
Using Swift Mailer for Japanese Emails
======================================
To send emails in Japanese, you need to tweak the default configuration.
After requiring the Swift Mailer autoloader (by including the
``swift_required.php`` file), call the ``Swift::init()`` method with the
following code::
require_once '/path/to/swift-mailer/lib/swift_required.php';
Swift::init(function () {
Swift_DependencyContainer::getInstance()
->register('mime.qpheaderencoder')
->asAliasOf('mime.base64headerencoder');
Swift_Preferences::getInstance()->setCharset('iso-2022-jp');
});
/* rest of code goes here */
That's all!

6
vendor/swiftmailer/swiftmailer/doc/messages.rst vendored
View File

@ -134,7 +134,7 @@ need to make use of a small subset of them. Usually you'll use
``setBody()``. ``setBody()``.
Calling methods is simple. You just call them like functions, but using the Calling methods is simple. You just call them like functions, but using the
object operator "``<![CDATA[->]]>``" to do so. If you've created object operator "``->``" to do so. If you've created
a message object and called it ``$message`` then you'd set a a message object and called it ``$message`` then you'd set a
subject on it like so: subject on it like so:
@ -147,8 +147,8 @@ subject on it like so:
All MIME entities (including a message) have a ``toString()`` All MIME entities (including a message) have a ``toString()``
method that you can call if you want to take a look at what is going to be method that you can call if you want to take a look at what is going to be
sent. For example, if you ``<![CDATA[echo sent. For example, if you ``echo
$message->toString();]]>`` you would see something like this: $message->toString();`` you would see something like this:
.. code-block:: bash .. code-block:: bash

98
vendor/swiftmailer/swiftmailer/lib/classes/Swift.php vendored
View File

@ -10,60 +10,72 @@
/** /**
* General utility class in Swift Mailer, not to be instantiated. * General utility class in Swift Mailer, not to be instantiated.
* *
* @package Swift * @package Swift
* *
* @author Chris Corbyn * @author Chris Corbyn
*/ */
abstract class Swift abstract class Swift
{ {
public static $initialized = false;
static $initialized = false; public static $inits = array();
static $initPath;
/** Swift Mailer Version number generated during dist release process */
/** Swift Mailer Version number generated during dist release process */ const VERSION = '@SWIFT_VERSION_NUMBER@';
const VERSION = '@SWIFT_VERSION_NUMBER@';
/**
/** * Registers an initializer callable that will be called the first time
* Internal autoloader for spl_autoload_register(). * a SwiftMailer class is autoloaded.
* *
* @param string $class * This enables you to tweak the default configuration in a lazy way.
*/ *
public static function autoload($class) * @param mixed $callable A valid PHP callable that will be called when autoloading the first Swift class
{ */
//Don't interfere with other autoloaders public static function init($callable)
if (0 !== strpos($class, 'Swift_'))
{ {
return; self::$inits[] = $callable;
} }
$path = dirname(__FILE__).'/'.str_replace('_', '/', $class).'.php'; /**
* Internal autoloader for spl_autoload_register().
if (!file_exists($path)) *
* @param string $class
*/
public static function autoload($class)
{ {
return; //Don't interfere with other autoloaders
if (0 !== strpos($class, 'Swift_')) {
return;
}
$path = dirname(__FILE__).'/'.str_replace('_', '/', $class).'.php';
if (!file_exists($path)) {
return;
}
require $path;
if (self::$inits && !self::$initialized) {
self::$initialized = true;
foreach (self::$inits as $init) {
call_user_func($init);
}
}
} }
if (self::$initPath && !self::$initialized) /**
* Configure autoloading using Swift Mailer.
*
* This is designed to play nicely with other autoloaders.
*
* @param mixed $callable A valid PHP callable that will be called when autoloading the first Swift class
*/
public static function registerAutoload($callable = null)
{ {
self::$initialized = true; if (null !== $callable) {
require self::$initPath; self::$inits[] = $callable;
}
spl_autoload_register(array('Swift', 'autoload'));
} }
require $path;
}
/**
* Configure autoloading using Swift Mailer.
*
* This is designed to play nicely with other autoloaders.
*
* @param string $initPath The init script to load when autoloading the first Swift class
*/
public static function registerAutoload($initPath = null)
{
self::$initPath = $initPath;
spl_autoload_register(array('Swift', 'autoload'));
}
} }

96
vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php vendored
View File

@ -8,7 +8,6 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
/** /**
* Attachment class for attaching files to a {@link Swift_Mime_Message}. * Attachment class for attaching files to a {@link Swift_Mime_Message}.
* @package Swift * @package Swift
@ -17,56 +16,51 @@
*/ */
class Swift_Attachment extends Swift_Mime_Attachment class Swift_Attachment extends Swift_Mime_Attachment
{ {
/**
/** * Create a new Attachment.
* Create a new Attachment. * Details may be optionally provided to the constructor.
* Details may be optionally provided to the constructor. * @param string|Swift_OutputByteStream $data
* @param string|Swift_OutputByteStream $data * @param string $filename
* @param string $filename * @param string $contentType
* @param string $contentType */
*/ public function __construct($data = null, $filename = null, $contentType = null)
public function __construct($data = null, $filename = null,
$contentType = null)
{
call_user_func_array(
array($this, 'Swift_Mime_Attachment::__construct'),
Swift_DependencyContainer::getInstance()
->createDependenciesFor('mime.attachment')
);
$this->setBody($data);
$this->setFilename($filename);
if ($contentType)
{ {
$this->setContentType($contentType); call_user_func_array(
array($this, 'Swift_Mime_Attachment::__construct'),
Swift_DependencyContainer::getInstance()
->createDependenciesFor('mime.attachment')
);
$this->setBody($data);
$this->setFilename($filename);
if ($contentType) {
$this->setContentType($contentType);
}
}
/**
* Create a new Attachment.
* @param string|Swift_OutputByteStream $data
* @param string $filename
* @param string $contentType
* @return Swift_Mime_Attachment
*/
public static function newInstance($data = null, $filename = null, $contentType = null)
{
return new self($data, $filename, $contentType);
}
/**
* Create a new Attachment from a filesystem path.
* @param string $path
* @param string $contentType optional
* @return Swift_Mime_Attachment
*/
public static function fromPath($path, $contentType = null)
{
return self::newInstance()->setFile(
new Swift_ByteStream_FileByteStream($path),
$contentType
);
} }
}
/**
* Create a new Attachment.
* @param string|Swift_OutputByteStream $data
* @param string $filename
* @param string $contentType
* @return Swift_Mime_Attachment
*/
public static function newInstance($data = null, $filename = null,
$contentType = null)
{
return new self($data, $filename, $contentType);
}
/**
* Create a new Attachment from a filesystem path.
* @param string $path
* @param string $contentType optional
* @return Swift_Mime_Attachment
*/
public static function fromPath($path, $contentType = null)
{
return self::newInstance()->setFile(
new Swift_ByteStream_FileByteStream($path),
$contentType
);
}
} }

277
vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php vendored
View File

@ -8,168 +8,157 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
/** /**
* Provides the base functionality for an InputStream supporting filters. * Provides the base functionality for an InputStream supporting filters.
* @package Swift * @package Swift
* @subpackage ByteStream * @subpackage ByteStream
* @author Chris Corbyn * @author Chris Corbyn
*/ */
abstract class Swift_ByteStream_AbstractFilterableInputStream abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_InputByteStream, Swift_Filterable
implements Swift_InputByteStream, Swift_Filterable
{ {
/** Write sequence */
/** Write sequence */ protected $_sequence = 0;
protected $_sequence = 0;
/** StreamFilters */
/** StreamFilters */ private $_filters = array();
private $_filters = array();
/** A buffer for writing */
/** A buffer for writing */ private $_writeBuffer = '';
private $_writeBuffer = '';
/** Bound streams */
/** Bound streams */ private $_mirrors = array();
private $_mirrors = array();
/**
/** * Commit the given bytes to the storage medium immediately.
* Commit the given bytes to the storage medium immediately. * @param string $bytes
* @param string $bytes * @access protected
* @access protected */
*/ abstract protected function _commit($bytes);
abstract protected function _commit($bytes);
/**
/** * Flush any buffers/content with immediate effect.
* Flush any buffers/content with immediate effect. * @access protected
* @access protected */
*/ abstract protected function _flush();
abstract protected function _flush();
/**
/** * Add a StreamFilter to this InputByteStream.
* Add a StreamFilter to this InputByteStream. * @param Swift_StreamFilter $filter
* @param Swift_StreamFilter $filter * @param string $key
* @param string $key */
*/ public function addFilter(Swift_StreamFilter $filter, $key)
public function addFilter(Swift_StreamFilter $filter, $key)
{
$this->_filters[$key] = $filter;
}
/**
* Remove an already present StreamFilter based on its $key.
* @param string $key
*/
public function removeFilter($key)
{
unset($this->_filters[$key]);
}
/**
* Writes $bytes to the end of the stream.
* @param string $bytes
* @throws Swift_IoException
*/
public function write($bytes)
{
$this->_writeBuffer .= $bytes;
foreach ($this->_filters as $filter)
{ {
if ($filter->shouldBuffer($this->_writeBuffer)) $this->_filters[$key] = $filter;
{
return;
}
} }
$this->_doWrite($this->_writeBuffer);
return ++$this->_sequence; /**
} * Remove an already present StreamFilter based on its $key.
* @param string $key
/** */
* For any bytes that are currently buffered inside the stream, force them public function removeFilter($key)
* off the buffer.
*
* @throws Swift_IoException
*/
public function commit()
{
$this->_doWrite($this->_writeBuffer);
}
/**
* Attach $is to this stream.
* The stream acts as an observer, receiving all data that is written.
* All {@link write()} and {@link flushBuffers()} operations will be mirrored.
*
* @param Swift_InputByteStream $is
*/
public function bind(Swift_InputByteStream $is)
{
$this->_mirrors[] = $is;
}
/**
* Remove an already bound stream.
* If $is is not bound, no errors will be raised.
* If the stream currently has any buffered data it will be written to $is
* before unbinding occurs.
*
* @param Swift_InputByteStream $is
*/
public function unbind(Swift_InputByteStream $is)
{
foreach ($this->_mirrors as $k => $stream)
{ {
if ($is === $stream) unset($this->_filters[$key]);
{ }
if ($this->_writeBuffer !== '')
{ /**
$stream->write($this->_filter($this->_writeBuffer)); * Writes $bytes to the end of the stream.
* @param string $bytes
* @throws Swift_IoException
*/
public function write($bytes)
{
$this->_writeBuffer .= $bytes;
foreach ($this->_filters as $filter) {
if ($filter->shouldBuffer($this->_writeBuffer)) {
return;
}
} }
unset($this->_mirrors[$k]); $this->_doWrite($this->_writeBuffer);
}
return ++$this->_sequence;
} }
}
/**
/** * For any bytes that are currently buffered inside the stream, force them
* Flush the contents of the stream (empty it) and set the internal pointer * off the buffer.
* to the beginning. *
* @throws Swift_IoException * @throws Swift_IoException
*/ */
public function flushBuffers() public function commit()
{
if ($this->_writeBuffer !== '')
{ {
$this->_doWrite($this->_writeBuffer); $this->_doWrite($this->_writeBuffer);
} }
$this->_flush();
/**
foreach ($this->_mirrors as $stream) * Attach $is to this stream.
* The stream acts as an observer, receiving all data that is written.
* All {@link write()} and {@link flushBuffers()} operations will be mirrored.
*
* @param Swift_InputByteStream $is
*/
public function bind(Swift_InputByteStream $is)
{ {
$stream->flushBuffers(); $this->_mirrors[] = $is;
} }
}
/**
// -- Private methods * Remove an already bound stream.
* If $is is not bound, no errors will be raised.
/** Run $bytes through all filters */ * If the stream currently has any buffered data it will be written to $is
private function _filter($bytes) * before unbinding occurs.
{ *
foreach ($this->_filters as $filter) * @param Swift_InputByteStream $is
*/
public function unbind(Swift_InputByteStream $is)
{ {
$bytes = $filter->filter($bytes); foreach ($this->_mirrors as $k => $stream) {
if ($is === $stream) {
if ($this->_writeBuffer !== '') {
$stream->write($this->_filter($this->_writeBuffer));
}
unset($this->_mirrors[$k]);
}
}
} }
return $bytes;
} /**
* Flush the contents of the stream (empty it) and set the internal pointer
/** Just write the bytes to the stream */ * to the beginning.
private function _doWrite($bytes) * @throws Swift_IoException
{ */
$this->_commit($this->_filter($bytes)); public function flushBuffers()
foreach ($this->_mirrors as $stream)
{ {
$stream->write($bytes); if ($this->_writeBuffer !== '') {
$this->_doWrite($this->_writeBuffer);
}
$this->_flush();
foreach ($this->_mirrors as $stream) {
$stream->flushBuffers();
}
}
// -- Private methods
/** Run $bytes through all filters */
private function _filter($bytes)
{
foreach ($this->_filters as $filter) {
$bytes = $filter->filter($bytes);
}
return $bytes;
}
/** Just write the bytes to the stream */
private function _doWrite($bytes)
{
$this->_commit($this->_filter($bytes));
foreach ($this->_mirrors as $stream) {
$stream->write($bytes);
}
$this->_writeBuffer = '';
} }
$this->_writeBuffer = '';
}
} }

294
vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php vendored
View File

@ -8,181 +8,163 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
/** /**
* Allows reading and writing of bytes to and from an array. * Allows reading and writing of bytes to and from an array.
* @package Swift * @package Swift
* @subpackage ByteStream * @subpackage ByteStream
* @author Chris Corbyn * @author Chris Corbyn
*/ */
class Swift_ByteStream_ArrayByteStream class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_OutputByteStream
implements Swift_InputByteStream, Swift_OutputByteStream
{ {
/**
* The internal stack of bytes.
* @var string[]
* @access private
*/
private $_array = array();
/** /**
* The internal stack of bytes. * The size of the stack
* @var string[] * @var int
* @access private * @access private
*/ */
private $_array = array(); private $_arraySize = 0;
/** /**
* The size of the stack * The internal pointer offset.
* @var int * @var int
* @access private * @access private
*/ */
private $_arraySize = 0; private $_offset = 0;
/** /** Bound streams */
* The internal pointer offset. private $_mirrors = array();
* @var int
* @access private
*/
private $_offset = 0;
/** Bound streams */
private $_mirrors = array();
/**
* Create a new ArrayByteStream.
* If $stack is given the stream will be populated with the bytes it contains.
* @param mixed $stack of bytes in string or array form, optional
*/
public function __construct($stack = null)
{
if (is_array($stack))
{
$this->_array = $stack;
$this->_arraySize = count($stack);
}
elseif (is_string($stack))
{
$this->write($stack);
}
else
{
$this->_array = array();
}
}
/** /**
* Reads $length bytes from the stream into a string and moves the pointer * Create a new ArrayByteStream.
* through the stream by $length. If less bytes exist than are requested the * If $stack is given the stream will be populated with the bytes it contains.
* remaining bytes are given instead. If no bytes are remaining at all, boolean * @param mixed $stack of bytes in string or array form, optional
* false is returned. */
* @param int $length public function __construct($stack = null)
* @return string
*/
public function read($length)
{
if ($this->_offset == $this->_arraySize)
{ {
return false; if (is_array($stack)) {
$this->_array = $stack;
$this->_arraySize = count($stack);
} elseif (is_string($stack)) {
$this->write($stack);
} else {
$this->_array = array();
}
} }
// Don't use array slice /**
$end = $length + $this->_offset; * Reads $length bytes from the stream into a string and moves the pointer
$end = $this->_arraySize<$end * through the stream by $length. If less bytes exist than are requested the
?$this->_arraySize * remaining bytes are given instead. If no bytes are remaining at all, boolean
:$end; * false is returned.
$ret = ''; * @param int $length
for (; $this->_offset < $end; ++$this->_offset) * @return string
*/
public function read($length)
{ {
$ret .= $this->_array[$this->_offset]; if ($this->_offset == $this->_arraySize) {
} return false;
return $ret; }
}
/** // Don't use array slice
* Writes $bytes to the end of the stream. $end = $length + $this->_offset;
* @param string $bytes $end = $this->_arraySize<$end
*/ ?$this->_arraySize
public function write($bytes) :$end;
{ $ret = '';
$to_add = str_split($bytes); for (; $this->_offset < $end; ++$this->_offset) {
foreach ($to_add as $value) $ret .= $this->_array[$this->_offset];
{ }
$this->_array[] = $value;
}
$this->_arraySize = count($this->_array);
foreach ($this->_mirrors as $stream)
{
$stream->write($bytes);
}
}
/**
* Not used.
*/
public function commit()
{
}
/**
* Attach $is to this stream.
* The stream acts as an observer, receiving all data that is written.
* All {@link write()} and {@link flushBuffers()} operations will be mirrored.
*
* @param Swift_InputByteStream $is
*/
public function bind(Swift_InputByteStream $is)
{
$this->_mirrors[] = $is;
}
/**
* Remove an already bound stream.
* If $is is not bound, no errors will be raised.
* If the stream currently has any buffered data it will be written to $is
* before unbinding occurs.
*
* @param Swift_InputByteStream $is
*/
public function unbind(Swift_InputByteStream $is)
{
foreach ($this->_mirrors as $k => $stream)
{
if ($is === $stream)
{
unset($this->_mirrors[$k]);
}
}
}
/** return $ret;
* Move the internal read pointer to $byteOffset in the stream.
* @param int $byteOffset
* @return boolean
*/
public function setReadPointer($byteOffset)
{
if ($byteOffset > $this->_arraySize)
{
$byteOffset = $this->_arraySize;
}
elseif ($byteOffset < 0)
{
$byteOffset = 0;
} }
$this->_offset = $byteOffset; /**
} * Writes $bytes to the end of the stream.
* @param string $bytes
/** */
* Flush the contents of the stream (empty it) and set the internal pointer public function write($bytes)
* to the beginning.
*/
public function flushBuffers()
{
$this->_offset = 0;
$this->_array = array();
$this->_arraySize = 0;
foreach ($this->_mirrors as $stream)
{ {
$stream->flushBuffers(); $to_add = str_split($bytes);
} foreach ($to_add as $value) {
} $this->_array[] = $value;
}
$this->_arraySize = count($this->_array);
foreach ($this->_mirrors as $stream) {
$stream->write($bytes);
}
}
/**
* Not used.
*/
public function commit()
{
}
/**
* Attach $is to this stream.
* The stream acts as an observer, receiving all data that is written.
* All {@link write()} and {@link flushBuffers()} operations will be mirrored.
*
* @param Swift_InputByteStream $is
*/
public function bind(Swift_InputByteStream $is)
{
$this->_mirrors[] = $is;
}
/**
* Remove an already bound stream.
* If $is is not bound, no errors will be raised.
* If the stream currently has any buffered data it will be written to $is
* before unbinding occurs.
*
* @param Swift_InputByteStream $is
*/
public function unbind(Swift_InputByteStream $is)
{
foreach ($this->_mirrors as $k => $stream) {
if ($is === $stream) {
unset($this->_mirrors[$k]);
}
}
}
/**
* Move the internal read pointer to $byteOffset in the stream.
* @param int $byteOffset
* @return boolean
*/
public function setReadPointer($byteOffset)
{
if ($byteOffset > $this->_arraySize) {
$byteOffset = $this->_arraySize;
} elseif ($byteOffset < 0) {
$byteOffset = 0;
}
$this->_offset = $byteOffset;
}
/**
* Flush the contents of the stream (empty it) and set the internal pointer
* to the beginning.
*/
public function flushBuffers()
{
$this->_offset = 0;
$this->_array = array();
$this->_arraySize = 0;
foreach ($this->_mirrors as $stream) {
$stream->flushBuffers();
}
}
} }

360
vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php vendored
View File

@ -8,227 +8,205 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
/** /**
* Allows reading and writing of bytes to and from a file. * Allows reading and writing of bytes to and from a file.
* @package Swift * @package Swift
* @subpackage ByteStream * @subpackage ByteStream
* @author Chris Corbyn * @author Chris Corbyn
*/ */
class Swift_ByteStream_FileByteStream class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_FileStream
extends Swift_ByteStream_AbstractFilterableInputStream
implements Swift_FileStream
{ {
/** The internal pointer offset */
/** The internal pointer offset */ private $_offset = 0;
private $_offset = 0;
/** The path to the file */
private $_path;
/** The mode this file is opened in for writing */
private $_mode;
/** A lazy-loaded resource handle for reading the file */
private $_reader;
/** A lazy-loaded resource handle for writing the file */
private $_writer;
/** If magic_quotes_runtime is on, this will be true */
private $_quotes = false;
/** If stream is seekable true/false, or null if not known */ /** The path to the file */
private $_seekable = null; private $_path;
/** /** The mode this file is opened in for writing */
* Create a new FileByteStream for $path. private $_mode;
* @param string $path
* @param string $writable if true /** A lazy-loaded resource handle for reading the file */
*/ private $_reader;
public function __construct($path, $writable = false)
{ /** A lazy-loaded resource handle for writing the file */
$this->_path = $path; private $_writer;
$this->_mode = $writable ? 'w+b' : 'rb';
/** If magic_quotes_runtime is on, this will be true */
if (function_exists('get_magic_quotes_runtime') && @get_magic_quotes_runtime() == 1) private $_quotes = false;
/** If stream is seekable true/false, or null if not known */
private $_seekable = null;
/**
* Create a new FileByteStream for $path.
* @param string $path
* @param string $writable if true
*/
public function __construct($path, $writable = false)
{ {
$this->_quotes = true; $this->_path = $path;
$this->_mode = $writable ? 'w+b' : 'rb';
if (function_exists('get_magic_quotes_runtime') && @get_magic_quotes_runtime() == 1) {
$this->_quotes = true;
}
} }
}
/**
/** * Get the complete path to the file.
* Get the complete path to the file. * @return string
* @return string */
*/ public function getPath()
public function getPath()
{
return $this->_path;
}
/**
* Reads $length bytes from the stream into a string and moves the pointer
* through the stream by $length. If less bytes exist than are requested the
* remaining bytes are given instead. If no bytes are remaining at all, boolean
* false is returned.
* @param int $length
* @return string
* @throws Swift_IoException
*/
public function read($length)
{
$fp = $this->_getReadHandle();
if (!feof($fp))
{ {
if ($this->_quotes) return $this->_path;
{
ini_set('magic_quotes_runtime', 0);
}
$bytes = fread($fp, $length);
if ($this->_quotes)
{
ini_set('magic_quotes_runtime', 1);
}
$this->_offset = ftell($fp);
return $bytes;
} }
else
/**
* Reads $length bytes from the stream into a string and moves the pointer
* through the stream by $length. If less bytes exist than are requested the
* remaining bytes are given instead. If no bytes are remaining at all, boolean
* false is returned.
* @param int $length
* @return string
* @throws Swift_IoException
*/
public function read($length)
{ {
$this->_resetReadHandle(); $fp = $this->_getReadHandle();
return false; if (!feof($fp)) {
if ($this->_quotes) {
ini_set('magic_quotes_runtime', 0);
}
$bytes = fread($fp, $length);
if ($this->_quotes) {
ini_set('magic_quotes_runtime', 1);
}
$this->_offset = ftell($fp);
return $bytes;
} else {
$this->_resetReadHandle();
return false;
}
} }
}
/**
/** * Move the internal read pointer to $byteOffset in the stream.
* Move the internal read pointer to $byteOffset in the stream. * @param int $byteOffset
* @param int $byteOffset * @return boolean
* @return boolean */
*/ public function setReadPointer($byteOffset)
public function setReadPointer($byteOffset)
{
if (isset($this->_reader))
{ {
$this->_seekReadStreamToPosition($byteOffset); if (isset($this->_reader)) {
$this->_seekReadStreamToPosition($byteOffset);
}
$this->_offset = $byteOffset;
} }
$this->_offset = $byteOffset;
} // -- Private methods
// -- Private methods /** Just write the bytes to the file */
protected function _commit($bytes)
/** Just write the bytes to the file */
protected function _commit($bytes)
{
fwrite($this->_getWriteHandle(), $bytes);
$this->_resetReadHandle();
}
/** Not used */
protected function _flush()
{
}
/** Get the resource for reading */
private function _getReadHandle()
{
if (!isset($this->_reader))
{ {
if (!$this->_reader = fopen($this->_path, 'rb')) fwrite($this->_getWriteHandle(), $bytes);
{ $this->_resetReadHandle();
throw new Swift_IoException(
'Unable to open file for reading [' . $this->_path . ']'
);
}
if ($this->_offset <> 0)
{
$this->_getReadStreamSeekableStatus();
$this->_seekReadStreamToPosition($this->_offset);
}
} }
return $this->_reader;
} /** Not used */
protected function _flush()
/** Get the resource for writing */
private function _getWriteHandle()
{
if (!isset($this->_writer))
{ {
if (!$this->_writer = fopen($this->_path, $this->_mode))
{
throw new Swift_IoException(
'Unable to open file for writing [' . $this->_path . ']'
);
}
} }
return $this->_writer;
} /** Get the resource for reading */
private function _getReadHandle()
/** Force a reload of the resource for reading */
private function _resetReadHandle()
{
if (isset($this->_reader))
{ {
fclose($this->_reader); if (!isset($this->_reader)) {
$this->_reader = null; if (!$this->_reader = fopen($this->_path, 'rb')) {
throw new Swift_IoException(
'Unable to open file for reading [' . $this->_path . ']'
);
}
if ($this->_offset <> 0) {
$this->_getReadStreamSeekableStatus();
$this->_seekReadStreamToPosition($this->_offset);
}
}
return $this->_reader;
} }
}
/** Get the resource for writing */
/** Check if ReadOnly Stream is seekable */ private function _getWriteHandle()
private function _getReadStreamSeekableStatus()
{
$metas = stream_get_meta_data($this->_reader);
$this->_seekable = $metas['seekable'];
}
/** Streams in a readOnly stream ensuring copy if needed */
private function _seekReadStreamToPosition($offset)
{
if ($this->_seekable===null)
{ {
$this->_getReadStreamSeekableStatus(); if (!isset($this->_writer)) {
if (!$this->_writer = fopen($this->_path, $this->_mode)) {
throw new Swift_IoException(
'Unable to open file for writing [' . $this->_path . ']'
);
}
}
return $this->_writer;
} }
if ($this->_seekable === false)
/** Force a reload of the resource for reading */
private function _resetReadHandle()
{ {
$currentPos = ftell($this->_reader); if (isset($this->_reader)) {
if ($currentPos<$offset) fclose($this->_reader);
{ $this->_reader = null;
$toDiscard = $offset-$currentPos; }
fread($this->_reader, $toDiscard);
return;
}
$this->_copyReadStream();
} }
fseek($this->_reader, $offset, SEEK_SET);
} /** Check if ReadOnly Stream is seekable */
private function _getReadStreamSeekableStatus()
/** Copy a readOnly Stream to ensure seekability */
private function _copyReadStream()
{
if ($tmpFile = fopen('php://temp/maxmemory:4096', 'w+b'))
{ {
/* We have opened a php:// Stream Should work without problem */ $metas = stream_get_meta_data($this->_reader);
} $this->_seekable = $metas['seekable'];
elseif (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile()))
{
/* We have opened a tmpfile */
}
else
{
throw new Swift_IoException('Unable to copy the file to make it seekable, sys_temp_dir is not writable, php://memory not available');
} }
$currentPos = ftell($this->_reader);
fclose($this->_reader); /** Streams in a readOnly stream ensuring copy if needed */
$source = fopen($this->_path, 'rb'); private function _seekReadStreamToPosition($offset)
if (!$source)
{ {
throw new Swift_IoException('Unable to open file for copying [' . $this->_path . ']'); if ($this->_seekable===null) {
$this->_getReadStreamSeekableStatus();
}
if ($this->_seekable === false) {
$currentPos = ftell($this->_reader);
if ($currentPos<$offset) {
$toDiscard = $offset-$currentPos;
fread($this->_reader, $toDiscard);
return;
}
$this->_copyReadStream();
}
fseek($this->_reader, $offset, SEEK_SET);
} }
fseek($tmpFile, 0, SEEK_SET);
while (!feof($source)) /** Copy a readOnly Stream to ensure seekability */
private function _copyReadStream()
{ {
fwrite($tmpFile, fread($source, 4096)); if ($tmpFile = fopen('php://temp/maxmemory:4096', 'w+b')) {
/* We have opened a php:// Stream Should work without problem */
} elseif (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
/* We have opened a tmpfile */
} else {
throw new Swift_IoException('Unable to copy the file to make it seekable, sys_temp_dir is not writable, php://memory not available');
}
$currentPos = ftell($this->_reader);
fclose($this->_reader);
$source = fopen($this->_path, 'rb');
if (!$source) {
throw new Swift_IoException('Unable to open file for copying [' . $this->_path . ']');
}
fseek($tmpFile, 0, SEEK_SET);
while (!feof($source)) {
fwrite($tmpFile, fread($source, 4096));
}
fseek($tmpFile, $currentPos, SEEK_SET);
fclose($source);
$this->_reader = $tmpFile;
} }
fseek($tmpFile, $currentPos, SEEK_SET);
fclose($source);
$this->_reader = $tmpFile;
}
} }

75
vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php vendored
View File

@ -17,44 +17,43 @@
*/ */
interface Swift_CharacterReader interface Swift_CharacterReader
{ {
const MAP_TYPE_INVALID = 0x01; const MAP_TYPE_INVALID = 0x01;
const MAP_TYPE_FIXED_LEN = 0x02; const MAP_TYPE_FIXED_LEN = 0x02;
const MAP_TYPE_POSITIONS = 0x03; const MAP_TYPE_POSITIONS = 0x03;
/**
* Returns the complete charactermap
*
* @param string $string
* @param int $startOffset
* @param array $currentMap
* @param mixed $ignoredChars
* @return int
*/
public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars);
/**
* Returns mapType
* @return int mapType
*/
public function getMapType();
/**
* Returns an integer which specifies how many more bytes to read.
* A positive integer indicates the number of more bytes to fetch before invoking
* this method again.
* A value of zero means this is already a valid character.
* A value of -1 means this cannot possibly be a valid character.
* @param int[] $bytes
* @return int
*/
public function validateByteSequence($bytes, $size);
/** /**
* Returns the number of bytes which should be read to start each character. * Returns the complete charactermap
* For fixed width character sets this should be the number of *
* octets-per-character. For multibyte character sets this will probably be 1. * @param string $string
* @return int * @param int $startOffset
*/ * @param array $currentMap
public function getInitialByteSize(); * @param mixed $ignoredChars
* @return int
*/
public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars);
/**
* Returns mapType
* @return int mapType
*/
public function getMapType();
/**
* Returns an integer which specifies how many more bytes to read.
* A positive integer indicates the number of more bytes to fetch before invoking
* this method again.
* A value of zero means this is already a valid character.
* A value of -1 means this cannot possibly be a valid character.
* @param int[] $bytes
* @return int
*/
public function validateByteSequence($bytes, $size);
/**
* Returns the number of bytes which should be read to start each character.
* For fixed width character sets this should be the number of
* octets-per-character. For multibyte character sets this will probably be 1.
* @return int
*/
public function getInitialByteSize();
} }

130
vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php vendored
View File

@ -8,7 +8,6 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
/** /**
* Provides fixed-width byte sizes for reading fixed-width character sets. * Provides fixed-width byte sizes for reading fixed-width character sets.
* @package Swift * @package Swift
@ -16,76 +15,75 @@
* @author Chris Corbyn * @author Chris Corbyn
* @author Xavier De Cock <xdecock@gmail.com> * @author Xavier De Cock <xdecock@gmail.com>
*/ */
class Swift_CharacterReader_GenericFixedWidthReader class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterReader
implements Swift_CharacterReader
{ {
/** /**
* The number of bytes in a single character. * The number of bytes in a single character.
* @var int * @var int
* @access private * @access private
*/ */
private $_width; private $_width;
/** /**
* Creates a new GenericFixedWidthReader using $width bytes per character. * Creates a new GenericFixedWidthReader using $width bytes per character.
* @param int $width * @param int $width
*/ */
public function __construct($width) public function __construct($width)
{ {
$this->_width = $width; $this->_width = $width;
} }
/** /**
* Returns the complete charactermap * Returns the complete charactermap
* *
* @param string $string * @param string $string
* @param int $startOffset * @param int $startOffset
* @param array $currentMap * @param array $currentMap
* @param mixed $ignoredChars * @param mixed $ignoredChars
* @return $int * @return $int
*/ */
public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars) public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
{ {
$strlen = strlen($string); $strlen = strlen($string);
// % and / are CPU intensive, so, maybe find a better way // % and / are CPU intensive, so, maybe find a better way
$ignored = $strlen%$this->_width; $ignored = $strlen%$this->_width;
$ignoredChars = substr($string, - $ignored); $ignoredChars = substr($string, - $ignored);
$currentMap = $this->_width; $currentMap = $this->_width;
return ($strlen - $ignored)/$this->_width; return ($strlen - $ignored)/$this->_width;
} }
/**
* Returns mapType
* @return int mapType
*/
public function getMapType()
{
return self::MAP_TYPE_FIXED_LEN;
}
/** /**
* Returns an integer which specifies how many more bytes to read. * Returns mapType
* A positive integer indicates the number of more bytes to fetch before invoking * @return int mapType
* this method again. */
* A value of zero means this is already a valid character. public function getMapType()
* A value of -1 means this cannot possibly be a valid character. {
* @param string $bytes return self::MAP_TYPE_FIXED_LEN;
* @return int }
*/
public function validateByteSequence($bytes, $size)
{
$needed = $this->_width - $size;
return ($needed > -1) ? $needed : -1; /**
} * Returns an integer which specifies how many more bytes to read.
* A positive integer indicates the number of more bytes to fetch before invoking
* this method again.
* A value of zero means this is already a valid character.
* A value of -1 means this cannot possibly be a valid character.
* @param string $bytes
* @return int
*/
public function validateByteSequence($bytes, $size)
{
$needed = $this->_width - $size;
/** return ($needed > -1) ? $needed : -1;
* Returns the number of bytes which should be read to start each character. }
* @return int
*/ /**
public function getInitialByteSize() * Returns the number of bytes which should be read to start each character.
{ * @return int
return $this->_width; */
} public function getInitialByteSize()
{
return $this->_width;
}
} }

Some files were not shown because too many files have changed in this diff Show More