Dev-Int / glsr

src/AppBundle/Helper/TimeHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      * get Easter date.
      *
      * @param integer $pYear
-     * @return timestamp
+     * @return integer
      */
     private function getEaster ($pYear = null)
     {

Indentation +29 added lines, -29 removed lines

@@ -29,22 +29,22 @@ 
      */
     private function getEaster ($pYear = null)
     {
-	if (is_null ($pYear)) {
+    if (is_null ($pYear)) {
             $pYear = (int)date ('Y');
-	}
-	$nDate = $pYear - 1900;
-	$pAa = $nDate%19;
-	$pBb = floor (((7*$pAa)+1)/19);
-	$pCc = ((11*$pAa)-$pBb+4)%29;
-	$pDd = floor ($nDate/4);
-	$pEe = ($nDate-$pCc+$pDd+31)%7;
-	$pResult = 25-$pCc-$pEe;
-	if ($pResult > 0) {
+    }
+    $nDate = $pYear - 1900;
+    $pAa = $nDate%19;
+    $pBb = floor (((7*$pAa)+1)/19);
+    $pCc = ((11*$pAa)-$pBb+4)%29;
+    $pDd = floor ($nDate/4);
+    $pEe = ($nDate-$pCc+$pDd+31)%7;
+    $pResult = 25-$pCc-$pEe;
+    if ($pResult > 0) {
             $pEaster = strtotime ($pYear.'/04/'.$pResult);
-	} else {
+    } else {
             $pEaster = strtotime ($pYear.'/03/'.(31+$pResult));
-	}
-	return $pEaster;
+    }
+    return $pEaster;
     }
 
     /**
@@ -58,25 +58,25 @@ 
      * @return integer  Delta next business day
      */
     function getNextOpenDay ($pDate, $pDays) {
-	$aBankHolidays = ['1_1', '1_5', '8_5', '14_7', '15_8', '1_11', '11_11', '25_12', ];
-	if (function_exists ('easter_date')) {
+    $aBankHolidays = ['1_1', '1_5', '8_5', '14_7', '15_8', '1_11', '11_11', '25_12', ];
+    if (function_exists ('easter_date')) {
             $pEaster = easter_date ((int)date('Y'), $pDate);
-	} else {
+    } else {
             $pEaster = $this->getEaster ((int)date('Y'), $pDate);
-	}
-	$aBankHolidays[] = date ('j_n',$pEaster);
-	$aBankHolidays[] = date ('j_n', $pEaster + (86400*39));
-	$aBankHolidays[] = date ('j_n', $pEaster + (86400*49));
+    }
+    $aBankHolidays[] = date ('j_n',$pEaster);
+    $aBankHolidays[] = date ('j_n', $pEaster + (86400*39));
+    $aBankHolidays[] = date ('j_n', $pEaster + (86400*49));
 
         $pEnd = $pDays * 86400;
-	$idn = 0;
-	while ($idn < $pEnd) {
-		$idn = strtotime ('+1 day', $idn);
-		if (in_array (date ('w', $pDate+$idn),array (0,6) ) || in_array (date ('j_n', $pDate+$idn), $aBankHolidays)) {
-			$pEnd = strtotime ('+1 day', $pEnd);
-			$pDays ++;
-		}
-	}
-	return $pDays;
+    $idn = 0;
+    while ($idn < $pEnd) {
+        $idn = strtotime ('+1 day', $idn);
+        if (in_array (date ('w', $pDate+$idn),array (0,6) ) || in_array (date ('j_n', $pDate+$idn), $aBankHolidays)) {
+            $pEnd = strtotime ('+1 day', $pEnd);
+            $pDays ++;
+        }
+    }
+    return $pDays;
 }
 }

Spacing +22 added lines, -22 removed lines

@@ -27,22 +27,22 @@ 
      * @param integer $pYear
      * @return timestamp
      */
