SharePoint model updated to 16.0.21729.12001 version, model generator…

… fixes

generator/GenerateModel.php

@@ -7,6 +7,7 @@
 use Office365\Generator\Documentation\MSGraphDocsService;
 use Office365\Generator\Documentation\SharePointSpecsService;
 use Office365\Runtime\Auth\UserCredentials;
+use Office365\Runtime\Http\RequestException;
 use Office365\Runtime\OData\MetadataResolver;
 use Office365\Runtime\OData\ODataModel;
 use Office365\Runtime\OData\V3\ODataV3Reader;
@@ -81,7 +82,11 @@ function generateSharePointModel()
 {
     syncSharePointMetadataFile('./Settings.SharePoint.json');
     $options = loadSettingsFromFile('./Settings.SharePoint.json');
-    $options['docs'] = new SharePointSpecsService($options['docsRoot']);
+    try {
+        $options['docs'] = new SharePointSpecsService($options['docsRoot']);
+    } catch (RequestException $e) {
+        //ignore
+    }
     $reader = new ODataV3Reader();
     $model = $reader->generateModel($options);
     generateFiles($model);

generator/Settings.SharePoint.json

@@ -1,19 +1,20 @@
 {
-    "metadataPath": ".\/metadata\/SharePoint.xml",
-    "outputPath": "..\/src\/SharePoint",
-    "templatePath": ".\/templates\/sharepoint\/",
+    "metadataPath": "./metadata/SharePoint.xml",
+    "outputPath": "../src/SharePoint",
+    "templatePath": "./templates/sharepoint/",
     "includeDocAnnotations": true,
     "docsRoot": "https:\/\/docs.microsoft.com\/en-us\/openspecs\/sharepoint_protocols\/ms-csomspt\/",
     "rootNamespace": "Office365\\SharePoint",
     "entityRootNamespace": "SP",
-    "version": "16.0.21221.12006",
-    "timestamp": "2021-05-05T14:47:20+00:00",
+    "version": "16.0.21729.12001",
+    "timestamp": "2021-10-09T12:03:32+03:00",
     "placeholder": "This file was generated by phpSPO model generator",
     "typeMappings": {
         "SP.List": "SP.SPList",
         "SP.ResourcePath": "SP.SPResourcePath"
     },
     "ignoredTypes": [
+        "SP.KeyValue",
         "SP.SimpleDataRow",
         "SP.SimpleDataTable",
         "SP.MethodInformation",

generator/composer.json

@@ -7,8 +7,8 @@
     ],
     "autoload": {
         "psr-4": {
-            "Office365\\Generator\\": "./generator/",
-            "Office365\\": "../src/"
+            "Office365\\": ["../src/"],
+            "Office365\\Generator\\": ["../generator/"]
         }
     },
     "name": "vgrem/php-office365-sdk-generator",

src/Runtime/OData/ODataModel.php

@@ -274,12 +274,12 @@ public function getTypeInfo($typeName)
         $parts = explode('.', $typeName);
         $parts[0] = $this->options['rootNamespace'];
         $typeAlias = array_pop($parts);
-        $namespace = implode(DIRECTORY_SEPARATOR,array_filter($parts));
+        $namespace = implode("\\",array_filter($parts));
         $filePath = implode(DIRECTORY_SEPARATOR,array_filter([str_replace($this->options['rootNamespace'],"",$namespace),$typeAlias . ".php"]));
 
         return array(
             'alias' => $typeAlias,
-            'name' => implode(DIRECTORY_SEPARATOR,[$namespace,$typeAlias]),
+            'name' => implode("\\",[$namespace,$typeAlias]),
             'file' => implode(DIRECTORY_SEPARATOR,[$this->options['outputPath'],$filePath]),
             'namespace' => $namespace,
             'primitive' => false,

src/Runtime/OData/ODataReader.php

@@ -13,6 +13,9 @@ abstract class ODataReader
     function generateModel($options)
     {
         $model = new ODataModel($options);
+        $model->onTypeResolved(function ($typeSchema){
+            echo "${typeSchema['name']} type resolved." .  PHP_EOL;
+        });
         $edmx = file_get_contents($options['metadataPath']);
         $this->parseEdmx($edmx, $model);
         return $model;

src/SharePoint/ContentAssemblyFileInfo.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * This file was generated by phpSPO model generator 2021-10-09T13:26:01+03:00 16.0.21729.12001
+ */
+namespace Office365\SharePoint;
+
+use Office365\Runtime\ClientValue;
+class ContentAssemblyFileInfo extends ClientValue
+{
+    /**
+     * @var string
+     */
+    public $FileUrl;
+    /**
+     * @var string
+     */
+    public $ServerRedirectedEmbedUrl;
+}

src/SharePoint/ContentAssemblyFormAnswer.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * This file was generated by phpSPO model generator 2021-10-09T13:26:01+03:00 16.0.21729.12001
+ */
+namespace Office365\SharePoint;
+
+use Office365\Runtime\ClientValue;
+class ContentAssemblyFormAnswer extends ClientValue
+{
+    /**
+     * @var string
+     */
+    public $Answer;
+    /**
+     * @var string
+     */
+    public $ContentControlTagName;
+}

src/SharePoint/ContentControlInfo.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * This file was generated by phpSPO model generator 2021-10-09T13:26:01+03:00 16.0.21729.12001
+ */
+namespace Office365\SharePoint;
+
+use Office365\Runtime\ClientValue;
+class ContentControlInfo extends ClientValue
+{
+    /**
+     * @var string
+     */
+    public $ContentControlTagName;
+    /**
+     * @var integer
+     */
+    public $EndIndex;
+    /**
+     * @var bool
+     */
+    public $IsSingleParargaph;
+    /**
+     * @var array
+     */
+    public $ParagraphIds;
+    /**
+     * @var integer
+     */
+    public $StartIndex;
+}

src/SharePoint/CopyMigrationOptions.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file was generated by phpSPO model generator 2020-10-07T07:21:11+00:00 16.0.20523.12005
+ * This file was generated by phpSPO model generator 2021-10-09T13:33:47+03:00 16.0.21729.12001
  */
 namespace Office365\SharePoint;
 
@@ -54,4 +54,8 @@ class CopyMigrationOptions extends ClientValue
      * @var bool
      */
     public $SameWebCopyMoveOptimization;
+    /**
+     * @var array
+     */
+    public $CustomizedItemName;
 }

src/SharePoint/CurrencyInformation.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file was generated by phpSPO model generator 2019-10-12T15:24:30+00:00 16.0.19402.12016
+ * This file was generated by phpSPO model generator 2021-10-09T13:26:01+03:00 16.0.21729.12001
  */
 namespace Office365\SharePoint;
 
@@ -26,4 +26,8 @@ class CurrencyInformation extends ClientValue
      * @var string
      */
     public $LCID;
+    /**
+     * @var string
+     */
+    public $LanguageCultureName;
 }

src/SharePoint/DashboardItemInfo.php

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file was generated by phpSPO model generator 2021-10-09T12:53:17+03:00 16.0.21729.12001
+ */
+namespace Office365\SharePoint;
+
+use Office365\Runtime\ClientValue;
+class DashboardItemInfo extends ClientValue
+{
+    /**
+     * @var integer
+     */
+    public $ItemId;
+    /**
+     * @var string
+     */
+    public $ListId;
+    /**
+     * @var string
+     */
+    public $SiteId;
+    /**
+     * @var string
+     */
+    public $WebId;
+}

src/SharePoint/DocumentGenerationInfo.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file was generated by phpSPO model generator 2021-10-09T13:33:47+03:00 16.0.21729.12001
+ */
+namespace Office365\SharePoint;
+
+use Office365\Runtime\ClientValue;
+class DocumentGenerationInfo extends ClientValue
+{
+    /**
+     * @var string
+     */
+    public $FileName;
+    /**
+     * @var bool
+     */
+    public $IsTempFile;
+    /**
+     * @var string
+     */
+    public $TempFileUrl;
+}

src/SharePoint/MediaServiceUpdateParameters.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file was generated by phpSPO model generator 2021-08-22T15:28:03+00:00 16.0.21611.12002
+ * This file was generated by phpSPO model generator 2021-10-09T13:33:47+03:00 16.0.21729.12001
  */
 namespace Office365\SharePoint;
 
@@ -88,4 +88,12 @@ class MediaServiceUpdateParameters extends ClientValue
      * @var string
      */
     public $MediaServiceImageTags;
+    /**
+     * @var integer
+     */
+    public $MediaServiceImageHeight;
+    /**
+     * @var integer
+     */
+    public $MediaServiceImageWidth;
 }

src/SharePoint/PortalAndOrgNewsSiteReference.php

@@ -1,19 +1,19 @@
 <?php
 
 /**
- * This file was generated by phpSPO model generator 2019-10-08T21:36:37+00:00 16.0.19325.12009
-*/
+ * This file was generated by phpSPO model generator 2021-10-09T13:02:28+03:00 16.0.21729.12001
+ */
 namespace Office365\SharePoint;
 
 use Office365\Runtime\ClientValue;
 class PortalAndOrgNewsSiteReference extends ClientValue
 {
-    /** 
-     * @var string  
+    /**
+     * @var string
      */
     public $SiteId;
-    /** 
-     * @var string  
+    /**
+     * @var string
      */
     public $WebId;
 }

src/SharePoint/ProvisionedTemporaryAzureContainerInfo.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * This file was generated by phpSPO model generator 2021-10-09T13:33:47+03:00 16.0.21729.12001
+ */
+namespace Office365\SharePoint;
+
+use Office365\Runtime\ClientValue;
+class ProvisionedTemporaryAzureContainerInfo extends ClientValue
+{
+    /**
+     * @var string
+     */
+    public $EncryptionKey;
+    /**
+     * @var string
+     */
+    public $Uri;
+}

src/SharePoint/Publishing/SitePageFieldsData.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file was generated by phpSPO model generator 2021-03-12T16:05:00+00:00 16.0.21103.12002
+ * This file was generated by phpSPO model generator 2021-10-09T13:33:47+03:00 16.0.21729.12001
  */
 namespace Office365\SharePoint\Publishing;
 
@@ -52,4 +52,8 @@ class SitePageFieldsData extends ClientValue
      * @var string
      */
     public $Categories;
+    /**
+     * @var string
+     */
+    public $CallToAction;
 }

src/SharePoint/Publishing/SitePageMetadata.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file was generated by phpSPO model generator 2021-08-22T15:28:03+00:00 16.0.21611.12002
+ * This file was generated by phpSPO model generator 2021-10-09T13:33:47+03:00 16.0.21729.12001
  */
 namespace Office365\SharePoint\Publishing;
 
@@ -550,4 +550,18 @@ public function setAssetFolderId($value)
     {
         return $this->setProperty("AssetFolderId", $value, true);
     }
+    /**
+     * @return string
+     */
+    public function getCallToAction()
+    {
+        return $this->getProperty("CallToAction");
+    }
+    /**
+     * @var string
+     */
+    public function setCallToAction($value)
+    {
+        return $this->setProperty("CallToAction", $value, true);
+    }
 }

src/SharePoint/RecentListProxy.php

@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * This file was generated by phpSPO model generator 2021-10-09T13:33:47+03:00 16.0.21729.12001
+ */
+namespace Office365\SharePoint;
+
+use Office365\Runtime\ClientObject;
+use Office365\Runtime\Actions\DeleteEntityQuery;
+use Office365\Runtime\ResourcePath;
+use Office365\Runtime\Actions\UpdateEntityQuery;
+class RecentListProxy extends BaseEntity
+{
+}