Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

makes namespaces psr4 compliant #776

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
7efc79d
move classes to namespace JoindIn\Web
zghosts Feb 9, 2019
52b4b8c
move tests/phpunit.xml to phpunit.xml.dist
zghosts Feb 11, 2019
c3a2bda
fix references
zghosts Feb 11, 2019
376d586
fix deprecations and remove unneeded/invalid parameters on the Constr…
zghosts Feb 11, 2019
d37cc8f
adds .idea to .gitignore
zghosts Feb 11, 2019
459b1f3
fix deprecated DefaultCsrfProvider
zghosts Feb 11, 2019
7f80f55
remove unused references
zghosts Feb 11, 2019
7f65fdb
move classes to namespace JoindIn\Web
zghosts Feb 9, 2019
245c331
move tests/phpunit.xml to phpunit.xml.dist
zghosts Feb 11, 2019
cda8b0f
fix references
zghosts Feb 11, 2019
af0a176
fix deprecations and remove unneeded/invalid parameters on the Constr…
zghosts Feb 11, 2019
2950b92
adds .idea to .gitignore
zghosts Feb 11, 2019
73c9767
fix deprecated DefaultCsrfProvider
zghosts Feb 11, 2019
742aca3
remove unused references
zghosts Feb 11, 2019
1f73eaa
fixes cs issue
zghosts Feb 15, 2019
5f802fb
symplify fqcn
zghosts Feb 22, 2019
6b0a057
add test for EventFormType
zghosts Feb 22, 2019
12f92da
merge upstream
zghosts Mar 3, 2019
2ee8fd0
remove unneeded csrf secret
zghosts Mar 3, 2019
ab0d8a8
add tests for middlewares
zghosts Mar 3, 2019
5448715
add qa scripts to composer
zghosts Mar 4, 2019
e4926a5
cleanup test
zghosts Mar 6, 2019
93fa1d2
use namespaced twig classes
zghosts Mar 6, 2019
0e33c5b
merge upstream
zghosts Mar 6, 2019
06e8cef
merge upstream
zghosts Mar 26, 2019
fa8c8c6
remove unused use statement for constraint
zghosts Mar 27, 2019
0167318
fix array type in dockblocks
zghosts Mar 27, 2019
db63b27
add typehints to docblocks
zghosts Mar 27, 2019
da8784b
add typehint
zghosts Mar 27, 2019
84a41ea
add typehints
zghosts Mar 27, 2019
40cbf40
define continents and cities before modification
zghosts Mar 27, 2019
52ec28e
update return types
zghosts Mar 27, 2019
71715aa
typehint against FormInterface
zghosts Mar 27, 2019
8653def
update param typehints
zghosts Mar 27, 2019
a6868cf
fix concatenation operator
zghosts Mar 27, 2019
66ef241
add returntype
zghosts Mar 27, 2019
5203902
remove nonexistent parameter from docblock
zghosts Mar 27, 2019
de6e112
merge upstream
zghosts Mar 27, 2019
9fd7516
use array_merge to merge arrays
zghosts Mar 27, 2019
f9eefbc
revert to using phpunit 7 as symfony testcases are incompatible with …
zghosts Mar 27, 2019
a1e5438
merge upstream
zghosts Jun 2, 2019
e9863bf
run composer update
zghosts Jun 2, 2019
03413a6
apply codestyle fixes
zghosts Jun 3, 2019
bae2f16
apply codestyle fixes
zghosts Jun 3, 2019
a96a26b
apply codestyle fixes
zghosts Jun 3, 2019
7bf9b8f
merge upstream
zghosts Jun 3, 2019
87f4130
remove unneeded preceding backslashed
zghosts Jun 3, 2019
75091fc
fix config test
zghosts Jun 3, 2019
ff25b5a
optimize imports
zghosts Jun 3, 2019
93dc846
apply codestyle fix
zghosts Jun 3, 2019
28d2fef
cleanup imports
zghosts Jun 7, 2019
9161a5a
Merge branch 'master' into psr4
iansltx Jun 8, 2019
07f8124
Yes, PhpStorm, we need ext-json
iansltx Jun 8, 2019
7fbb43e
Explicitly return null when a false-y event ID is passed
iansltx Jun 8, 2019
1e40695
Fix typo in approveClaimPendingTalk
iansltx Jun 8, 2019
9dfc660
Remove redundant/misleading echos on $this->render() calls
iansltx Jun 8, 2019
0ab7002
make formtype compatible with symfony/form 3.4
zghosts Jun 9, 2019
9ba8833
fix test
zghosts Jun 9, 2019
de27642
fix loading of translation with symfony 3.4
zghosts Jun 9, 2019
1a6af6b
fix symfony deprecations
zghosts Jun 9, 2019
94f096c
bump symfony components to 3.4
zghosts Jun 9, 2019
a0ba0cb
fix indentation
zghosts Jun 9, 2019
a4596ac
revert replacing twigrenderer with formrenderer
zghosts Jun 9, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.idea
iansltx marked this conversation as resolved.
Show resolved Hide resolved
build/
web/css/site.css
web/js/site.js
vendor/.git
node_modules/
.DS_Store
web/inc
vendor/
vendor/
4 changes: 2 additions & 2 deletions app/src/Apikey/ApikeyApi.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Apikey;
namespace JoindIn\Web\Apikey;