-    private function getEaster ($pYear = null)
+    private function getEaster($pYear = null)
     {
-	if (is_null ($pYear)) {
-            $pYear = (int)date ('Y');
+	if (is_null($pYear)) {
+            $pYear = (int) date('Y');
 	}
 	$nDate = $pYear - 1900;
-	$pAa = $nDate%19;
-	$pBb = floor (((7*$pAa)+1)/19);
-	$pCc = ((11*$pAa)-$pBb+4)%29;
-	$pDd = floor ($nDate/4);
-	$pEe = ($nDate-$pCc+$pDd+31)%7;
-	$pResult = 25-$pCc-$pEe;
+	$pAa = $nDate % 19;
+	$pBb = floor(((7 * $pAa) + 1) / 19);
+	$pCc = ((11 * $pAa) - $pBb + 4) % 29;
+	$pDd = floor($nDate / 4);
+	$pEe = ($nDate - $pCc + $pDd + 31) % 7;
+	$pResult = 25 - $pCc - $pEe;
 	if ($pResult > 0) {
-            $pEaster = strtotime ($pYear.'/04/'.$pResult);
+            $pEaster = strtotime($pYear.'/04/'.$pResult);
 	} else {
-            $pEaster = strtotime ($pYear.'/03/'.(31+$pResult));
+            $pEaster = strtotime($pYear.'/03/'.(31 + $pResult));
 	}
 	return $pEaster;
     }
@@ -57,24 +57,24 @@ 
      * @param integer   $pDays Delta for the day of delivery
      * @return integer  Delta next business day
      */
-    function getNextOpenDay ($pDate, $pDays) {
+    function getNextOpenDay($pDate, $pDays) {
 	$aBankHolidays = ['1_1', '1_5', '8_5', '14_7', '15_8', '1_11', '11_11', '25_12', ];
-	if (function_exists ('easter_date')) {
-            $pEaster = easter_date ((int)date('Y'), $pDate);
+	if (function_exists('easter_date')) {
+            $pEaster = easter_date((int) date('Y'), $pDate);
 	} else {
-            $pEaster = $this->getEaster ((int)date('Y'), $pDate);
+            $pEaster = $this->getEaster((int) date('Y'), $pDate);
 	}
-	$aBankHolidays[] = date ('j_n',$pEaster);
-	$aBankHolidays[] = date ('j_n', $pEaster + (86400*39));
-	$aBankHolidays[] = date ('j_n', $pEaster + (86400*49));
+	$aBankHolidays[] = date('j_n', $pEaster);
+	$aBankHolidays[] = date('j_n', $pEaster + (86400 * 39));
+	$aBankHolidays[] = date('j_n', $pEaster + (86400 * 49));
 
         $pEnd = $pDays * 86400;
 	$idn = 0;
 	while ($idn < $pEnd) {
-		$idn = strtotime ('+1 day', $idn);
-		if (in_array (date ('w', $pDate+$idn),array (0,6) ) || in_array (date ('j_n', $pDate+$idn), $aBankHolidays)) {
-			$pEnd = strtotime ('+1 day', $pEnd);
-			$pDays ++;
+		$idn = strtotime('+1 day', $idn);
+		if (in_array(date('w', $pDate + $idn), array(0, 6)) || in_array(date('j_n', $pDate + $idn), $aBankHolidays)) {
+			$pEnd = strtotime('+1 day', $pEnd);
+			$pDays++;
 		}
 	}
 	return $pDays;

Braces +2 added lines, -1 removed lines

@@ -57,7 +57,8 @@
      * @param integer   $pDays Delta for the day of delivery
      * @return integer  Delta next business day
      */
-    function getNextOpenDay ($pDate, $pDays) {
+    function getNextOpenDay ($pDate, $pDays)
+    {
 	$aBankHolidays = ['1_1', '1_5', '8_5', '14_7', '15_8', '1_11', '11_11', '25_12', ];
 	if (function_exists ('easter_date')) {
             $pEaster = easter_date ((int)date('Y'), $pDate);

src/AppBundle/Entity/OrdersRepository.php

Braces +6 added lines, -3 removed lines

@@ -47,7 +47,8 @@ 
      *
      * @return \Doctrine\ORM\QueryBuilder
      */
-    public function findOrders() {
+    public function findOrders()
+    {
         $query = $this->findActive()
             ->andWhere('o.delivdate > :date')
             ->setParameter('date', date('Y-m-d'));
@@ -60,7 +61,8 @@ 
      *
      * @return \Doctrine\ORM\QueryBuilder
      */
-    public function findDeliveries() {
+    public function findDeliveries()
+    {
         $query = $this->findActive()
             ->andWhere('o.delivdate <= :date')
             ->setParameter('date', date('Y-m-d'));
@@ -68,7 +70,8 @@ 
         return $query;
     }
 
-    private function findActive() {
+    private function findActive()
+    {
         $query = $this->createQueryBuilder('o')
             ->orderBy('o.id', 'DESC')
             ->where('o.status = 1');

src/AppBundle/Controller/OrdersController.php

Spacing +2 added lines, -2 removed lines

@@ -115,7 +115,7 @@ 
 
         $orders = new Orders();
         $form = $this->createForm(OrdersType::class, $orders);
-        $return = ['orders' => $orders, 'form' => $form->createView(),];
+        $return = ['orders' => $orders, 'form' => $form->createView(), ];
         $form->handleRequest($request);
         $supplier = $orders->getSupplier();
         $articles = $etm->getRepository('AppBundle:Article')->getArticleFromSupplier($supplier->getId());
@@ -224,7 +224,7 @@ 
             $diffDeliv = $this->get('app.helper.time')
                 ->getNextOpenDay($setOrderDate->getTimestamp(), $supplier->getDelaydeliv());
 
-            $setDelivDate = new \DateTime(date('Y-m-d',$setOrderDate->getTimestamp()));
+            $setDelivDate = new \DateTime(date('Y-m-d', $setOrderDate->getTimestamp()));
             $setDelivDate->add(new \DateInterval('P'.$diffDeliv.'D'));
 
             $orders->setOrderdate($setOrderDate);

src/AppBundle/Controller/DeliveriesController.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $etm = $this->getDoctrine()->getManager();
         $item = $this->container->getParameter('knp_paginator.page_range');
         $qbd = $etm->getRepository('AppBundle:Orders')->createQueryBuilder('o');
-        $qbd->where('o.delivdate <= ' . date('Y-m-d'));
+        $qbd->where('o.delivdate <= '.date('Y-m-d'));
         $qbd->andWhere('o.status = 1');
         
         $paginator = $this->get('knp_paginator')->paginate($qbd, $request->query->get('page', 1), $item);

src/AppBundle/Form/Type/SupplierType.php

Spacing +21 added lines, -21 removed lines

@@ -43,25 +43,25 @@ 
             ->add(
                 'name',
                 TextType::class,
-                ['label' => 'gestock.name', 'attr'  => ['class' => 'form-control',],]
+                ['label' => 'gestock.name', 'attr'  => ['class' => 'form-control', ], ]
             )
             ->add(
                 'address',
                 TextType::class,
                 array(
                     'label' => 'gestock.address',
-                    'attr'  => ['placeholder' => 'gestock.address', 'class' => 'form-control',],
+                    'attr'  => ['placeholder' => 'gestock.address', 'class' => 'form-control', ],
                 )
             )
             ->add(
                 'zipcode',
                 TextType::class,
-                ['attr'  => ['placeholder' => 'gestock.zipcode', 'class' => 'form-control half',],]
+                ['attr'  => ['placeholder' => 'gestock.zipcode', 'class' => 'form-control half', ], ]
             )
             ->add(
                 'town',
                 TextType::class,
-                ['attr'  => ['placeholder' => 'gestock.town', 'class' => 'form-control half',],]
+                ['attr'  => ['placeholder' => 'gestock.town', 'class' => 'form-control half', ], ]
             )
             ->add(
                 'phone',
@@ -70,8 +70,8 @@ 
                     'default_region' => 'FR',
                     'format' => PhoneNumberFormat::NATIONAL,
                     'widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE,
-                    'country_choices' => ['FR', 'GB', 'DE', 'IT',],
-                    'preferred_country_choices' => ['FR',],
+                    'country_choices' => ['FR', 'GB', 'DE', 'IT', ],
+                    'preferred_country_choices' => ['FR', ],
                     'label' => 'gestock.phone',
                 )
             )
@@ -82,21 +82,21 @@ 
                     'default_region' => 'FR',
                     'format' => PhoneNumberFormat::NATIONAL,
                     'widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE,
-                    'country_choices' => ['FR', 'GB', 'DE', 'IT',],
-                    'preferred_country_choices' => ['FR',],
+                    'country_choices' => ['FR', 'GB', 'DE', 'IT', ],
+                    'preferred_country_choices' => ['FR', ],
                     'label' => 'gestock.fax',
-                    'attr'  => ['class' => 'form-control',]
+                    'attr'  => ['class' => 'form-control', ]
                 )
             )
             ->add(
                 'mail',
                 EmailType::class,
-                ['label' => 'gestock.mail', 'attr'  => ['class' => 'form-control',]]
+                ['label' => 'gestock.mail', 'attr'  => ['class' => 'form-control', ]]
             )
             ->add(
                 'contact',
                 TextType::class,
-                ['label' => 'gestock.contact', 'attr'  => ['class' => 'form-control',],]
+                ['label' => 'gestock.contact', 'attr'  => ['class' => 'form-control', ], ]
             )
             ->add(
                 'gsm',
@@ -105,10 +105,10 @@ 
                     'default_region' => 'FR',
                     'format' => PhoneNumberFormat::NATIONAL,
                     'widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE,
-                    'country_choices' => ['FR', 'GB', 'DE', 'IT',],
-                    'preferred_country_choices' => ['FR',],
+                    'country_choices' => ['FR', 'GB', 'DE', 'IT', ],
+                    'preferred_country_choices' => ['FR', ],
                     'label' => 'gestock.gsm',
-                    'attr'  => ['class' => 'form-control',]
+                    'attr'  => ['class' => 'form-control', ]
                 )
             )
             /**
@@ -119,11 +119,11 @@ 
                 'delaydeliv',
                 ChoiceType::class,
                 array(
-                    'choices' => ['form.atob' => 1, 'form.atoc' => 2, 'form.atod' => 3, 'form.atoe' => 4,],
+                    'choices' => ['form.atob' => 1, 'form.atoc' => 2, 'form.atod' => 3, 'form.atoe' => 4, ],
                     'choices_as_values' => true,
                     'label' => 'settings.delay',
                     'translation_domain' => 'gs_suppliers',
-                    'attr'  => ['class' => 'form-control half',]
+                    'attr'  => ['class' => 'form-control half', ]
                 )
             )
             /**
@@ -147,7 +147,7 @@ 
                     'choice_translation_domain' => true,
                     'translation_domain' => 'messages',
                     'label' => 'day_order',
-                    'attr'  => ['class' => 'form-control',],
+                    'attr'  => ['class' => 'form-control', ],
                     'expanded' => true,
                     'multiple' => true,
                 )
@@ -157,7 +157,7 @@ 
                 EntityType::class,
                 array(
                     'class' => 'AppBundle:FamilyLog',
-                    'query_builder' => function (EntityRepository $er) {
+                    'query_builder' => function(EntityRepository $er) {
                         return $er->createQueryBuilder('f')
                             ->orderBy('f.path', 'ASC');
                     },
@@ -166,10 +166,10 @@ 
                     'placeholder' => 'gestock.settings.diverse.choice_family',
                     'empty_data' => null,
                     'label' => 'gestock.settings.diverse.familylog',
-                    'attr'  => ['class' => 'form-control half',]
+                    'attr'  => ['class' => 'form-control half', ]
                 )
             )
-            ->add('active', HiddenType::class, ['data' => true,]);
+            ->add('active', HiddenType::class, ['data' => true, ]);
     }
 
     /**
@@ -177,7 +177,7 @@ 
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(['data_class' => 'AppBundle\Entity\Supplier',]);
+        $resolver->setDefaults(['data_class' => 'AppBundle\Entity\Supplier', ]);
     }
 
     /**