[WIP] Move to new QueryBuilder

.travis.yml

@@ -1,18 +1,12 @@
 language: php
 php:
-  - 5.6
   - 7
   - 7.1
+  - 7.2
   - nightly
 
 matrix:
-  include:
-    - php: "hhvm"
-      env:
-        - NO_COVERAGE=1
-        - BZION_HHVM=1
   allow_failures:
-    - php: hhvm
     - php: nightly
   fast_finish: true
 

app/Resource/symfony_dev.yml

@@ -5,8 +5,13 @@ services:
     bzion.command.log_command:
         class: BZIon\Command\LogCommand
         tags:
-
             -  { name: console.command }
+    bzion.twig_debug_extension:
+        class: Ajgl\Twig\Extension\BreakpointExtension
+        public: false
+        tags:
+            - { name: twig.extension }
+
 framework:
     router:
         resource: "%kernel.root_dir%/Resource/routes_dev.yml"

composer.json

@@ -5,7 +5,7 @@
     "license": "GPL-3.0-only",
 
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.0.9",
         "ext-PDO": "*",
         "ext-gd": "*",
         "ext-pdo_mysql": "*",
@@ -18,6 +18,7 @@
         "maciejczyzewski/bottomline": "dev-master",
         "nelmio/api-doc-bundle": "~2.7",
         "nesbot/carbon": "~1.14",
+        "pecee/pixie": "~4.2.5",
         "robmorgan/phinx": "~0.8",
         "sensio/framework-extra-bundle": "~3.0",
         "swiftmailer/swiftmailer": ">=5.2.0",
@@ -29,17 +30,18 @@
         "yzalis/identicon": "~1.2.0"
     },
     "require-dev": {
+        "ajgl/breakpoint-twig-extension": "^0.3.1",
         "behat/behat": "~3.0",
         "behat/mink": "~1.6",
-        "behat/mink-extension": "~2.0",
         "behat/mink-browserkit-driver": "~1.2",
+        "behat/mink-extension": "~2.0",
         "behat/symfony2-extension": "~2.1.1",
         "composer/composer": "~1.5",
+        "fzaninotto/faker": "^1.7",
         "jdorn/sql-formatter": "~1.2",
         "phpunit/phpunit": "~5.7",
         "sensio/distribution-bundle": "~3.0",
-        "sensiolabs/security-checker": "~4.1",
-        "fzaninotto/faker": "^1.7"
+        "sensiolabs/security-checker": "~4.1"
     },
 
     "scripts": {
@@ -110,7 +112,7 @@
     },
     "config": {
         "platform": {
-            "php": "5.6.0"
+            "php": "7.0.9"
         },
         "sort-packages": true
     },

controllers/BanController.php

@@ -15,11 +15,13 @@ public function listAction(Request $request)
         $currentPage = $this->getCurrentPage();
 
         $qb = $this->getQueryBuilder()
-            ->sortBy('updated')->reverse()
-            ->limit(16)->fromPage($currentPage);
+            ->orderBy('updated', 'DESC')
+            ->limit(16)
+            ->fromPage($currentPage)
+        ;
 
         return array(
-            'bans'        => $qb->getModels(),
+            'bans'        => $qb->getModels(true),
             'currentPage' => $currentPage,
             'totalPages'  => $qb->countPages()
         );

controllers/InvitationController.php

@@ -3,11 +3,13 @@
 use BZIon\Event\Events;
 use BZIon\Event\TeamInviteEvent;
 use BZIon\Event\TeamJoinEvent;
+use BZIon\Form\Creator\InvitationFormCreator;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
 
 class InvitationController extends CRUDController
 {
-    public function acceptAction(Invitation $invitation, Player $me)
+    public function acceptAction(Player $me, Invitation $invitation)
     {
         if (!$me->isTeamless()) {
             throw new ForbiddenException("You can't join a new team until you leave your current one.");
@@ -22,7 +24,7 @@ public function acceptAction(Invitation $invitation, Player $me)
         }
 
         if ($invitation->getTeam()->isDeleted()) {
-            $invitation->updateExpiration();
+            $invitation->setExpired();
 
             throw new ForbiddenException("This invitation is for a team which has been deleted.");
         }
@@ -32,30 +34,48 @@ public function acceptAction(Invitation $invitation, Player $me)
 
         return $this->showConfirmationForm(function () use ($invitation, $team, $me) {
             $team->addMember($me->getId());
-            $invitation->updateExpiration();
+            $invitation->setStatus(Invitation::STATUS_ACCEPTED);
+            $invitation->setExpired();
             Service::getDispatcher()->dispatch(Events::TEAM_JOIN, new TeamJoinEvent($team, $me));
 
             return new RedirectResponse($team->getUrl());
         },  "Are you sure you want to accept the invitation from $inviter to join {$team->getEscapedName()}?",
             "You are now a member of {$team->getName()}");
     }
 
-    public function inviteAction(Team $team, Player $player, Player $me)
+    public function inviteAction(Player $me, Team $team, Player $player)
     {
         if (!$me->canEdit($team)) {
             throw new ForbiddenException("You are not allowed to invite a player to that team!");
-        } elseif ($team->isMember($player->getId())) {
-            throw new ForbiddenException("The specified player is already a member of that team.");
-        } elseif (Invitation::hasOpenInvitation($player->getId(), $team->getId())) {
-            throw new ForbiddenException("This player has already been invited to join the team.");
         }
 
-        return $this->showConfirmationForm(function () use ($team, $player, $me) {
-            $invite = Invitation::sendInvite($player->getId(), $team->getId(), $me->getId());
-            Service::getDispatcher()->dispatch(Events::TEAM_INVITE, new TeamInviteEvent($invite));
+        $creator = new InvitationFormCreator($team, $me, $this);
+        $form = $creator->create()->handleRequest(self::getRequest());
 
-            return new RedirectResponse($team->getUrl());
-        },  "Are you sure you want to invite {$player->getEscapedUsername()} to {$team->getEscapedName()}?",
-            "Player {$player->getUsername()} has been invited to {$team->getName()}");
+        if ($form->isSubmitted()) {
+            $this->validate($form);
+
+            if ($form->isValid()) {
+                $clickedButton = $form->getClickedButton()->getName();
+
+                if ($clickedButton === 'submit') {
+                    $invitation = $creator->enter($form);
+
+                    self::getFlashBag()->add('success', sprintf('"%s" has been invited to "%s."', $invitation->getInvitedPlayer()->getName(), $team->getName()));
+
+                    return $this->redirectTo($team);
+                }
+
+                return (new RedirectResponse($this->getPreviousURL()));
+            }
+        } else {
+            $form->get('invited_player')->setData($player);
+        }
+
+        return [
+            'form' => $form->createView(),
+            'team' => $team,
+            'player' => $player,
+        ];
     }
 }

controllers/MapController.php

@@ -5,17 +5,18 @@ class MapController extends CRUDController
     public function listAction(Map $map = null)
     {
         if ($map === null) {
-            $qb = $this->getQueryBuilder();
-
-            $maps = $qb->sortBy('name')
-                ->getModels();
+            $maps = $this->getQueryBuilder()
+                ->active()
+                ->orderBy('name')
+                ->getModels()
+            ;
         } else {
-            $maps = array($map);
+            $maps = [$map];
         }
 
-        return array(
-            "maps" => $maps
-        );
+        return [
+            'maps' => $maps
+        ];
     }
 
     public function createAction(Player $me)