use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Config\Loader\LoaderInterface;
-use Wallabag\ApiBundle\WallabagApiBundle;
class AppKernel extends Kernel
{
public function getEntriesAction(Request $request)
{
$isArchived = $request->query->get('archive');
- $isStarred = $request->query->get('star');
- $sort = $request->query->get('sort', 'created');
- $order = $request->query->get('order', 'desc');
- $page = (int) $request->query->get('page', 1);
- $perPage = (int) $request->query->get('perPage', 30);
- $tags = $request->query->get('tags', []);
+ $isStarred = $request->query->get('star');
+ $sort = $request->query->get('sort', 'created');
+ $order = $request->query->get('order', 'desc');
+ $page = (int) $request->query->get('page', 1);
+ $perPage = (int) $request->query->get('perPage', 30);
+ $tags = $request->query->get('tags', []);
$pager = $this
->getDoctrine()
$pager->setCurrentPage($page);
$pager->setMaxPerPage($perPage);
- $pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
+ $pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
$paginatedCollection = $pagerfantaFactory->createRepresentation(
$pager,
new Route('api_get_entries', [], $absolute = true)
{
$this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId());
- $title = $request->request->get('title');
+ $title = $request->request->get('title');
$isArchived = $request->request->get('is_archived');
- $isStarred = $request->request->get('is_starred');
+ $isStarred = $request->request->get('is_starred');
if (!is_null($title)) {
$entry->setTitle($title);
public function __construct(UserProviderInterface $userProvider, $cacheDir)
{
$this->userProvider = $userProvider;
- $this->cacheDir = $cacheDir;
+ $this->cacheDir = $cacheDir;
// If cache directory does not exist we create it
if (!is_dir($this->cacheDir)) {
$token = new WsseUserToken();
$token->setUser($matches[1]);
- $token->digest = $matches[2];
- $token->nonce = $matches[3];
- $token->created = $matches[4];
+ $token->digest = $matches[2];
+ $token->nonce = $matches[3];
+ $token->created = $matches[4];
try {
$authToken = $this->authenticationManager->authenticate($token);
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array(
- 'form' => $form->createView(),
- 'entries' => $entries,
- 'currentPage' => $page
+ 'form' => $form->createView(),
+ 'entries' => $entries,
+ 'currentPage' => $page,
)
);
}
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array(
- 'form' => $form->createView(),
- 'entries' => $entries,
- 'currentPage' => $page
+ 'form' => $form->createView(),
+ 'entries' => $entries,
+ 'currentPage' => $page,
)
);
}
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array(
- 'form' => $form->createView(),
- 'entries' => $entries,
- 'currentPage' => $page
+ 'form' => $form->createView(),
+ 'entries' => $entries,
+ 'currentPage' => $page,
)
);
}
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry ' . ($entry->isArchived() ? 'archived' : 'unarchived')
+ 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived')
);
return $this->redirect($request->headers->get('referer'));
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry ' . ($entry->isStarred() ? 'starred' : 'unstarred')
+ 'Entry '.($entry->isStarred() ? 'starred' : 'unstarred')
);
return $this->redirect($request->headers->get('referer'));
return $this->render('WallabagCoreBundle:Security:login.html.twig', array(
// last username entered by the user
'last_username' => $session->get(SecurityContext::LAST_USERNAME),
- 'error' => $error,
+ 'error' => $error,
));
}
/**
* @Route("/howto", name="howto")
*/
- public function howtoAction()
- {
- return $this->render(
- 'WallabagCoreBundle:Static:howto.html.twig',
- array()
- );
- }
+ public function howtoAction()
+ {
+ return $this->render(
+ 'WallabagCoreBundle:Static:howto.html.twig',
+ array()
+ );
+ }
+
/**
* @Route("/about", name="about")
*/
return $this->render(
'WallabagCoreBundle:Tag:tags.html.twig',
array(
- 'tags' => $tags
+ 'tags' => $tags,
)
);
}
-
}
class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function load(ObjectManager $manager)
{
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getOrder()
{
class LoadEntryData extends AbstractFixture implements OrderedFixtureInterface
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function load(ObjectManager $manager)
{
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getOrder()
{
class LoadUserData extends AbstractFixture implements OrderedFixtureInterface
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function load(ObjectManager $manager)
{
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getOrder()
{
public function __construct(User $user)
{
- $this->user = $user;
+ $this->user = $user;
$this->entries = new ArrayCollection();
}
public function __construct()
{
$this->isActive = true;
- $this->salt = md5(uniqid(null, true));
- $this->entries = new ArrayCollection();
- $this->tags = new ArrayCollection();
+ $this->salt = md5(uniqid(null, true));
+ $this->entries = new ArrayCollection();
+ $this->tags = new ArrayCollection();
}
/**
}
/**
- * @inheritDoc
+ * {@inheritdoc}
*/
public function getSalt()
{
}
/**
- * @inheritDoc
+ * {@inheritdoc}
*/
public function getRoles()
{
return $this->tags;
}
/**
- * @inheritDoc
+ * {@inheritdoc}
*/
public function eraseCredentials()
{
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
-use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
class EntryFilterType extends AbstractType
->add('createdAt', 'filter_date_range', array(
'left_date_options' => array(
'attr' => array(
- 'placeholder' => 'dd/mm/yyyy'),
+ 'placeholder' => 'dd/mm/yyyy',
+ ),
'format' => 'dd/MM/yyyy',
- 'widget' => 'single_text'
+ 'widget' => 'single_text',
),
'right_date_options' => array(
'attr' => array(
- 'placeholder' => 'dd/mm/yyyy'),
+ 'placeholder' => 'dd/mm/yyyy',
+ ),
'format' => 'dd/MM/yyyy',
- 'widget' => 'single_text'
- )))
+ 'widget' => 'single_text',
+ ),
+ ))
->add('domainName', 'filter_text', array(
- 'apply_filter' => function (QueryInterface $filterQuery, $field, $values)
- {
+ 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
$value = $values['value'];
if (strlen($value) <= 3 || empty($value)) {
- return null;
+ return;
}
$expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%'));
+
return $filterQuery->createCondition($expression);
- }
+ },
));
}
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'csrf_protection' => false,
- 'validation_groups' => array('filtering')
+ 'csrf_protection' => false,
+ 'validation_groups' => array('filtering'),
));
}
}
'type' => 'password',
'invalid_message' => 'The password fields must match.',
'required' => true,
- 'first_options' => array('label' => 'New password'),
+ 'first_options' => array('label' => 'New password'),
'second_options' => array('label' => 'Repeat new password'),
'constraints' => array(
new Constraints\Length(array(
'type' => 'password',
'invalid_message' => 'The password fields must match.',
'required' => true,
- 'first_options' => array('label' => 'New password'),
+ 'first_options' => array('label' => 'New password'),
'second_options' => array('label' => 'Repeat new password'),
'constraints' => array(
new Constraints\Length(array(
public function apply(Request $request, ParamConverter $configuration)
{
$username = $request->attributes->get('username');
- $rssToken = $request->attributes->get('token');
+ $rssToken = $request->attributes->get('token');
// Check, if route attributes exists
if (null === $username || null === $rssToken) {
/**
* Find Tags.
*
- * @param int $userId
+ * @param int $userId
*
* @return array
*/
$digest = hash($this->algorithm, $salted, true);
// "stretch" hash
- for ($i = 1; $i < $this->iterations; $i++) {
+ for ($i = 1; $i < $this->iterations; ++$i) {
$digest = hash($this->algorithm, $digest.$salted, true);
}
$REAL = array();
foreach ($GLOBALS as $key => $value) {
if ($key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS') {
- $GLOBALS[$key] = array();
- $REAL[$key] = $value;
+ $GLOBALS[$key] = array();
+ $REAL[$key] = $value;
}
}
// Saving and clearing session
$data = array(
'entry_filter[readingTime][right_number]' => 11,
- 'entry_filter[readingTime][left_number]' => 11
+ 'entry_filter[readingTime][left_number]' => 11,
);
$crawler = $client->submit($form, $data);
$data = array(
'entry_filter[createdAt][left_date]' => date('d/m/Y'),
- 'entry_filter[createdAt][right_date]' => date('d/m/Y', strtotime("+1 day"))
+ 'entry_filter[createdAt][right_date]' => date('d/m/Y', strtotime('+1 day')),
);
$crawler = $client->submit($form, $data);
$data = array(
'entry_filter[createdAt][left_date]' => '01/01/1970',
- 'entry_filter[createdAt][right_date]' => '01/01/1970'
+ 'entry_filter[createdAt][right_date]' => '01/01/1970',
);
$crawler = $client->submit($form, $data);
$this->assertCount(0, $crawler->filter('div[class=entry]'));
-
}
public function testPaginationWithFilter()
$crawler = $client->request('GET', '/unread/list');
$form = $crawler->filter('button[id=submit-filter]')->form();
$data = array(
- 'entry_filter[domainName]' => 'monde'
+ 'entry_filter[domainName]' => 'monde',
);
$crawler = $client->submit($form, $data);
$form = $crawler->filter('button[id=submit-filter]')->form();
$data = array(
- 'entry_filter[domainName]' => 'wallabag'
+ 'entry_filter[domainName]' => 'wallabag',
);
$crawler = $client->submit($form, $data);
namespace Wallabag\CoreBundle\Tests\Controller;
use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-use Doctrine\ORM\AbstractQuery;
class TagControllerTest extends WallabagCoreTestCase
{
projects / github / wallabag / wallabag.git / commitdiff