use Application\BaseApi;
use JoindIn\Web\Application\BaseApi;

class ApikeyApi extends BaseApi
{
Expand Down
5 changes: 3 additions & 2 deletions app/src/Apikey/ApikeyController.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?php
namespace Apikey;
namespace JoindIn\Web\Apikey;

use Application\BaseController;
use Apikey\ClientApi;
use JoindIn\Web\Application\BaseController;
use Exception;
use Slim\Slim;
use Symfony\Component\Form\Form;
Expand Down
4 changes: 2 additions & 2 deletions app/src/Apikey/ApikeyDeleteFormType.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Apikey;
namespace JoindIn\Web\Apikey;

use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Validator\Constraints as Assert;
use Event\EventEntity;
use JoindIn\Web\Event\EventEntity;

/**
* Form used to render and validate the submission or editing of a 3rd party application.
Expand Down
4 changes: 2 additions & 2 deletions app/src/Apikey/ApikeyEntity.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Apikey;
namespace JoindIn\Web\Apikey;

use Application\BaseEntity;
use JoindIn\Web\Application\BaseEntity;
use DateTime;
use DateInterval;

Expand Down
11 changes: 6 additions & 5 deletions app/src/Application/ApplicationController.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php
namespace Application;
namespace JoindIn\Web\Application;

use Event\EventDb;
use Event\EventApi;
use User\UserDb;
use User\UserApi;
use Symfony\Component\Form\FormFactoryInterface;
use JoindIn\Web\Event\EventDb;
use JoindIn\Web\Event\EventApi;
use JoindIn\Web\User\UserDb;
use JoindIn\Web\User\UserApi;

class ApplicationController extends BaseController
{
Expand Down
2 changes: 1 addition & 1 deletion app/src/Application/BaseApi.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Application;
namespace JoindIn\Web\Application;

abstract class BaseApi
{
Expand Down
4 changes: 3 additions & 1 deletion app/src/Application/BaseCommentEntity.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php
namespace Application;
namespace JoindIn\Web\Application;

use JoindIn\Web\Application\BaseEntity;

abstract class BaseCommentEntity extends BaseEntity
{
Expand Down
3 changes: 2 additions & 1 deletion app/src/Application/BaseCommentReportingEntity.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
namespace Application;
namespace JoindIn\Web\Application;

use JoindIn\Web\Application\BaseEntity;
use stdClass;

abstract class BaseCommentReportingEntity extends BaseEntity
Expand Down
2 changes: 1 addition & 1 deletion app/src/Application/BaseController.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Application;
namespace JoindIn\Web\Application;

use Slim\Slim;
use Twig_Error_Runtime;
Expand Down
4 changes: 3 additions & 1 deletion app/src/Application/BaseDb.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php
namespace Application;
namespace JoindIn\Web\Application;

use JoindIn\Web\Application\CacheService;

abstract class BaseDb
{
Expand Down
2 changes: 1 addition & 1 deletion app/src/Application/BaseEntity.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Application;
namespace JoindIn\Web\Application;

use stdClass;

Expand Down
2 changes: 1 addition & 1 deletion app/src/Application/CacheService.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Application;
namespace JoindIn\Web\Application;

/**
* Class CacheService
Expand Down
2 changes: 1 addition & 1 deletion app/src/Application/Config.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Application;
namespace JoindIn\Web\Application;

class Config implements \ArrayAccess
{
Expand Down
4 changes: 2 additions & 2 deletions app/src/Application/ContactApi.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Application;
namespace JoindIn\Web\Application;

use Application\BaseApi;
use JoindIn\Web\Application\BaseApi;

class ContactApi extends BaseApi
{
Expand Down
6 changes: 3 additions & 3 deletions app/src/Application/ContactFormType.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace Application;
namespace JoindIn\Web\Application;

use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Validator\Constraints as Assert;
use Form\DataTransformer\DateTransformer;
use Form\DataTransformer\EventTagsTransformer;
use JoindIn\Web\Form\DataTransformer\DateTransformer;
use JoindIn\Web\Form\DataTransformer\EventTagsTransformer;

/**
* Form used to render and validate a contact form.
Expand Down
6 changes: 3 additions & 3 deletions app/src/Client/ClientApi.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
namespace Client;
namespace JoindIn\Web\Client;

use Application\BaseApi;
use User\UserApi;
use JoindIn\Web\Application\BaseApi;
use JoindIn\Web\User\UserApi;

class ClientApi extends BaseApi
{
Expand Down
4 changes: 2 additions & 2 deletions app/src/Client/ClientController.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Client;
namespace JoindIn\Web\Client;

use Application\BaseController;
use JoindIn\Web\Application\BaseController;
use Exception;
use Slim\Slim;
use Symfony\Component\Form\Form;
Expand Down
4 changes: 2 additions & 2 deletions app/src/Client/ClientDeleteFormType.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Client;
namespace JoindIn\Web\Client;

use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Validator\Constraints as Assert;
use Event\EventEntity;
use JoindIn\Web\Event\EventEntity;

/**
* Form used to render and validate the submission or editing of a 3rd party application.
Expand Down
4 changes: 2 additions & 2 deletions app/src/Client/ClientEntity.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Client;
namespace JoindIn\Web\Client;

use Application\BaseEntity;
use JoindIn\Web\Application\BaseEntity;
use DateTime;
use DateInterval;

Expand Down
4 changes: 2 additions & 2 deletions app/src/Client/ClientFormType.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Client;
namespace JoindIn\Web\Client;

use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Validator\Constraints as Assert;
use Event\EventEntity;
use JoindIn\Web\Event\EventEntity;

/**
* Form used to render and validate the submission or editing of a 3rd party application.
Expand Down
2 changes: 1 addition & 1 deletion app/src/Event/Constraint/ValidEventIcon.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Event\Constraint;
namespace JoindIn\Web\Event\Constraint;

use Symfony\Component\Validator\Constraint;

Expand Down
2 changes: 1 addition & 1 deletion app/src/Event/Constraint/ValidEventIconValidator.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Event\Constraint;
namespace JoindIn\Web\Event\Constraint;

use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
Expand Down
12 changes: 6 additions & 6 deletions app/src/Event/EventApi.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php
namespace Event;
namespace JoindIn\Web\Event;

use Application\BaseApi;
use JoindIn\Web\Application\BaseApi;
use DateTime;
use Exception;
use Talk\TalkCommentEntity;
use Talk\TalkCommentReportEntity;
use User\UserApi;
use User\UserEntity;
use JoindIn\Web\Talk\TalkCommentEntity;
use JoindIn\Web\Talk\TalkCommentReportEntity;
use JoindIn\Web\User\UserApi;
use JoindIn\Web\User\UserEntity;

class EventApi extends BaseApi
{
Expand Down
4 changes: 2 additions & 2 deletions app/src/Event/EventCommentEntity.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Event;
namespace JoindIn\Web\Event;

use Application\BaseCommentEntity;
use JoindIn\Web\Application\BaseCommentEntity;

class EventCommentEntity extends BaseCommentEntity
{
Expand Down
4 changes: 2 additions & 2 deletions app/src/Event/EventCommentReportEntity.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Event;
namespace JoindIn\Web\Event;

use Application\BaseCommentReportingEntity;
use JoindIn\Web\Application\BaseCommentReportingEntity;
use stdClass;

class EventCommentReportEntity extends BaseCommentReportingEntity
Expand Down
24 changes: 12 additions & 12 deletions app/src/Event/EventController.php
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?php
namespace Event;
namespace JoindIn\Web\Event;

use Application\BaseController;
use Application\CacheService;
use JoindIn\Web\Application\BaseController;
use JoindIn\Web\Application\CacheService;
use Slim\Exception\Stop;
use Symfony\Component\Form\Form;
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Validator\Validator;
use Talk\TalkDb;
use Talk\TalkApi;
use Talk\TalkFormType;
use Talk\TalkTypeApi;
use User\UserDb;
use User\UserApi;
use JoindIn\Web\Talk\TalkDb;
use JoindIn\Web\Talk\TalkApi;
use JoindIn\Web\Talk\TalkFormType;
use JoindIn\Web\Talk\TalkTypeApi;
use JoindIn\Web\User\UserDb;
use JoindIn\Web\User\UserApi;
use Exception;
use Slim\Slim;
use Language\LanguageApi;
use JoindIn\Web\Language\LanguageApi;

class EventController extends BaseController
{
Expand Down Expand Up @@ -1176,7 +1176,7 @@ private function getTalkSlugsFromDb(array $comments)
$talkDb = $this->getTalkDb();
$slugs = array();

/** @var \Talk\TalkCommentEntity $comment */
/** @var \JoindIn\Web\Talk\TalkCommentEntity $comment */
foreach ($comments as $comment) {
$slugs[$comment->getTalkUri()] = $talkDb->getSlugFor($comment->getTalkUri());
}
Expand All @@ -1198,7 +1198,7 @@ private function getTalkSlugsFromApi(EventEntity $event)
array('resultsperpage' => 100) // Make sure we get all talks with a single request
);

/** @var \Talk\TalkEntity $talk */
/** @var \JoindIn\Web\Talk\TalkEntity $talk */
foreach ($talks['talks'] as $talk) {
$slugs[$talk->getApiUri()] = $talk->getUrlFriendlyTalkTitle();
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/Event/EventDb.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
namespace Event;
namespace JoindIn\Web\Event;

use Application\BaseDb;
use Application\CacheService;
use JoindIn\Web\Application\BaseDb;
use JoindIn\Web\Application\CacheService;

class EventDb extends BaseDb
{
Expand Down
4 changes: 2 additions & 2 deletions app/src/Event/EventEntity.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Event;
namespace JoindIn\Web\Event;

use Application\BaseEntity;
use JoindIn\Web\Application\BaseEntity;
use DateTime;

class EventEntity extends BaseEntity
Expand Down
10 changes: 6 additions & 4 deletions app/src/Event/EventFormType.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<?php

namespace Event;
namespace JoindIn\Web\Event;

use Event\Constraint;
zghosts marked this conversation as resolved.
Show resolved Hide resolved
use JoindIn\Web\Event\Constraint\ValidEventIcon;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Validator\Constraints as Assert;
use Form\DataTransformer\DateTransformer;
use Form\DataTransformer\EventTagsTransformer;
use JoindIn\Web\Form\DataTransformer\DateTransformer;
use JoindIn\Web\Form\DataTransformer\EventTagsTransformer;

/**
* Form used to render and validate the submission of a new event.
Expand Down Expand Up @@ -175,7 +177,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'attr'=> [
'class'=>'file',
],
'constraints' => [new Constraint\ValidEventIcon(['groupname' => 'event', 'keyname'=>'new_icon'])],
'constraints' => [new ValidEventIcon(['groupname' => 'event', 'keyname' =>'new_icon'])],
]
)
;
Expand Down
4 changes: 2 additions & 2 deletions app/src/Event/EventScheduler.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Event;
namespace JoindIn\Web\Event;

use Talk\TalkApi;
use JoindIn\Web\Talk\TalkApi;

/**
* Class EventScheduler
Expand Down
2 changes: 1 addition & 1 deletion app/src/Event/EventSchedulerDay.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Event;
namespace JoindIn\Web\Event;

use DateTime;

Expand Down
Loading